[svn-r18195] Description:

    Remove trailing whitespace from source code files.

Tested on:
    None - just eyeballed

341 files changed, 19337 insertions, 19337 deletions

diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp
index b39c47b..286934a 100644
--- a/c++/examples/chunks.cpp
+++ b/c++/examples/chunks.cpp
@@ -80,7 +80,7 @@ int main (void)
 	hsize_t dims[2]; 	// dataset dimensions
 	rank = filespace.getSimpleExtentDims( dims );
 	cout << "dataset rank = " << rank << ", dimensions "
-	     << (unsigned long)(dims[0]) << " x " 
+	     << (unsigned long)(dims[0]) << " x "
 	     << (unsigned long)(dims[1]) << endl;
 
 	/*
diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp
index 09dc7ee..a5137bc 100644
--- a/c++/examples/h5group.cpp
+++ b/c++/examples/h5group.cpp
@@ -94,7 +94,7 @@ int main(void)
 	 * Create the first dataset.
 	 */
 	DataSet* dataset = new DataSet(file->createDataSet(
-		"/Data/Compressed_Data", PredType::NATIVE_INT, 
+		"/Data/Compressed_Data", PredType::NATIVE_INT,
 		*dataspace, ds_creatplist ));
 
 	/*
@@ -109,7 +109,7 @@ int main(void)
 	dims[0] = 500;
 	dims[1] = 20;
 	dataspace = new DataSpace(RANK, dims); // create second dspace
-	dataset = new DataSet(file->createDataSet("/Data/Float_Data", 
+	dataset = new DataSet(file->createDataSet("/Data/Float_Data",
 			PredType::NATIVE_FLOAT, *dataspace));
 
 	delete dataset;
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 64993a2..c12a217 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -348,7 +348,7 @@ Attribute::Attribute(H5File& h5file, void* ref) : AbstractDs(), IdComponent()
 // Purpose:     Get the id of this attribute
 // Description:
 //		Class hierarchy is revised to address bugzilla 1068.  Class
-//		AbstractDS and Attribute are moved out of H5Object.  In 
+//		AbstractDS and Attribute are moved out of H5Object.  In
 //		addition, member IdComponent::id is moved into subclasses, and
 //		IdComponent::getId now becomes pure virtual function.
 // Programmer   Binh-Minh Ribler - May, 2008
diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp
index 364f639..e073c89 100644
--- a/c++/src/H5CommonFG.cpp
+++ b/c++/src/H5CommonFG.cpp
@@ -244,7 +244,7 @@ DataSet CommonFG::openDataSet( const H5std_string& name ) const
 ///\par Description
 ///		Note that both names are interpreted relative to the
 ///		specified location.
-///		For information on creating hard link and soft link, please 
+///		For information on creating hard link and soft link, please
 ///		refer to the C layer Reference Manual at:
 /// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateHard and
 /// http://hdfgroup.org/HDF5/doc/RM/RM_H5L.html#Link-CreateSoft
diff --git a/c++/src/H5Cpp.h b/c++/src/H5Cpp.h
index 3814369..75d82ba 100644
--- a/c++/src/H5Cpp.h
+++ b/c++/src/H5Cpp.h
@@ -44,9 +44,9 @@
 #include "H5Group.h"
 #include "H5File.h"
 #include "H5Library.h"
- 
+
 /* Some C++ compilers do not have offsetof macro; define to bypass the problem
-   - BMR- -EIP- 2007/08/01 
+   - BMR- -EIP- 2007/08/01
 */
 #ifndef H5_CXX_HAVE_OFFSETOF
 #ifdef HOFFSET
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 3051e08..6d7502a 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -83,7 +83,7 @@ DataSet::DataSet(const DataSet& original) : AbstractDs(original), H5Object(origi
 ///\param	ref - IN: Reference pointer
 ///\exception	H5::DataSetIException
 ///\parDescription
-///		\c obj can be DataSet, Group, H5File, or named DataType, that 
+///		\c obj can be DataSet, Group, H5File, or named DataType, that
 ///		is a datatype that has been named by DataType::commit.
 // Programmer	Binh-Minh Ribler - Oct, 2006
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index e023bda..2b03ffc 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -91,7 +91,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object()
 ///\param       obj - IN: Location reference object is in
 ///\param	ref - IN: Reference pointer
 ///\parDescription
-///		\c obj can be DataSet, Group, H5File, or named DataType, that 
+///		\c obj can be DataSet, Group, H5File, or named DataType, that
 ///		is a datatype that has been named by DataType::commit.
 // Programmer	Binh-Minh Ribler - Oct, 2006
 //--------------------------------------------------------------------------
@@ -99,7 +99,7 @@ DataType::DataType( const H5T_class_t type_class, size_t size ) : H5Object()
 {
    H5Object::dereference(obj, ref);
 }
- */ 
+ */
 DataType::DataType(H5Object& obj, void* ref) : H5Object()
 {
    id = obj.p_dereference(ref);
@@ -122,7 +122,7 @@ DataType::DataType() : H5Object(), id(0) {}
 ///\brief	Copy constructor: makes a copy of the original DataType object.
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType::DataType(const DataType& original) : H5Object(original) 
+DataType::DataType(const DataType& original) : H5Object(original)
 {
     id = original.getId();
     incRefCount(); // increment number of references to this id
@@ -159,7 +159,7 @@ void DataType::copy( const DataType& like_type )
 //--------------------------------------------------------------------------
 // Function:	DataType::copy
 ///\brief	Copies the datatype of the given dataset to this datatype object
-///\param	dset - IN: Dataset 
+///\param	dset - IN: Dataset
 ///\exception	H5::DataTypeIException
 // Programmer	Binh-Minh Ribler - Jan, 2007
 ///\parDescription
@@ -227,7 +227,7 @@ bool DataType::operator==(const DataType& compared_type ) const
 // Function:	DataType::p_commit (private)
 //\brief	Commits a transient datatype to a file, creating a new
 //		named datatype
-//\param	loc_id - IN: The id of either a file, group, dataset, named 
+//\param	loc_id - IN: The id of either a file, group, dataset, named
 //			 datatype, or attribute.
 //\param	name - IN: Name of the datatype
 //\exception	H5::DataTypeIException
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index 19a4e6e..981085d 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -172,16 +172,16 @@ void DSetCreatPropList::setDeflate( int level ) const
 //--------------------------------------------------------------------------
 // Function:	DSetCreatPropList::setSzip
 ///\brief	Sets up for the use of the SZIP compression filter.
-///\param	options_mask     - IN: A bit-mask conveying the desired SZIP 
-///			options.  Valid values are H5_SZIP_EC_OPTION_MASK 
+///\param	options_mask     - IN: A bit-mask conveying the desired SZIP
+///			options.  Valid values are H5_SZIP_EC_OPTION_MASK
 ///			and H5_SZIP_NN_OPTION_MASK.
-///\param	pixels_per_block - IN: Number of pixels or data elements in 
+///\param	pixels_per_block - IN: Number of pixels or data elements in
 ///			each data block.
 ///\exception	H5::PropListIException
 ///\par Description
-///		The associate C function sets an SZIP compression filter, 
+///		The associate C function sets an SZIP compression filter,
 ///		H5Z_FILTER_SZIP, for a dataset.  For more information about
-///		SZIP and usage, please refer to the C layer Reference 
+///		SZIP and usage, please refer to the C layer Reference
 ///		Manual at:
 /// http://hdfgroup.org/HDF5/doc/RM_H5P.html#Property-SetSzip
 // Programmer	Binh-Minh Ribler - Jan, 2007
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index f50691e..6ae7cf7 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -92,7 +92,7 @@ Group::Group(const hid_t existing_id) : H5Object()
 ///             obj - IN: Location reference object is in
 ///\param	ref - IN: Reference pointer
 ///\parDescription
-///		\c obj can be DataSet, Group, H5File, or named DataType, that 
+///		\c obj can be DataSet, Group, H5File, or named DataType, that
 ///		is a datatype that has been named by DataType::commit.
 // Programmer	Binh-Minh Ribler - Oct, 2006
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index a068b20..747a479 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -199,9 +199,9 @@ IdComponent& IdComponent::operator=( const IdComponent& rhs )
 //		Changed all subclasses' setId to p_setId and put back setId
 //		here.  p_setId is used in the library where the id provided
 //		by a C API passed on to user's application in the form of a
-//		C++ API object, which will be destroyed properly, and so 
+//		C++ API object, which will be destroyed properly, and so
 //		p_setId does not call incRefCount.  On the other hand, the
-//		public version setId is used by other applications, in which 
+//		public version setId is used by other applications, in which
 //		the id passed to setId already has a reference count, so setId
 //		must call incRefCount.
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 9dafea8..dbfe6f2 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -176,7 +176,7 @@ Attribute H5Object::openAttribute( const H5std_string& name ) const
 //--------------------------------------------------------------------------
 Attribute H5Object::openAttribute( const unsigned int idx ) const
 {
-   hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER, 
+   hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER,
 			H5_ITER_INC, (hsize_t)idx, H5P_DEFAULT, H5P_DEFAULT);
    if( attr_id > 0 )
    {
@@ -215,7 +215,7 @@ int H5Object::iterateAttrs( attr_operator_t user_op, unsigned *_idx, void *op_da
 
    // call the C library routine H5Aiterate2 to iterate the attributes
    hsize_t idx = (hsize_t)*_idx;
-   int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx, 
+   int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx,
 			userAttrOpWrpr, (void *) userData);
 
    // release memory
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp
index 4afde22..5e0f904 100644
--- a/c++/test/h5cpputil.cpp
+++ b/c++/test/h5cpputil.cpp
@@ -112,7 +112,7 @@ void issue_fail_msg(const char* where, int line, const char* file_name,
  *		different, the function will print out a message and the
  *		different values.  This function is made to reuse the code
  *		segment that is used in various places throughout
- *		the test code.  Where the C version of this code segment 
+ *		the test code.  Where the C version of this code segment
  *		"goto error," this function will return -1.
  *
  * Return:	Success:	0
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index fe95fe7..11f7303 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -1051,7 +1051,7 @@ static void test_attr_dtype_shared()
 	fid1.openFile(FILENAME, H5F_ACC_RDWR);
 
 	// Enclosing to work around the issue of unused variables and/or
-	// objects created by copy constructors stay around until end of 
+	// objects created by copy constructors stay around until end of
 	// scope, causing incorrect number of ref counts.
 	{ // First enclosed block
 
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 9532dd6..2b1879b 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -178,13 +178,13 @@ static void test_compound_2()
 		s_ptr->e    != d_ptr->e) {
 		H5_FAILED();
 		cerr << "    i=" << i << endl;
-		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b 
-		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << "," 
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d=" 
+		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b
+		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
 		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
-		cerr << "    dst={a=" << s_ptr->a << ", b=" << s_ptr->b 
-		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << "," 
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d=" 
+		cerr << "    dst={a=" << s_ptr->a << ", b=" << s_ptr->b
+		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
 		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
 	    }
     	}
@@ -294,13 +294,13 @@ static void test_compound_3()
 		s_ptr->e    != d_ptr->e) {
 		H5_FAILED();
 		cerr << "    i=" << i << endl;
-		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b 
-		     << ", c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << "," 
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << "], d=" 
+		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b
+		     << ", c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+		     << s_ptr->c[2] << "," << s_ptr->c[3] << "], d="
 		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
 		cerr << "    dst={a=" << d_ptr->a
-		     << ", c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << "," 
-		     << d_ptr->c[2] << "," << d_ptr->c[3] << "], e=" 
+		     << ", c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
+		     << d_ptr->c[2] << "," << d_ptr->c[3] << "], e="
 		     << d_ptr->e << "}" << endl;
 	    } // if
 	} // for
@@ -391,7 +391,7 @@ static void test_compound_4()
 	st.insertMember("d", HOFFSET(src_typ_t, d), PredType::NATIVE_INT);
 	st.insertMember("e", HOFFSET(src_typ_t, e), PredType::NATIVE_INT);
 	array_dt->close();
-    
+
 	array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
 
 	// Create an empty compound datatype
@@ -402,7 +402,7 @@ static void test_compound_4()
 	dt.insertMember("d", HOFFSET(dst_typ_t, d), PredType::NATIVE_SHORT);
 	dt.insertMember("e", HOFFSET(dst_typ_t, e), PredType::NATIVE_INT);
 	array_dt->close();
-    
+
 	/* Perform the conversion */
 	st.convert(dt, (size_t)nelmts, buf, bkg);
 
@@ -421,17 +421,17 @@ static void test_compound_4()
 	    {
 		H5_FAILED();
 		cerr << "    i=" << i << endl;
-		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b 
-		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << "," 
-		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d=" 
+		cerr << "    src={a=" << s_ptr->a << ", b=" << s_ptr->b
+		     << "c=[" << s_ptr->c[0] << "," << s_ptr->c[1] << ","
+		     << s_ptr->c[2] << "," << s_ptr->c[3] << ", d="
 		     << s_ptr->d << ", e=" << s_ptr->e << "}" << endl;
-		cerr << "    dst={a=" << d_ptr->a << ", b=" << d_ptr->b 
-		     << "c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << "," 
-		     << d_ptr->c[2] << "," << d_ptr->c[3] << ", d=" 
+		cerr << "    dst={a=" << d_ptr->a << ", b=" << d_ptr->b
+		     << "c=[" << d_ptr->c[0] << "," << d_ptr->c[1] << ","
+		     << d_ptr->c[2] << "," << d_ptr->c[3] << ", d="
 		     << d_ptr->d << ", e=" << d_ptr->e << "}" << endl;
 	    } // if
 	} // for
-    
+
 	/* Release resources */
 	free(buf);
 	free(bkg);
@@ -493,13 +493,13 @@ static void test_compound_5()
     try {
 
 	/* Build datatypes */
-	ArrayType* array_dt = new ArrayType(PredType::NATIVE_SHORT, 1, dims);	
+	ArrayType* array_dt = new ArrayType(PredType::NATIVE_SHORT, 1, dims);
 	CompType short_array(4*sizeof(short));
 	short_array.insertMember("_", 0, *array_dt);
 	array_dt->close();
 
 	CompType int_array(4*sizeof(int));
-	array_dt = new ArrayType(PredType::NATIVE_INT, 1, dims);	
+	array_dt = new ArrayType(PredType::NATIVE_INT, 1, dims);
 	int_array.insertMember("_", 0, *array_dt);
 	array_dt->close();
 
@@ -532,7 +532,7 @@ static void test_compound_5()
 	    src[1].coll_ids[0]!=dst[1].coll_ids[0] ||
 	    src[1].coll_ids[1]!=dst[1].coll_ids[1] ||
 	    src[1].coll_ids[2]!=dst[1].coll_ids[2] ||
-	    src[1].coll_ids[3]!=dst[1].coll_ids[3]) 
+	    src[1].coll_ids[3]!=dst[1].coll_ids[3])
 	{ H5_FAILED(); }
 
 	/* Free memory buffers */
@@ -614,17 +614,17 @@ static void test_compound_6()
 	    s_ptr = ((src_typ_t*)orig) + i;
 	    d_ptr = ((dst_typ_t*)buf)  + i;
 	    if (s_ptr->b    != d_ptr->b    ||
-		s_ptr->d    != d_ptr->d) 
+		s_ptr->d    != d_ptr->d)
 	    {
 		H5_FAILED();
 		cerr << "    i=" << i << endl;
-		cerr << "    src={b=" << s_ptr->b << ", d=" << s_ptr->d 
+		cerr << "    src={b=" << s_ptr->b << ", d=" << s_ptr->d
 		     << "}" << endl;
-		cerr << "    dst={b=" << d_ptr->b << ", d=" << d_ptr->d 
+		cerr << "    dst={b=" << d_ptr->b << ", d=" << d_ptr->d
 		     << "}" << endl;
 	    } // if
 	} // for
-    
+
 	/* Release resources */
 	free(buf);
 	free(bkg);
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index 1774cf2..a61bd09 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -48,7 +48,7 @@
 #define FILTER_CHUNK_DIM2 25
 
 // will do this function later or use it as guideline - BMR - 2007/01/26
-static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl, 
+static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
 		int if_fletcher32, int corrupted, hsize_t *dset_size)
 {
     cerr << "do nothing right now" << endl;
@@ -58,7 +58,7 @@ static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl,
 /* Temporary filter IDs used for testing */
 #define H5Z_FILTER_BOGUS        305
 static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
-    const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf); 
+    const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
 /* This message derives from H5Z */
 const H5Z_class_t H5Z_BOGUS[1] = {{
     H5Z_CLASS_T_VERS,       /* H5Z_class_t version */
@@ -228,7 +228,7 @@ void test_szip_filter(H5File& file1)
     {
         issue_fail_msg("test_szip_filter()", __LINE__, __FILE__, E.getCDetailMsg());
     }
-    } // if szip presents 
+    } // if szip presents
     else {
 	SKIPPED();
     }
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 5a7c678..258e904 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -300,7 +300,7 @@ static void test_h5s_scalar_write()
 	verify_val(ext_type, H5S_SCALAR, "DataSpace::getSimpleExtentType", __LINE__, __FILE__);
 
 	// Create and write a dataset
-	DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT,sid1); 
+	DataSet dataset = fid1.createDataSet("Dataset1", PredType::NATIVE_UINT,sid1);
 	dataset.write(&space3_data, PredType::NATIVE_UINT);
 
 	PASSED();
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index 9650a0e..0d9ea4f 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -190,7 +190,7 @@ static void test_reference_obj()
 	sid1.close();
 	dataset.close();
 	delete file1;
-	
+
 	// Re-open the file
 	file1 = new H5File(FILE1, H5F_ACC_RDWR);
 
@@ -198,9 +198,9 @@ static void test_reference_obj()
 	dataset = file1->openDataSet("/Dataset3");
 
 	// Read selection from disk
-	dataset.read(rbuf, PredType::STD_REF_OBJ); 
+	dataset.read(rbuf, PredType::STD_REF_OBJ);
 
-	// Dereference dataset object by ctor, from the location where 
+	// Dereference dataset object by ctor, from the location where
 	// 'dataset' is located
 	DataSet dset2(dataset, &rbuf[0]);
 
@@ -234,14 +234,14 @@ static void test_reference_obj()
 	verify_val(read_comment2, write_comment, "Group::getComment", __LINE__, __FILE__);
 	group.close();
 
-	// Dereference group object by ctor and using dataset to specify 
+	// Dereference group object by ctor and using dataset to specify
 	// location
 	Group new_group(dataset, &rbuf[2]);
 	H5std_string read_comment3 = new_group.getComment(".", 10);
 	verify_val(read_comment3, write_comment, "Group::getComment", __LINE__, __FILE__);
 	group.close();
 
-	// Dereference datatype object from the location where 'dataset' 
+	// Dereference datatype object from the location where 'dataset'
 	// is located
 	dtype1.dereference(dataset, &rbuf[3]);
 
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 557f400..4b4aaf3 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -121,7 +121,7 @@ static void test_classes()
 	}
 	PASSED();
     }   // end of try block
-    catch (Exception E) { 
+    catch (Exception E) {
 	issue_fail_msg("test_classes", __LINE__, __FILE__, E.getCDetailMsg());
     }
 }
@@ -176,8 +176,8 @@ static void test_copy()
         another_int_type = new_int_type;
 
 	PASSED();
-    } 
-    catch (Exception E) { 
+    }
+    catch (Exception E) {
 	issue_fail_msg("test_copy", __LINE__, __FILE__, E.getCDetailMsg());
     }
 }
@@ -189,12 +189,12 @@ static void test_copy()
  * Purpose:	Tests query functions of compound and enumeration types.
  *
  * Return:	Success: 	0
- * 	
+ *
  *		Failure:	number of errors
  *
  * Programmer:	Binh-Minh Ribler (use C version)
  *		January, 2007
- *  
+ *
  * Modifications:
  *
  *-------------------------------------------------------------------------
@@ -286,7 +286,7 @@ static void test_query()
         issue_fail_msg("test_query", __LINE__, __FILE__, E.getCDetailMsg());
     }
 }   // test_query
- 
+
 
 /*-------------------------------------------------------------------------
  * Function:	test_transient
@@ -308,7 +308,7 @@ const char* filename1 = "dtypes1.h5";
 static void test_transient ()
 {
     static hsize_t	ds_size[2] = {10, 20};
-    
+
     SUBTEST("Transient datatypes");
     try {
 
@@ -342,7 +342,7 @@ static void test_transient ()
 	} catch (DataTypeIException err) {}
 	itype.close();
 
-	// Get a copy of the dataset's datatype by applying DataType::copy() 
+	// Get a copy of the dataset's datatype by applying DataType::copy()
 	// to the dataset. The resulted datatype should be modifiable.
 	itype.copy(dset);
 	itype.setPrecision(256);
@@ -388,7 +388,7 @@ static void test_named ()
     static hsize_t	ds_size[2] = {10, 20};
     hsize_t		i;
     unsigned 		attr_data[10][20];
-    
+
     SUBTEST("Named datatypes");
     try {
 	// Create the file.
@@ -432,7 +432,7 @@ static void test_named ()
 
 	// It should be possible to define an attribute for the named type
 	Attribute attr1 = itype.createAttribute("attr1", PredType::NATIVE_UCHAR, space);
-	for (i=0; i<ds_size[0]*ds_size[1]; i++) 
+	for (i=0; i<ds_size[0]*ds_size[1]; i++)
 	    attr_data[0][i] = (int)i;/*tricky*/
 	attr1.write(PredType::NATIVE_UINT, attr_data);
 	attr1.close();
@@ -449,7 +449,7 @@ static void test_named ()
     /*
      * Close the committed type and reopen it.  It should return a named type.
 * This had something to do with the way IntType was returned and assigned
-and caused itype.committed not working correctly.  So, use another_type for 
+and caused itype.committed not working correctly.  So, use another_type for
 now.
 	itype.close();
 	itype = file.openIntType("native-int");
@@ -470,7 +470,7 @@ now.
 	dset.close();
 	ds_type->close();
 
-	// Reopen the dataset and its type, then make sure the type is 
+	// Reopen the dataset and its type, then make sure the type is
 	// a named type.
 	dset = file.openDataSet("dset1");
 	ds_type = new DataType(dset.getDataType());
@@ -492,7 +492,7 @@ now.
 	if (!iscommitted)
 	    throw InvalidActionException("DataType::iscommitted()", "Dataset type should be named type!");
 	ds_type->close();
-    
+
 	// Get the dataset datatype by applying DataType::copy() to the
 	// dataset. The resulted datatype should be modifiable.
 	IntType copied_type;
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index d4d0fd1..7470a8f 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -76,7 +76,7 @@ void *test_vlstr_alloc_custom(size_t size, void *info)
      *  This weird contortion is required on the DEC Alpha to keep the
      *  alignment correct - QAK
      */
-    
+
     extra=MAX(sizeof(void *),sizeof(size_t));
 
     if((ret_value=HDmalloc(extra+size))!=NULL) {
@@ -107,7 +107,7 @@ void test_vlstr_free_custom(void *_mem, void *info)
      *  This weird contortion is required on the DEC Alpha to keep the
      *  alignment correct - QAK
      */
-    
+
     extra=MAX(sizeof(void *),sizeof(size_t));
 
     if(_mem!=NULL) {
@@ -171,7 +171,7 @@ static void test_vlstrings_basic()
 	dataset2.close();
 	HDfree(wdata2);
 
-	// Change to the custom memory allocation routines for reading 
+	// Change to the custom memory allocation routines for reading
 	// VL string.
 	DSetMemXferPropList xfer;
 	int mem_used = 0;	// Memory used during allocation
@@ -238,7 +238,7 @@ static void test_vlstrings_basic()
 /*-------------------------------------------------------------------------
  * Function:	test_vlstrings_special
  *
- * Purpose:	Test VL string code for special string cases, nil and 
+ * Purpose:	Test VL string code for special string cases, nil and
  *		zero-sized.
  *
  * Return:	None
@@ -304,11 +304,11 @@ static void test_vlstrings_special()
 	// Close Dataset.
 	dataset.close();
 
-	/* 
+	/*
 	 * Create another dataset to test nil strings.
 	 */
 
-	// Create the property list and set the fill value for the second 
+	// Create the property list and set the fill value for the second
 	// dataset.
 	DSetCreatPropList dcpl;
 	char *fill = NULL;	// Fill value
@@ -593,7 +593,7 @@ static void test_write_vl_string_attribute()
 	// Open attribute ATTRSTR_NAME again.
 	gr_attr = root.openAttribute(ATTRSTR_NAME);
 
-	// The attribute string written is freed below, in the 
+	// The attribute string written is freed below, in the
 	// test_read_vl_string_attribute() test
 
 	// Close attribute and file
@@ -670,7 +670,7 @@ static void test_read_vl_string_attribute()
 } // test_read_vl_string_attribute
 
 /* Helper routine for test_vl_rewrite() */
-static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space, 
+static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space,
 				char *name, char *data)
 {
     DataSet dset;
@@ -688,7 +688,7 @@ static void write_scalar_dset(H5File& file, DataType& type, DataSpace& space,
 }
 
 /* Helper routine for test_vl_rewrite() */
-static void read_scalar_dset(H5File& file, DataType& type, DataSpace& space, 
+static void read_scalar_dset(H5File& file, DataType& type, DataSpace& space,
 				char *name, char *data)
 {
     char *data_read;
diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c
index 033aec1..646b395 100644
--- a/examples/h5_attribute.c
+++ b/examples/h5_attribute.c
@@ -202,7 +202,7 @@ main (void)
            ret   = H5Aread(attr, atype_mem, string_out);
            printf("Found string attribute; its index is %d , value =   %s \n", i, string_out);
            ret   = H5Tclose(atype_mem);
-      } 
+      }
        ret   = H5Aclose(attr);
        ret   = H5Tclose(atype);
     }
diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c
index a82e23d..bcbb65f 100644
--- a/examples/h5_elink_unix2win.c
+++ b/examples/h5_elink_unix2win.c
@@ -39,7 +39,7 @@
  * Note that this may not be necessary on your system; many Windows systems can
  * understand Unix paths.
  */
-static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group, 
+static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group,
     const void *udata, size_t udata_size, hid_t lapl_id)
 {
     hid_t         fid;
@@ -148,7 +148,7 @@ unix2win_example(void)
     if((fid=H5Fcreate("u2w/u2w_target.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
 #endif
     if(H5Fclose(fid) < 0) goto error;
-    
+
     /* Create the source file with an external link in Windows format */
     if((fid=H5Fcreate("unix2win.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0) goto error;
 
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index a728bb2..7886aeb 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -160,7 +160,7 @@ static void extlink_prefix_example(void)
     /* Close both groups. */
     H5Gclose(group2_id);
     H5Gclose(group_id);
-    
+
     /* If we change the prefix, the same external link can find a file in the blue
      * directory.
      */
diff --git a/examples/h5_interm_group.c b/examples/h5_interm_group.c
index 3d04d2e..bd9c7c4 100644
--- a/examples/h5_interm_group.c
+++ b/examples/h5_interm_group.c
@@ -61,47 +61,47 @@ main(void)
     /*
      * Check if group /G1 exists in the file.
      */
-    if(H5Lexists(file, "/G1", H5P_DEFAULT) !=FALSE) 
+    if(H5Lexists(file, "/G1", H5P_DEFAULT) !=FALSE)
     printf("Group /G1 exists in the file\n");
-    
+
     /*
-     * Check that group G2/G3 exists in /G1 and if not create it using 
+     * Check that group G2/G3 exists in /G1 and if not create it using
      * intermediate group creation property.
      */
     g1_id = H5Gopen2(file, "/G1", H5P_DEFAULT);
 /* Next commented call causes error stack to be printed out; the next one
- * works fine; is it a bug or a feature? EIP 04-25-07 
+ * works fine; is it a bug or a feature? EIP 04-25-07
 */
-/*  if (H5Lexists(g1_id, "G2/G3", H5P_DEFAULT) !=TRUE) { */ 
-    if (H5Lexists(g1_id, "G2", H5P_DEFAULT) !=TRUE) {  
-       
+/*  if (H5Lexists(g1_id, "G2/G3", H5P_DEFAULT) !=TRUE) { */
+    if (H5Lexists(g1_id, "G2", H5P_DEFAULT) !=TRUE) {
+
     grp_crt_plist = H5Pcreate(H5P_LINK_CREATE);
 
     /* Set flag for intermediate group creation */
     status = H5Pset_create_intermediate_group(grp_crt_plist, TRUE);
     g3_id = H5Gcreate2(g1_id, "G2/G3", grp_crt_plist, H5P_DEFAULT, H5P_DEFAULT);
     H5Gclose(g3_id);
-    } 
+    }
     H5Gclose(g1_id);
 
 
     /* Now check if group /G1/G2 exists in the file, then open it and print
      * its members names
      */
-    if (H5Lexists(file, "/G1/G2", H5P_DEFAULT)) { 
+    if (H5Lexists(file, "/G1/G2", H5P_DEFAULT)) {
 
     	g2_id = H5Gopen2(file, "/G1/G2", H5P_DEFAULT);
     	status = H5Gget_info(g2_id, &g2_info);
     	printf("Group /G1/G2 has %d member(s)\n", (int)g2_info.nlinks);
 
     	for (i=0; i < (int)g2_info.nlinks; i++) {
-    	H5Lget_name_by_idx(g2_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)i, 
+    	H5Lget_name_by_idx(g2_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)i,
     	                   name, 3, H5P_DEFAULT);
     	printf("Object's name is %s\n", name);
 
     	}
     H5Gclose(g2_id);
-    } 
+    }
     H5Fclose(file);
     return 0;
 }
diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
index 9c75d91..d6df438 100644
--- a/examples/h5_ref2reg.c
+++ b/examples/h5_ref2reg.c
@@ -13,16 +13,16 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*
-    This program shows how to create, store and dereference references 
+    This program shows how to create, store and dereference references
     to the dataset regions.
 
     It creates a file and writes a two dimensional integer dataset
-    to it. Then it creates a dataset to store region references in. It 
+    to it. Then it creates a dataset to store region references in. It
     stores references to a hyperslab and 3 points selected (for the
-    integer dataset previously created). 
+    integer dataset previously created).
 
-    It then reopens the references dataset, reads and dereferences the 
-    region references, and then reads and displays the selected hyperslab 
+    It then reopens the references dataset, reads and dereferences the
+    region references, and then reads and displays the selected hyperslab
     and selected elements data from the integer dataset.
 */
 
@@ -36,9 +36,9 @@ int main(void)
 {
     hid_t file_id;        /* file identifier */
     hid_t space_id;       /* dataspace identifiers */
-    hid_t spacer_id;      
+    hid_t spacer_id;
     hid_t dsetv_id;       /*dataset identifiers*/
-    hid_t dsetr_id;      
+    hid_t dsetr_id;
     hsize_t dims[2] =  {2,9};
     hsize_t dimsr[1] =  {2};
     int rank = 2;
@@ -56,29 +56,29 @@ int main(void)
     size_t name_size1, name_size2;
     char buf1[10], buf2[10];
 
-    /* 
+    /*
      * Create file with default file access and file creation properties.
      */
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
-    /* 
+    /*
      * Create dataspace for datasets.
      */
     space_id = H5Screate_simple(rank, dims, NULL);
     spacer_id = H5Screate_simple(rankr, dimsr, NULL);
 
-    /* 
-     * Create integer dataset. 
+    /*
+     * Create integer dataset.
      */
     dsetv_id = H5Dcreate2(file_id, dsetnamev, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-    /* 
+    /*
      * Write data to the dataset.
      */
     status = H5Dwrite(dsetv_id, H5T_NATIVE_INT, H5S_ALL , H5S_ALL, H5P_DEFAULT,data);
     status = H5Dclose(dsetv_id);
 
-    /* 
+    /*
      * Dataset with references.
      */
     dsetr_id = H5Dcreate2(file_id, dsetnamer, H5T_STD_REF_DSETREG, spacer_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -86,8 +86,8 @@ int main(void)
     /*
      * Create a reference to the hyperslab.
      */
-    start[0] = 0; 
-    start[1] = 3; 
+    start[0] = 0;
+    start[1] = 3;
     count[0] = 2;
     count[1] = 3;
     status = H5Sselect_hyperslab(space_id, H5S_SELECT_SET, start, NULL, count, NULL);
@@ -119,42 +119,42 @@ int main(void)
     file_id = H5Fopen(filename, H5F_ACC_RDWR,  H5P_DEFAULT);
 
     /*
-     * Reopen the dataset with object references and read references 
+     * Reopen the dataset with object references and read references
      * to the buffer.
      */
     dsetr_id = H5Dopen2(file_id, dsetnamer, H5P_DEFAULT);
 
-    status = H5Dread(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, 
+    status = H5Dread(dsetr_id, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL,
                    H5P_DEFAULT, ref_out);
 
-    /* 
+    /*
      * Dereference the first reference.
      */
     dsetv_id = H5Rdereference(dsetr_id, H5R_DATASET_REGION, &ref_out[0]);
     /*
      * Get name of the dataset the first region reference points to
-     * using H5Rget_name 
+     * using H5Rget_name
      */
     name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, 10);
-    printf(" Dataset's name (returned by H5Rget_name) the reference points to is %s, name length is %d\n", buf1, (int)name_size1); 
+    printf(" Dataset's name (returned by H5Rget_name) the reference points to is %s, name length is %d\n", buf1, (int)name_size1);
     /*
      * Get name of the dataset the first region reference points to
-     * using H5Iget_name 
+     * using H5Iget_name
      */
-    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, 10); 
-    printf(" Dataset's name (returned by H5Iget_name) the reference points to is %s, name length is %d\n", buf2, (int)name_size2); 
+    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, 10);
+    printf(" Dataset's name (returned by H5Iget_name) the reference points to is %s, name length is %d\n", buf2, (int)name_size2);
 
     space_id = H5Rget_region(dsetr_id, H5R_DATASET_REGION,&ref_out[0]);
 
-    /* 
+    /*
      * Read and display hyperslab selection from the dataset.
      */
 
-    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id, 
+    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id,
                    H5P_DEFAULT, data_out);
     printf("Selected hyperslab: ");
     for (i = 0; i <= 1; i++)
-    {   
+    {
         printf("\n");
         for (j = 0; j <= 8; j++)
             printf("%d ", data_out[i][j]);
@@ -184,11 +184,11 @@ int main(void)
      * Read selected data from the dataset.
      */
 
-    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id, 
+    status = H5Dread(dsetv_id, H5T_NATIVE_INT, H5S_ALL, space_id,
                    H5P_DEFAULT, data_out);
     printf("Selected points: ");
     for (i = 0; i <= 1; i++)
-    {   
+    {
         printf("\n");
         for (j = 0; j <= 8; j++)
             printf("%d ", data_out[i][j]);
@@ -205,6 +205,6 @@ int main(void)
 
     return 0;
 }
-    
+
 
 
diff --git a/examples/h5_shared_mesg.c b/examples/h5_shared_mesg.c
index 68340e0..a2edb38 100644
--- a/examples/h5_shared_mesg.c
+++ b/examples/h5_shared_mesg.c
@@ -17,7 +17,7 @@
  *  This program illustrates the usage of HDF5's implicit message sharing
  *  feature, which can be used to save space when the same messages are
  *  used many times in a file.
- *  
+ *
  *  This example creates a standard file using file creation property lists
  *  to control which messages are shared.  Messages that can be shared are
  *  datatypes, dataspaces, attributes, fill values, and filter pipelines.
@@ -153,7 +153,7 @@ int main(void)
 
     ret = create_standard_file("only_huge_mesgs_file.h5", fcpl_id);
     if(ret < 0) goto error;
- 
+
 
     /* Or, suppose we only wanted to shared dataspaces and
      * attributes (which might make sense if we were going to use committed
@@ -176,7 +176,7 @@ int main(void)
     if(ret < 0) goto error;
     ret = H5Pset_shared_mesg_index(fcpl_id, 1, H5O_SHMESG_ATTR_FLAG, 40);
     if(ret < 0) goto error;
-    
+
     ret = create_standard_file("separate_indexes_file.h5", fcpl_id);
     if(ret < 0) goto error;
 
@@ -242,7 +242,7 @@ create_standard_file(const char *filename, hid_t fcpl_id)
 {
     hid_t file_id=-1;
     hid_t type_id=-1, temp_type_id=-1;
-    hsize_t dims[] = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; 
+    hsize_t dims[] = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
     hid_t space_id=-1;
     hid_t attr_type_id = -1;
     hid_t attr_space_id = -1;
@@ -252,7 +252,7 @@ create_standard_file(const char *filename, hid_t fcpl_id)
     int x;
     herr_t ret;
 
-    /* Create the file */ 
+    /* Create the file */
     file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
     if(file_id < 0) goto error;
 
diff --git a/examples/mdj_api_example.c b/examples/mdj_api_example.c
index 36d7fea..c798df3 100644
--- a/examples/mdj_api_example.c
+++ b/examples/mdj_api_example.c
@@ -28,68 +28,68 @@
 /*-------------------------------------------------------------------------
  * Function:	mdj_api_example
  *
- * Purpose:	This example demonstrates enabling metadata journaling at file 
- * 		creation time and enabling journaling on an open file.  It 
- * 		also demonstrates disabling metadata journaling both manually 
+ * Purpose:	This example demonstrates enabling metadata journaling at file
+ * 		creation time and enabling journaling on an open file.  It
+ * 		also demonstrates disabling metadata journaling both manually
  * 		during a computation and automatically at file close.  Finally,
  * 		it demonstrates the use of H5Fflush() to keep the journal
  * 		file from becoming too large.
  *
  * 		We begin by creating an HDF5 file with journaling enabled.
  * 		The paths to the HDF5 and journal files are passed in, so
- * 		the only point to consider is whether the journal file 
- * 		already exists, as HDF5 will refuse to overwrite it if 
+ * 		the only point to consider is whether the journal file
+ * 		already exists, as HDF5 will refuse to overwrite it if
  * 		it does.  In this example, we just remove any pre-existing
  * 		journal file unconditionally, but you will probably wish
  * 		to do otherwise in your application.
  *
- *              With these preliminaries dealt with, we allocate a 
- *              file access property list (FAPL).  Journaling uses some 
+ *              With these preliminaries dealt with, we allocate a
+ *              file access property list (FAPL).  Journaling uses some
  *              recent extensions to the superblock, so the first step
  *              is to call H5Pset_libver_bounds() to specify using the
  *              latest version of the HDF5 file format.
  *
- *              Next, we must set up the journaling property.  We could 
+ *              Next, we must set up the journaling property.  We could
  *              do this in several ways, but in this example we will use
- *              H5Pget_jnl_config() to get the default journaling 
- *              configuration, modify that configuration as needed, and then 
+ *              H5Pget_jnl_config() to get the default journaling
+ *              configuration, modify that configuration as needed, and then
  *		use H5Pset_jnl_config() to replace the default journaling
- *              configuration with our own.  See the comments in the code 
- *		for the particulars -- note that we must set the version 
- *		field of the H5AC2_jnl_config_t struct before calling 
+ *              configuration with our own.  See the comments in the code
+ *		for the particulars -- note that we must set the version
+ *		field of the H5AC2_jnl_config_t struct before calling
  *              H5Pget_jnl_config().
  *
  *		After setting up the FAPL, we create the file as usual.
  *		Since the FAPL calls for metadata journaling, journaling
  *              will be enabled on this file.
  *
- *		With the file created and journaling running, we then go off 
+ *		With the file created and journaling running, we then go off
  *		and do what we want -- in this example we set up a selection
- *		of chunked datasets.  Note that these datasets (and our 
+ *		of chunked datasets.  Note that these datasets (and our
  *		access pattern) are chosen to maximize the amount of dirty
- *		metadata generated.  This is done deliberately to exercise 
- *              the matadata journaling features.  Your application will 
+ *		metadata generated.  This is done deliberately to exercise
+ *              the matadata journaling features.  Your application will
  *		presumably be structured quite differently.
  *
  *		After the datasets are created, we then shut down journaling
  *		and re-enable it via H5Fget_jnl_config() and H5Fset_jnl_config()
- *		calls.  Note that when we re-enable journaling via the 
- *		H5Fset_jnl_config() call, we don't need to set all the fields 
+ *		calls.  Note that when we re-enable journaling via the
+ *		H5Fset_jnl_config() call, we don't need to set all the fields
  *		in the H5AC2_jnl_config_t struct again; we are simply re-using
- *		the configuration obtained via the H5Fget_jnl_config() call.  
+ *		the configuration obtained via the H5Fget_jnl_config() call.
  *		(If we had originally opened the file without journaling and
  *		then wanted to enable journaling, we would have to set up the
- *		fields of the H5AC2_jnl_config_t struct in much the same way 
- *		we did earlier in this example.  We would also have had to 
- *		use H5Pset_libver_bounds() to set the FAPL to create the file 
- *              initially with the latest HDF5 file format format.) 
+ *		fields of the H5AC2_jnl_config_t struct in much the same way
+ *		we did earlier in this example.  We would also have had to
+ *		use H5Pset_libver_bounds() to set the FAPL to create the file
+ *              initially with the latest HDF5 file format format.)
  *
- *		Having re-enabled journaling, we then proceed to write to 
+ *		Having re-enabled journaling, we then proceed to write to
  *		our datasets.  Again, please note that our write strategy
  *		(round robin and small chunks) is designed to maximize
  *		dirty metadata generation and to load on the metadata cache.
  *		In your application, you should try to do just the opposite
- *		if possible.  
+ *		if possible.
  *
  *		However, since we are maximizing dirty metadata generation,
  *		the journal file will grow quickly.  This can be a problem,
@@ -98,24 +98,24 @@
  *		and then truncates the journal file, as the content of the
  *		journal becomes irrelevant after the file is flushed.
  *
- * 		After writing data to our datasets, we then do a number of 
- * 		reads.  We could turn off journaling here, as we are not 
- * 		modifying the file.  But since we are not generating any 
+ * 		After writing data to our datasets, we then do a number of
+ * 		reads.  We could turn off journaling here, as we are not
+ * 		modifying the file.  But since we are not generating any
  * 		dirty metadata, we aren't generating any journal entries
  * 		either, so it really doesn't matter.
  *
  * 		Finally, we close the HDF5 file.  Since journaling is enabled,
- * 		the call to H5Fclose() will flush the journal, flush the 
- * 		metadata cache, truncate the journal, mark the file as not 
- * 		having journaling in progress, and then delete the journal 
+ * 		the call to H5Fclose() will flush the journal, flush the
+ * 		metadata cache, truncate the journal, mark the file as not
+ * 		having journaling in progress, and then delete the journal
  * 		file as part of the close.
  *
- *              This example may run for several minutes.  If you are 
+ *              This example may run for several minutes.  If you are
  *              interested in observing the example's behavior (or if you're
- *              just bored), run 'ls -l' every few seconds in the directory 
- *              containing the journal file; you will be able to watch the 
- *              journal file grow, see when it is truncated as the file is 
- *              flushed, and watch it grow again.  This cycle is repeated many 
+ *              just bored), run 'ls -l' every few seconds in the directory
+ *              containing the journal file; you will be able to watch the
+ *              journal file grow, see when it is truncated as the file is
+ *              flushed, and watch it grow again.  This cycle is repeated many
  *              times through the course of the example.
  *
  *
@@ -179,7 +179,7 @@ mdj_api_example(char * hdf5_file_name,
     }
 
     /* The HDF5 Library will refuse to overwrite an existing journal
-     * file -- thus we delete it unconditionally here.  You probably 
+     * file -- thus we delete it unconditionally here.  You probably
      * want to to be more cautious in your application.
      */
     remove(jnl_file_name);
@@ -198,19 +198,19 @@ mdj_api_example(char * hdf5_file_name,
 
 
     /* Metadata journaling requires the latest version of the file format.  */
-    if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+    if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 			      H5F_LIBVER_LATEST) < 0 ) {
 
-	fprintf(stderr, 
+	fprintf(stderr,
 		"can't set latest version of file format.  Exiting...\n");
 	exit(1);
     }
 
 
-    /* Get the current FAPL journaling configuration; this will normally be 
+    /* Get the current FAPL journaling configuration; this will normally be
      * the default. We could just write a predefined journal configuration
-     * structure to the FAPL directly, but creating it in the manner 
-     * illustrated here shows off the H5Pget_jnl_config() call and is less 
+     * structure to the FAPL directly, but creating it in the manner
+     * illustrated here shows off the H5Pget_jnl_config() call and is less
      * susceptible to API definition changes.
      */
     jnl_config_0.version = H5AC2__CURR_JNL_CONFIG_VER;
@@ -224,7 +224,7 @@ mdj_api_example(char * hdf5_file_name,
     }
 
 
-    /* Modify the current FAPL journaling configuration to enable 
+    /* Modify the current FAPL journaling configuration to enable
      * journaling as desired, then write the revised configuration
      * back to the FAPL.
      */
@@ -233,36 +233,36 @@ mdj_api_example(char * hdf5_file_name,
     strcpy(jnl_config_0.journal_file_path, jnl_file_name);
 
     /* jnl_config_0.journal_recovered should always be FALSE unless
-     * you are writing a new journal recovery tool and need to 
-     * tell the library that you have recovered the journal and 
-     * that the file is now readable.  As this field is set to 
+     * you are writing a new journal recovery tool and need to
+     * tell the library that you have recovered the journal and
+     * that the file is now readable.  As this field is set to
      * FALSE by default, we don't touch it here.
      */
 
-    /* The journal buffer size should be some multiple of the block 
-     * size of the underlying file system.  
+    /* The journal buffer size should be some multiple of the block
+     * size of the underlying file system.
      */
     jnl_config_0.jbrb_buf_size = (8 * 1024);
 
-    /* The number of journal buffers should be either 1 or 2 when 
-     * synchronous I/O is used for journal writes.  If asynchronous I/O (AIO) 
-     * is used, the number should be large enough that the write of a buffer 
+    /* The number of journal buffers should be either 1 or 2 when
+     * synchronous I/O is used for journal writes.  If asynchronous I/O (AIO)
+     * is used, the number should be large enough that the write of a buffer
      * will usually be complete by the time that buffer is needed again.
      */
     jnl_config_0.jbrb_num_bufs = 2;
 
-    /* At present, HDF5 does not support AIO for journal writes, so this 
+    /* At present, HDF5 does not support AIO for journal writes, so this
      * field will be FALSE.
      */
     jnl_config_0.jbrb_use_aio = 0; /* FALSE */
 
     /* At present, only human-readable journal files are supported,
-     * so this field will be TRUE for now.  Once machine readable journal 
-     * files become available, journaling should be faster and journal files 
+     * so this field will be TRUE for now.  Once machine readable journal
+     * files become available, journaling should be faster and journal files
      * will be smaller.
      */
     jnl_config_0.jbrb_human_readable = 1; /* TRUE */
-        
+
     status = H5Pset_jnl_config(fapl_id, &jnl_config_0);
 
     if ( status < 0 ) {
@@ -304,7 +304,7 @@ mdj_api_example(char * hdf5_file_name,
 	    exit(1);
 	}
 
-        /* Set the dataset creation property list to specify that the raw data 
+        /* Set the dataset creation property list to specify that the raw data
          * is to be partitioned into 10X10 element chunks.
          */
 
@@ -327,7 +327,7 @@ mdj_api_example(char * hdf5_file_name,
         /* Create the dataset. */
         sprintf(dset_name, "/dset%03d", i);
         dataset_ids[i] = H5Dcreate2(file_id, dset_name, H5T_STD_I32BE,
-			            dataspace_id, H5P_DEFAULT, 
+			            dataspace_id, H5P_DEFAULT,
 				    properties, H5P_DEFAULT);
 
         if ( dataset_ids[i] < 0 ) {
@@ -353,10 +353,10 @@ mdj_api_example(char * hdf5_file_name,
     fprintf(stdout, "disabling and re-enabling journaling...");
     fflush(stdout);
 
-    /* Just for purposes of demonstration, turn off journaling and 
-     * turn it back on again.  Note that this will force a 
-     * flush of the file, including all metadata.  Turning off 
-     * journaling will also cause HDF5 to close and discard the 
+    /* Just for purposes of demonstration, turn off journaling and
+     * turn it back on again.  Note that this will force a
+     * flush of the file, including all metadata.  Turning off
+     * journaling will also cause HDF5 to close and discard the
      * journal file after all metadata is on disk.
      */
     jnl_config_1.version = H5AC2__CURR_JNL_CONFIG_VER;
@@ -381,10 +381,10 @@ mdj_api_example(char * hdf5_file_name,
 
 
     /* Note that here we simply set jnl_config_1.enable_journaling to
-     * TRUE and pass it back to the HDF5 library via the 
-     * H5Fset_jnl_config() call.  
+     * TRUE and pass it back to the HDF5 library via the
+     * H5Fset_jnl_config() call.
      *
-     * We can do this because jnl_config_1 reflected the current 
+     * We can do this because jnl_config_1 reflected the current
      * journaling configuration when we got it from the library
      * via the H5Fget_jnl_config() call, and H5Fset_mdc_config()
      * doesn't change the values of any fields.
@@ -464,7 +464,7 @@ mdj_api_example(char * hdf5_file_name,
 
                 if ( status < 0 ) {
 
-		    fprintf(stderr, 
+		    fprintf(stderr,
 		        "disk H5Sselect_hyperslab() failed.  Exiting...\n");
 		    exit(1);
                 }
@@ -485,18 +485,18 @@ mdj_api_example(char * hdf5_file_name,
 
         i += CHUNK_SIZE;
 
-	/* We are generating a lot of dirty metadata here, all of which 
+	/* We are generating a lot of dirty metadata here, all of which
 	 * will wind up in the journal file.  To keep the journal file
-	 * from getting too big (and to make sure the raw data is on 
+	 * from getting too big (and to make sure the raw data is on
 	 * disk), we should do an occasional flush of the HDF5 file.
 	 *
 	 * This will force all metadata to disk and cause the journal
 	 * file to be truncated.
 	 *
-	 * On the other hand, it will impose a significant file I/O 
+	 * On the other hand, it will impose a significant file I/O
 	 * overhead, and slow us down. (Try it both ways.)
 	 */
-#if 1 
+#if 1
 	status = H5Fflush(file_id, H5F_SCOPE_GLOBAL);
 
         if ( status < 0 ) {
@@ -713,7 +713,7 @@ mdj_api_example(char * hdf5_file_name,
 
 } /* mdj_api_example() */
 
-int 
+int
 main(void)
 {
     mdj_api_example(HDF5_FILE_NAME, JOURNAL_FILE_NAME);
diff --git a/fortran/examples/attrexample.f90 b/fortran/examples/attrexample.f90
index 9cf96dc..ffbeabe 100644
--- a/fortran/examples/attrexample.f90
+++ b/fortran/examples/attrexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,30 +11,30 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-! This example shows how to create and write a dataset attribute. 
+! This example shows how to create and write a dataset attribute.
 ! It opens the existing file 'dset.h5', obtains the identifier of
-! the dataset "/dset", defines attribute's dataspace, 
+! the dataset "/dset", defines attribute's dataspace,
 ! creates dataset attribute, writes the attribute, and then closes
-! the attribute's dataspace, attribute, dataset, and file. 
+! the attribute's dataspace, attribute, dataset, and file.
 
      PROGRAM ATTREXAMPLE
 
-        
-     USE HDF5 ! This module contains all necessary modules 
-        
+
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "dsetf.h5" ! File name
      CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
      CHARACTER(LEN=9), PARAMETER :: aname = "attr_long"   ! Attribute name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-     INTEGER(HID_T) :: attr_id       ! Attribute identifier 
-     INTEGER(HID_T) :: aspace_id     ! Attribute Dataspace identifier 
-     INTEGER(HID_T) :: atype_id      ! Attribute Dataspace identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: attr_id       ! Attribute identifier
+     INTEGER(HID_T) :: aspace_id     ! Attribute Dataspace identifier
+     INTEGER(HID_T) :: atype_id      ! Attribute Dataspace identifier
      INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
      INTEGER     ::   arank = 1                      ! Attribure rank
      INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
@@ -43,31 +43,31 @@
 
      INTEGER     ::   error ! Error flag
      INTEGER(HSIZE_T), DIMENSION(1) :: data_dims
-     
+
 
      !
      ! Initialize attribute's data
      !
      attr_data(1) = "Dataset character attribute"
      attr_data(2) = "Some other string here     "
-     attrlen = 80 
+     attrlen = 80
      !
      ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
-    
+     CALL h5open_f(error)
+
      !
      ! Open an existing file.
      !
      CALL h5fopen_f (filename, H5F_ACC_RDWR_F, file_id, error)
 
      !
-     ! Open an existing dataset. 
+     ! Open an existing dataset.
      !
      CALL h5dopen_f(file_id, dsetname, dset_id, error)
 
      !
-     ! Create scalar data space for the attribute. 
+     ! Create scalar data space for the attribute.
      !
      CALL h5screate_simple_f(arank, adims, aspace_id, error)
      !
@@ -75,35 +75,35 @@
      !
      CALL h5tcopy_f(H5T_NATIVE_CHARACTER, atype_id, error)
      CALL h5tset_size_f(atype_id, attrlen, error)
-     
+
      !
      ! Create dataset attribute.
      !
      CALL h5acreate_f(dset_id, aname, atype_id, aspace_id, &
                       attr_id, error)
-     
+
      !
      ! Write the attribute data.
      !
      data_dims(1) = 2
      CALL h5awrite_f(attr_id, atype_id, attr_data, data_dims, error)
-     
+
      !
-     ! Close the attribute. 
+     ! Close the attribute.
      !
      CALL h5aclose_f(attr_id, error)
-     
+
      !
      ! Terminate access to the data space.
      !
      CALL h5sclose_f(aspace_id, error)
 
-     !   
+     !
      ! End access to the dataset and release resources used by it.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
 
-     ! 
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
@@ -113,5 +113,5 @@
      !
      CALL h5close_f(error)
 
-     END PROGRAM ATTREXAMPLE 
- 
+     END PROGRAM ATTREXAMPLE
+
diff --git a/fortran/examples/compound.f90 b/fortran/examples/compound.f90
index a315fb0..2005f41 100644
--- a/fortran/examples/compound.f90
+++ b/fortran/examples/compound.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This program creates a dataset that is one dimensional array of
@@ -26,23 +26,23 @@
 
      PROGRAM COMPOUNDEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=11), PARAMETER :: filename = "compound.h5" ! File name
      CHARACTER(LEN=8), PARAMETER :: dsetname = "Compound"     ! Dataset name
      INTEGER, PARAMETER :: dimsize = 6 ! Size of the dataset
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
      INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
      INTEGER(HID_T) :: dtype_id      ! Compound datatype identifier
      INTEGER(HID_T) :: dt1_id      ! Memory datatype identifier (for character field)
      INTEGER(HID_T) :: dt2_id      ! Memory datatype identifier (for integer field)
      INTEGER(HID_T) :: dt3_id      ! Memory datatype identifier (for double precision field)
      INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
-     INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier 
+     INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
      INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
      INTEGER(SIZE_T) :: typesize
 
@@ -52,7 +52,7 @@
 
      INTEGER     ::   error ! Error flag
      INTEGER(SIZE_T)     ::   type_size  ! Size of the datatype
-     INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype 
+     INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype
      INTEGER(SIZE_T)     ::   type_sizei  ! Size of the integer datatype
      INTEGER(SIZE_T)     ::   type_sized  ! Size of the double precision datatype
      INTEGER(SIZE_T)     ::   type_sizer  ! Size of the real datatype
@@ -63,7 +63,7 @@
      DOUBLE PRECISION, DIMENSION(dimsize) :: double_member
      REAL, DIMENSION(dimsize)             :: real_member
      INTEGER :: i
-     INTEGER(HSIZE_T), DIMENSION(1) :: data_dims 
+     INTEGER(HSIZE_T), DIMENSION(1) :: data_dims
      data_dims(1) = dimsize
      !
      ! Initialize data buffer.
@@ -71,8 +71,8 @@
      do i = 1, dimsize
         char_member(i)(1:1) = char(65+i)
         char_member(i)(2:2) = char(65+i)
-        char_member_out(i)(1:1)   = char(65) 
-        char_member_out(i)(2:2)   = char(65) 
+        char_member_out(i)(1:1)   = char(65)
+        char_member_out(i)(2:2)   = char(65)
         int_member(i)   = i
         double_member(i)   = 2.* i
         real_member(i)   = 3. * i
@@ -91,10 +91,10 @@
 
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
-     ! 
+     !
      ! Create the dataspace.
      !
      CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -141,8 +141,8 @@
      CALL h5dcreate_f(file_id, dsetname, dtype_id, dspace_id, &
                       dset_id, error)
      !
-     ! Create memory types. We have to create a compound datatype 
-     ! for each member we want to write. 
+     ! Create memory types. We have to create a compound datatype
+     ! for each member we want to write.
      !
      CALL h5tcreate_f(H5T_COMPOUND_F, type_sizec, dt1_id, error)
      offset = 0
@@ -167,9 +167,9 @@
      CALL h5dwrite_f(dset_id, dt3_id, double_member, data_dims, error, xfer_prp = plist_id)
      CALL h5dwrite_f(dset_id, dt2_id, int_member, data_dims, error, xfer_prp = plist_id)
 
-     !   
+     !
      ! End access to the dataset and release resources used by it.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
 
      !
@@ -186,11 +186,11 @@
      CALL h5tclose_f(dt4_id, error)
      CALL h5tclose_f(dt5_id, error)
 
-     ! 
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
-     
+
      !
      ! Open the file.
      !
@@ -227,6 +227,6 @@
      !
      CALL h5close_f(error)
 
-     END PROGRAM COMPOUNDEXAMPLE 
-     
- 
+     END PROGRAM COMPOUNDEXAMPLE
+
+
diff --git a/fortran/examples/dsetexample.f90 b/fortran/examples/dsetexample.f90
index 69609b4..209a516 100644
--- a/fortran/examples/dsetexample.f90
+++ b/fortran/examples/dsetexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,10 +11,10 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! The following example shows how to create an empty dataset. 
+! The following example shows how to create an empty dataset.
 ! It creates a file called 'dsetf.h5', defines the
 ! dataset dataspace, creates a dataset which is a 4x6 integer array,
 ! and then closes the dataspace, the dataset, and the file.
@@ -22,15 +22,15 @@
 
      PROGRAM DSETEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "dsetf.h5" ! File name
      CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
      INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
 
 
@@ -46,10 +46,10 @@
 
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
-     ! 
+     !
      ! Create the dataspace.
      !
      CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -60,9 +60,9 @@
      CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
                       dset_id, error)
 
-     !   
+     !
      ! End access to the dataset and release resources used by it.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
 
      !
@@ -70,7 +70,7 @@
      !
      CALL h5sclose_f(dspace_id, error)
 
-     ! 
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
@@ -80,6 +80,6 @@
      !
      CALL h5close_f(error)
 
-     END PROGRAM DSETEXAMPLE 
-     
- 
+     END PROGRAM DSETEXAMPLE
+
+
diff --git a/fortran/examples/fileexample.f90 b/fortran/examples/fileexample.f90
index c25bfef..87119d2 100644
--- a/fortran/examples/fileexample.f90
+++ b/fortran/examples/fileexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! The following example demonstrates how to create and close an HDF5 file.
@@ -20,22 +20,22 @@
 
      PROGRAM FILEEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "filef.h5" ! File name
      INTEGER(HID_T) :: file_id                            ! File identifier
- 
+
      INTEGER     ::   error  ! Error flag
-     
+
 !
 !    Initialize FORTRAN interface.
 !
      CALL h5open_f (error)
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
      !
@@ -46,4 +46,4 @@
 !    Close FORTRAN interface.
 !
      CALL h5close_f(error)
-     END PROGRAM FILEEXAMPLE 
+     END PROGRAM FILEEXAMPLE
diff --git a/fortran/examples/groupexample.f90 b/fortran/examples/groupexample.f90
index cb069df..91ebc50 100644
--- a/fortran/examples/groupexample.f90
+++ b/fortran/examples/groupexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,35 +11,35 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! The following example shows how to create and close a group. 
+! The following example shows how to create and close a group.
 ! It creates a file called 'group.h5', creates a group
 ! called MyGroup in the root group, and then closes the group and file.
-! 
+!
 
 
      PROGRAM GROUPEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=9), PARAMETER :: filename = "groupf.h5" ! File name
      CHARACTER(LEN=7), PARAMETER :: groupname = "MyGroup"  ! Group name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: group_id      ! Group identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: group_id      ! Group identifier
 
      INTEGER     ::   error ! Error flag
 !
 !    Initialize FORTRAN interface.
 !
-     CALL h5open_f(error)     
+     CALL h5open_f(error)
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
      !
@@ -61,4 +61,4 @@
 !
      CALL h5close_f(error)
 
-     END PROGRAM GROUPEXAMPLE 
+     END PROGRAM GROUPEXAMPLE
diff --git a/fortran/examples/grpdsetexample.f90 b/fortran/examples/grpdsetexample.f90
index ce89304..19fc660 100644
--- a/fortran/examples/grpdsetexample.f90
+++ b/fortran/examples/grpdsetexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This example shows how to create a dataset in a particular group.
@@ -22,8 +22,8 @@
 
      PROGRAM GRPDSETEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=10), PARAMETER :: filename = "groupsf.h5" ! File name
@@ -31,17 +31,17 @@
      CHARACTER(LEN=13), PARAMETER :: dsetname1 = "MyGroup/dset1"  ! Dataset name
      CHARACTER(LEN=5),  PARAMETER :: dsetname2 = "dset2" ! dataset name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: group_id      ! Group identifier 
-     INTEGER(HID_T) :: dataset_id    ! Dataset identifier 
-     INTEGER(HID_T) :: dataspace_id  ! Data space identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: group_id      ! Group identifier
+     INTEGER(HID_T) :: dataset_id    ! Dataset identifier
+     INTEGER(HID_T) :: dataspace_id  ! Data space identifier
 
-     INTEGER     ::  i, j 
+     INTEGER     ::  i, j
      INTEGER     ::   error ! Error flag
 
-     INTEGER, DIMENSION(3,3) :: dset1_data  ! Data arrays 
+     INTEGER, DIMENSION(3,3) :: dset1_data  ! Data arrays
      INTEGER, DIMENSION(2,10) :: dset2_data !
-     
+
      INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/3,3/) ! Datasets dimensions
      INTEGER(HSIZE_T), DIMENSION(2) :: dims2 = (/2,10/)!
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
@@ -70,7 +70,7 @@
      !
      ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
      !
      ! Open an existing file.
@@ -78,7 +78,7 @@
      CALL h5fopen_f (filename, H5F_ACC_RDWR_F, file_id, error)
 
      !
-     ! Create the data space for the first dataset. 
+     ! Create the data space for the first dataset.
      !
      CALL h5screate_simple_f(rank, dims1, dataspace_id, error)
 
@@ -111,7 +111,7 @@
      CALL h5gopen_f(file_id, groupname, group_id, error)
 
      !
-     !Create the data space for the second dataset. 
+     !Create the data space for the second dataset.
      !
      CALL h5screate_simple_f(rank, dims2, dataspace_id, error)
 
@@ -125,7 +125,7 @@
      ! Write the second dataset.
      !
      data_dims(1) = 2
-     data_dims(1) = 10 
+     data_dims(1) = 10
      CALL h5dwrite_f(dataset_id, H5T_NATIVE_INTEGER, dset2_data, data_dims, error)
 
      !
@@ -153,4 +153,4 @@
      !
      CALL h5close_f(error)
 
-     END PROGRAM GRPDSETEXAMPLE 
+     END PROGRAM GRPDSETEXAMPLE
diff --git a/fortran/examples/grpit.f90 b/fortran/examples/grpit.f90
index 86a87b1..9361b17 100644
--- a/fortran/examples/grpit.f90
+++ b/fortran/examples/grpit.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! In this example we iterate through the members of the groups.
@@ -20,8 +20,8 @@
 
      PROGRAM GRPITEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=11), PARAMETER :: filename = "iteratef.h5" ! File name
@@ -34,12 +34,12 @@
      INTEGER :: type ! Type of the object
      INTEGER :: nmembers ! Number of group members
 
-     INTEGER(HID_T) :: file_id        ! File identifier 
-     INTEGER(HID_T) :: dataset1_id    ! Dataset1 identifier 
-     INTEGER(HID_T) :: dataset2_id    ! Dataset2 identifier 
-     INTEGER(HID_T) :: dataspace1_id  ! Data space identifier 
-     INTEGER(HID_T) :: dataspace2_id  ! Data space identifier 
-     INTEGER(HID_T) :: group1_id, group2_id ! Group identifiers     
+     INTEGER(HID_T) :: file_id        ! File identifier
+     INTEGER(HID_T) :: dataset1_id    ! Dataset1 identifier
+     INTEGER(HID_T) :: dataset2_id    ! Dataset2 identifier
+     INTEGER(HID_T) :: dataspace1_id  ! Data space identifier
+     INTEGER(HID_T) :: dataspace2_id  ! Data space identifier
+     INTEGER(HID_T) :: group1_id, group2_id ! Group identifiers
 
      INTEGER     ::  i, j
 
@@ -47,11 +47,11 @@
 
      INTEGER, DIMENSION(3,3) :: dset1_data  ! Arrays to hold data
      INTEGER, DIMENSION(2,10) :: dset2_data !
-     
-     
+
+
      INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/3,3/) ! Dataset dimensions
      INTEGER(HSIZE_T), DIMENSION(2) :: dims2 = (/2,10/)!
-     INTEGER     ::   rank = 2 ! Datasets rank 
+     INTEGER     ::   rank = 2 ! Datasets rank
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
 
      !
@@ -76,11 +76,11 @@
      !
      ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
      !
@@ -94,7 +94,7 @@
      CALL h5gcreate_f(group1_id, groupname2, group2_id, error)
 
      !
-     ! Create the data space for the first dataset. 
+     ! Create the data space for the first dataset.
      !
      CALL h5screate_simple_f(rank, dims1, dataspace1_id, error)
 
@@ -112,7 +112,7 @@
      CALL h5dwrite_f(dataset1_id, H5T_NATIVE_INTEGER, dset1_data, data_dims, error)
 
      !
-     ! Create the data space for the second dataset. 
+     ! Create the data space for the second dataset.
      !
      CALL h5screate_simple_f(rank, dims2, dataspace2_id, error)
 
@@ -206,10 +206,10 @@
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
-     
+
      !
      ! Close FORTRAN interface.
      !
      CALL h5close_f(error)
 
-     END PROGRAM GRPITEXAMPLE 
+     END PROGRAM GRPITEXAMPLE
diff --git a/fortran/examples/grpsexample.f90 b/fortran/examples/grpsexample.f90
index 3a6efac..0f694e9 100644
--- a/fortran/examples/grpsexample.f90
+++ b/fortran/examples/grpsexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,41 +11,41 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! The following example code shows how to create groups 
+! The following example code shows how to create groups
 ! using absolute and relative names. It creates three groups:
-! the first two groups are created using the file identifier and 
-! the group absolute names, and the third group is created using 
+! the first two groups are created using the file identifier and
+! the group absolute names, and the third group is created using
 ! a group identifier and the name relative to the specified group.
 !
 
 
      PROGRAM GRPSEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=10), PARAMETER :: filename = "groupsf.h5" ! File name
      CHARACTER(LEN=8),  PARAMETER :: groupname1 = "/MyGroup" ! Group name
-     CHARACTER(LEN=16), PARAMETER :: groupname2 = "/MyGroup/Group_A" 
+     CHARACTER(LEN=16), PARAMETER :: groupname2 = "/MyGroup/Group_A"
                                                              ! Group name
      CHARACTER(LEN=7),  PARAMETER :: groupname3 = "Group_B"  ! Group name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: group1_id, group2_id, group3_id ! Group identifiers     
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: group1_id, group2_id, group3_id ! Group identifiers
 
      INTEGER     ::   error ! Error flag
      !
      ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
-     
+     CALL h5open_f(error)
+
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
      !
@@ -62,7 +62,7 @@
      ! Create group "Group_B" in group "MyGroup" using relative name.
      !
      CALL h5gcreate_f(group1_id, groupname3, group3_id, error)
-     
+
      !
      ! Close the groups.
      !
@@ -78,6 +78,6 @@
      !
      ! Close FORTRAN interface.
      !
-     CALL h5close_f(error) 
+     CALL h5close_f(error)
 
-     END PROGRAM GRPSEXAMPLE 
+     END PROGRAM GRPSEXAMPLE
diff --git a/fortran/examples/hyperslab.f90 b/fortran/examples/hyperslab.f90
index 151ecf3..ca27f35 100644
--- a/fortran/examples/hyperslab.f90
+++ b/fortran/examples/hyperslab.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,57 +11,57 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! This example shows how to write and read a hyperslab.  
+! This example shows how to write and read a hyperslab.
 !
 
      PROGRAM SELECTEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=7), PARAMETER :: filename = "sdsf.h5"  ! File name
      CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray" ! Dataset name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-     INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-     INTEGER(HID_T) :: memspace      ! memspace identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+     INTEGER(HID_T) :: memspace      ! memspace identifier
 
      INTEGER(HSIZE_T), DIMENSION(3) :: dimsm = (/7,7,3/) ! Dataset dimensions
                                                          ! in memory
-     INTEGER(HSIZE_T), DIMENSION(2) :: dims_out ! Buffer to read in dataset 
+     INTEGER(HSIZE_T), DIMENSION(2) :: dims_out ! Buffer to read in dataset
                                                 ! dimesions
      INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/) ! Dataset dimensions.
 
-     INTEGER(HSIZE_T), DIMENSION(2) :: count = (/3,4/) 
+     INTEGER(HSIZE_T), DIMENSION(2) :: count = (/3,4/)
                                             ! Size of the hyperslab in the file
      INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/1,2/)
-                                            !hyperslab offset in the file 
+                                            !hyperslab offset in the file
      INTEGER(HSIZE_T), DIMENSION(3) :: count_out = (/3,4,1/)
-                                            !Size of the hyperslab in memory 
+                                            !Size of the hyperslab in memory
      INTEGER(HSIZE_T), DIMENSION(3) :: offset_out = (/3,0,0/)
-                                            !hyperslab offset in memory 
+                                            !hyperslab offset in memory
      INTEGER, DIMENSION(5,6) :: data ! Data to write
      INTEGER, DIMENSION(7,7,3) :: data_out ! Output buffer
      INTEGER :: dsetrank = 2 ! Dataset rank ( in file )
      INTEGER :: memrank = 3  ! Dataset rank ( in memory )
-     INTEGER :: rank 
-     INTEGER :: i, j, k 
+     INTEGER :: rank
+     INTEGER :: i, j, k
 
      INTEGER :: error, error_n  ! Error flags
      INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
 
 
    !
-   ! Write data to the HDF5 file.  
+   ! Write data to the HDF5 file.
    !
 
      !
-     ! Data initialization. 
+     ! Data initialization.
      !
      do i = 1, 5
           do j = 1, 6
@@ -75,19 +75,19 @@
      ! 3,  4,  5,  6,  7,  8
      ! 4,  5,  6,  7,  8,  9
      !
-     
+
      !
-     ! Initialize FORTRAN interface. 
+     ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
      !
-     ! Create the data space for the  dataset. 
+     ! Create the data space for the  dataset.
      !
      CALL h5screate_simple_f(dsetrank, dimsf, dataspace, error)
 
@@ -101,7 +101,7 @@
      ! Write the dataset.
      !
      data_dims(1) = 5
-     data_dims(2) = 6 
+     data_dims(2) = 6
      CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
 
      !
@@ -120,14 +120,14 @@
      CALL h5fclose_f(file_id, error)
 
   !
-  ! This  part of the code reads the hyperslab from the sds.h5 file just 
+  ! This  part of the code reads the hyperslab from the sds.h5 file just
   ! created, into a 2-dimensional plane of the 3-dimensional dataset.
   !
 
      !
      ! Initialize data_out array.
      !
-     do k = 1, 3 
+     do k = 1, 3
           do j = 1, 7
               do i = 1, 7
                   data_out(i,j,k) = 0;
@@ -141,7 +141,7 @@
 !     CALL h5fopen_f (filename, H5F_ACC_RDONLY_F, file_id, error)
      CALL h5fopen_f (filename, H5F_ACC_RDWR_F, file_id, error)
      write(*,*) error
-       
+
      !
      ! Open the  dataset.
      !
@@ -156,7 +156,7 @@
      ! Select hyperslab in the dataset.
      !
      CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-                                offset, count, error) 
+                                offset, count, error)
      !
      ! Create memory dataspace.
      !
@@ -166,18 +166,18 @@
      ! Select hyperslab in memory.
      !
      CALL h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, &
-                                offset_out, count_out, error) 
+                                offset_out, count_out, error)
 
      !
-     ! Read data from hyperslab in the file into the hyperslab in 
+     ! Read data from hyperslab in the file into the hyperslab in
      ! memory and display.
      !
      data_dims(1) = 7
      data_dims(2) = 7
-     data_dims(3) = 3 
+     data_dims(3) = 3
      CALL H5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
                     memspace, dataspace)
-     
+
      !
      ! Display data_out array
      !
@@ -188,7 +188,7 @@
      ! 0 0 0 0 0 0 0
      ! 0 0 0 0 0 0 0
      ! 0 0 0 0 0 0 0
-     ! 3 4 5 6 0 0 0  
+     ! 3 4 5 6 0 0 0
      ! 4 5 6 7 0 0 0
      ! 5 6 7 8 0 0 0
      ! 0 0 0 0 0 0 0
@@ -219,4 +219,4 @@
      !
      CALL h5close_f(error)
 
-     END PROGRAM SELECTEXAMPLE 
+     END PROGRAM SELECTEXAMPLE
diff --git a/fortran/examples/mountexample.f90 b/fortran/examples/mountexample.f90
index fe9eb7e..5bdec2a 100644
--- a/fortran/examples/mountexample.f90
+++ b/fortran/examples/mountexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,19 +11,19 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-!In the following example we create one file with a group in it, 
+!In the following example we create one file with a group in it,
 !and another file with a dataset. Mounting is used to
-!access the dataset from the second file as a member of a group 
-!in the first file. 
+!access the dataset from the second file as a member of a group
+!in the first file.
 !
 
      PROGRAM MOUNTEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      !
@@ -42,53 +42,53 @@
      !
      ! File identifiers
      !
-     INTEGER(HID_T) :: file1_id, file2_id  
-     
+     INTEGER(HID_T) :: file1_id, file2_id
+
      !
      ! Group identifier
      !
-     INTEGER(HID_T) :: gid 
+     INTEGER(HID_T) :: gid
 
      !
      ! Dataset identifier
      !
      INTEGER(HID_T) :: dset_id
- 
+
      !
      ! Data space identifier
      !
      INTEGER(HID_T) :: dataspace
- 
+
      !
      ! Data type identifier
      !
      INTEGER(HID_T) :: dtype_id
 
-     ! 
+     !
      ! The dimensions for the dataset.
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
 
      !
-     ! Flag to check operation success 
-     !         
+     ! Flag to check operation success
+     !
      INTEGER     ::   error
 
      !
-     ! General purpose integer 
-     !         
+     ! General purpose integer
+     !
      INTEGER     ::   i, j
 
      !
-     ! Data buffers 
-     !         
+     ! Data buffers
+     !
      INTEGER, DIMENSION(NX,NY) :: data_in, data_out
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
 
      !
-     ! Initialize FORTRAN interface. 
+     ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
      !
      ! Initialize data_in buffer
@@ -101,36 +101,36 @@
 
      !
      ! Create first file "mount1.h5" using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename1, H5F_ACC_TRUNC_F, file1_id, error)
 
      !
      ! Create group "/G" inside file "mount1.h5".
-     ! 
+     !
      CALL h5gcreate_f(file1_id, "/G", gid, error)
 
      !
      ! Close file and group identifiers.
-     ! 
+     !
      CALL h5gclose_f(gid, error)
      CALL h5fclose_f(file1_id, error)
 
      !
      ! Create second file "mount2.h5" using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename2, H5F_ACC_TRUNC_F, file2_id, error)
 
      !
-     ! Create data space for the dataset. 
+     ! Create data space for the dataset.
      !
      CALL h5screate_simple_f(RANK, dims, dataspace, error)
 
      !
      ! Create dataset "/D" inside file "mount2.h5".
-     ! 
+     !
      CALL h5dcreate_f(file2_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
                       dset_id, error)
- 
+
      !
      ! Write data_in to the dataset
      !
@@ -140,41 +140,41 @@
 
      !
      ! Close file, dataset and dataspace identifiers.
-     ! 
+     !
      CALL h5sclose_f(dataspace, error)
      CALL h5dclose_f(dset_id, error)
      CALL h5fclose_f(file2_id, error)
 
      !
      ! Reopen both files.
-     ! 
+     !
      CALL h5fopen_f (filename1, H5F_ACC_RDWR_F, file1_id, error)
      CALL h5fopen_f (filename2, H5F_ACC_RDWR_F, file2_id, error)
 
      !
      ! Mount the second file under the first file's "/G" group.
-     ! 
+     !
      CALL h5fmount_f (file1_id, "/G", file2_id, error)
 
 
      !
      ! Access dataset D in the first file under /G/D name.
-     ! 
+     !
      CALL h5dopen_f(file1_id, "/G/D", dset_id, error)
 
      !
      ! Get dataset's data type.
-     ! 
+     !
      CALL h5dget_type_f(dset_id, dtype_id, error)
 
      !
      ! Read the dataset.
-     ! 
+     !
      CALL h5dread_f(dset_id, dtype_id, data_out, data_dims, error)
 
      !
      ! Print out the data.
-     ! 
+     !
      do i = 1, NX
           print *, (data_out(i,j), j = 1, NY)
      end do
@@ -182,24 +182,24 @@
 
      !
      !Close dset_id and dtype_id.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
      CALL h5tclose_f(dtype_id, error)
 
      !
      ! Unmount the second file.
-     ! 
+     !
      CALL h5funmount_f(file1_id, "/G", error);
 
      !
      ! Close both files.
-     ! 
+     !
      CALL h5fclose_f(file1_id, error)
      CALL h5fclose_f(file2_id, error)
      !
-     ! Close FORTRAN interface. 
+     ! Close FORTRAN interface.
      !
-     CALL h5close_f(error) 
+     CALL h5close_f(error)
 
      END PROGRAM MOUNTEXAMPLE
 
diff --git a/fortran/examples/ph5example.f90 b/fortran/examples/ph5example.f90
index 208ebc7..a0db200 100644
--- a/fortran/examples/ph5example.f90
+++ b/fortran/examples/ph5example.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,15 +11,15 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! Fortran parallel example.  Copied from Tutorial's example program of
 ! dataset.f90.
 
      PROGRAM DATASET
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      INCLUDE 'mpif.h'
@@ -28,18 +28,18 @@
 
      CHARACTER(LEN=100) :: filename  ! File name
      INTEGER        :: fnamelen	     ! File name length
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-     INTEGER(HID_T) :: filespace     ! Dataspace identifier in file 
-     INTEGER(HID_T) :: plist_id      ! Property list identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: filespace     ! Dataspace identifier in file
+     INTEGER(HID_T) :: plist_id      ! Property list identifier
 
      INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,8/) ! Dataset dimensions.
-!     INTEGER, DIMENSION(7) :: dimsfi = (/5,8,0,0,0,0,0/) 
+!     INTEGER, DIMENSION(7) :: dimsfi = (/5,8,0,0,0,0,0/)
 !     INTEGER(HSIZE_T), DIMENSION(2) :: dimsfi = (/5,8/)
      INTEGER(HSIZE_T), DIMENSION(2) :: dimsfi
 
      INTEGER, ALLOCATABLE :: data(:,:)   ! Data to write
-     INTEGER :: rank = 2 ! Dataset rank 
+     INTEGER :: rank = 2 ! Dataset rank
 
      INTEGER :: error, error_n  ! Error flags
      INTEGER :: i, j
@@ -53,22 +53,22 @@
      info = MPI_INFO_NULL
      CALL MPI_INIT(mpierror)
      CALL MPI_COMM_SIZE(comm, mpi_size, mpierror)
-     CALL MPI_COMM_RANK(comm, mpi_rank, mpierror) 
-     ! 
+     CALL MPI_COMM_RANK(comm, mpi_rank, mpierror)
+     !
      ! Initialize data buffer with trivial data.
      !
      ALLOCATE ( data(dimsf(1),dimsf(2)))
      do i = 1, dimsf(2)
      do j = 1, dimsf(1)
-        data(j,i) = j - 1 + (i-1)*dimsf(1) 
+        data(j,i) = j - 1 + (i-1)*dimsf(1)
      enddo
      enddo
      !
      ! Initialize FORTRAN interface
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
-     ! 
+     !
      ! Setup file access property list with parallel I/O access.
      !
      CALL h5pcreate_f(H5P_FILE_ACCESS_F, plist_id, error)
@@ -89,11 +89,11 @@
 
      !
      ! Create the file collectively.
-     ! 
+     !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = plist_id)
      CALL h5pclose_f(plist_id, error)
      !
-     ! Create the data space for the  dataset. 
+     ! Create the data space for the  dataset.
      !
      CALL h5screate_simple_f(rank, dimsf, filespace, error)
 
@@ -105,15 +105,15 @@
      !
      ! Create property list for collective dataset write
      !
-     CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error) 
+     CALL h5pcreate_f(H5P_DATASET_XFER_F, plist_id, error)
      CALL h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_COLLECTIVE_F, error)
      !
-     ! For independent write use 
+     ! For independent write use
      ! CALL h5pset_dxpl_mpio_f(plist_id, H5FD_MPIO_INDEPENDENT_F, error)
      !
-     
+
      !
-     ! Write the dataset collectively. 
+     ! Write the dataset collectively.
      !
      CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, dimsfi, error, &
                       xfer_prp = plist_id)
diff --git a/fortran/examples/refobjexample.f90 b/fortran/examples/refobjexample.f90
index 1889b8b..c8622a7 100644
--- a/fortran/examples/refobjexample.f90
+++ b/fortran/examples/refobjexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,49 +11,49 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 !    This program shows how to create and store references to the objects.
-!    Program creates a file, two groups, a dataset to store integer data and 
-!    a dataset to store references to the objects. 
+!    Program creates a file, two groups, a dataset to store integer data and
+!    a dataset to store references to the objects.
 !    Stored references are used to open the objects they are point to.
 !    Data is written to the dereferenced dataset, and class type is displayed for
 !    the shared datatype.
 !
-     PROGRAM OBJ_REFERENCES 
+     PROGRAM OBJ_REFERENCES
+
+        USE HDF5 ! This module contains all necessary modules
 
-        USE HDF5 ! This module contains all necessary modules 
-        
      IMPLICIT NONE
-     CHARACTER(LEN=10), PARAMETER :: filename = "FORTRAN.h5"  ! File 
+     CHARACTER(LEN=10), PARAMETER :: filename = "FORTRAN.h5"  ! File
      CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"    ! Dataset with the integer data
      CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES" ! Dataset wtih object
                                                                      ! references
      CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"            ! Groups in the file
      CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"            !
-      
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: grp1_id       ! Group identifiers 
-     INTEGER(HID_T) :: grp2_id       !  
-     INTEGER(HID_T) :: dset_id       ! Dataset identifiers 
-     INTEGER(HID_T) :: dsetr_id      !  
-     INTEGER(HID_T) :: type_id       ! Type identifier  
-     INTEGER(HID_T) :: space_id      ! Dataspace identifiers 
-     INTEGER(HID_T) :: spacer_id     !  
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: grp1_id       ! Group identifiers
+     INTEGER(HID_T) :: grp2_id       !
+     INTEGER(HID_T) :: dset_id       ! Dataset identifiers
+     INTEGER(HID_T) :: dsetr_id      !
+     INTEGER(HID_T) :: type_id       ! Type identifier
+     INTEGER(HID_T) :: space_id      ! Dataspace identifiers
+     INTEGER(HID_T) :: spacer_id     !
      INTEGER     ::   error
      INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/5/)
      INTEGER(HSIZE_T), DIMENSION(1) :: dimsr= (/4/)
      INTEGER(HSIZE_T), DIMENSION(1) :: my_maxdims = (/5/)
-     INTEGER :: rank = 1 
-     INTEGER :: rankr = 1 
+     INTEGER :: rank = 1
+     INTEGER :: rankr = 1
      TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref
      TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref_out
      INTEGER, DIMENSION(5) :: data = (/1, 2, 3, 4, 5/)
      INTEGER :: class
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims, ref_size
      !
-     !  Initialize FORTRAN interface. 
+     !  Initialize FORTRAN interface.
      !
      CALL h5open_f(error)
      !
@@ -61,17 +61,17 @@
      !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
                                          ! Default file access and file creation
-                                         ! properties are used. 
+                                         ! properties are used.
      !
      !  Create a group in the file
      !
      CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
      !
-     ! Create a group inside the created gorup 
+     ! Create a group inside the created gorup
      !
      CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
-     ! 
-     ! Create dataspaces for datasets   
+     !
+     ! Create dataspaces for datasets
      !
      CALL h5screate_simple_f(rank, dims, space_id, error, maxdims=my_maxdims)
      CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
@@ -92,7 +92,7 @@
      CALL h5tcommit_f(file_id, "MyType", type_id, error)
      !
      !  Close dataspaces, groups and integer dataset
-     ! 
+     !
      CALL h5sclose_f(space_id, error)
      CALL h5sclose_f(spacer_id, error)
      CALL h5tclose_f(type_id, error)
@@ -113,7 +113,7 @@
      ! Close the dataset
      !
      CALL h5dclose_f(dsetr_id, error)
-     ! 
+     !
      ! Reopen the dataset with object references and read references to the buffer
      !
      CALL h5dopen_f(file_id, dsetnamer,dsetr_id,error)
@@ -141,7 +141,7 @@
      ! Get datatype class and display it if it is of a FLOAT class.
      !
      CALL h5tget_class_f(type_id, class, error)
-     if(class .eq. H5T_FLOAT_F) write(*,*) "Stored datatype is of a FLOAT class" 
+     if(class .eq. H5T_FLOAT_F) write(*,*) "Stored datatype is of a FLOAT class"
      !
      ! Close all objects.
      !
@@ -150,10 +150,10 @@
      CALL h5dclose_f(dsetr_id, error)
      CALL h5fclose_f(file_id, error)
      !
-     !  Close FORTRAN interface. 
+     !  Close FORTRAN interface.
      !
      CALL h5close_f(error)
 
-     END PROGRAM OBJ_REFERENCES 
+     END PROGRAM OBJ_REFERENCES
 
 
diff --git a/fortran/examples/refregexample.f90 b/fortran/examples/refregexample.f90
index e7728bb..68fbd24 100644
--- a/fortran/examples/refregexample.f90
+++ b/fortran/examples/refregexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,43 +11,43 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-!    This program shows how to create, store and dereference references 
+!    This program shows how to create, store and dereference references
 !    to the dataset regions.
 !    Program creates a file and writes two dimensional integer dataset
 !    to it. Then program creates and stores references to the hyperslab
-!    and 3 points selected in the integer dataset, in the second dataset. 
+!    and 3 points selected in the integer dataset, in the second dataset.
 !    Program reopens the second dataset, reads and dereferences region
-!    references, and then reads and displays selected data from the 
+!    references, and then reads and displays selected data from the
 !    integer dataset.
-!    
+!
      PROGRAM REG_REFERENCE
 
-        USE HDF5 ! This module contains all necessary modules 
-        
+        USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
      CHARACTER(LEN=10), PARAMETER :: filename = "FORTRAN.h5"
      CHARACTER(LEN=6), PARAMETER :: dsetnamev = "MATRIX"
      CHARACTER(LEN=17), PARAMETER :: dsetnamer = "REGION_REFERENCES"
-      
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: space_id      ! Dataspace identifier 
-     INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
-     INTEGER(HID_T) :: dsetv_id      ! Dataset identifier 
-     INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
+
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: space_id      ! Dataspace identifier
+     INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
+     INTEGER(HID_T) :: dsetv_id      ! Dataset identifier
+     INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
      INTEGER     ::   error
      TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref     ! Buffers to store references
      TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref_out !
      INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/2,9/)  ! Datasets dimensions
-     INTEGER(HSIZE_T), DIMENSION(1) :: dimsr = (/2/)   ! 
+     INTEGER(HSIZE_T), DIMENSION(1) :: dimsr = (/2/)   !
      INTEGER(HSIZE_T), DIMENSION(2) :: start
      INTEGER(HSIZE_T), DIMENSION(2) :: count
-     INTEGER :: rankr = 1 
+     INTEGER :: rankr = 1
      INTEGER :: rank = 2
-     INTEGER , DIMENSION(2,9) ::  data 
-     INTEGER , DIMENSION(2,9) ::  data_out = 0 
+     INTEGER , DIMENSION(2,9) ::  data
+     INTEGER , DIMENSION(2,9) ::  data_out = 0
      INTEGER(HSIZE_T) , DIMENSION(2,3) :: coord
      INTEGER(SIZE_T) ::num_points = 3  ! Number of selected points
      INTEGER :: i, j
@@ -64,26 +64,26 @@
      !
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
                                          ! Default file access and file creation
-                                         ! properties are used. 
-     ! 
+                                         ! properties are used.
+     !
      ! Create  dataspaces:
-     ! 
-     ! for dataset with references to dataset regions 
+     !
+     ! for dataset with references to dataset regions
      !
      CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
      !
-     ! for integer dataset 
+     ! for integer dataset
      !
      CALL h5screate_simple_f(rank, dims, space_id, error)
      !
      ! Create  and write datasets:
      !
-     ! Integer dataset 
+     ! Integer dataset
      !
      CALL h5dcreate_f(file_id, dsetnamev, H5T_NATIVE_INTEGER, space_id, &
                       dsetv_id, error)
      data_dims(1) = 2
-     data_dims(2) = 9 
+     data_dims(2) = 9
      CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, data, data_dims, error)
      CALL h5dclose_f(dsetv_id, error)
      !
@@ -94,25 +94,25 @@
      !
      ! Create a reference to the hyperslab selection.
      !
-     start(1) = 0 
-     start(2) = 3 
+     start(1) = 0
+     start(2) = 3
      count(1) = 2
      count(2) = 3
      CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, &
-                                start, count, error) 
-     CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error) 
+                                start, count, error)
+     CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error)
      !
      ! Create a reference to elements selection.
      !
      CALL h5sselect_none_f(space_id, error)
      CALL h5sselect_elements_f(space_id, H5S_SELECT_SET_F, rank, num_points,&
-                               coord, error) 
-     CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error) 
+                               coord, error)
+     CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error)
      !
-     ! Write dataset with the references. 
+     ! Write dataset with the references.
      !
      ref_size(1) = size(ref)
-     CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_size, error) 
+     CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_size, error)
      !
      ! Close all objects.
      !
@@ -129,12 +129,12 @@
      ! Read references to the dataset regions.
      !
      ref_size(1) = size(ref_out)
-     CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_size, error) 
-     ! 
+     CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_size, error)
+     !
      ! Dereference the first reference.
-     ! 
+     !
      CALL H5rdereference_f(dsetr_id, ref_out(1), dsetv_id, error)
-     CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error) 
+     CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error)
      !
      ! Read selected data from the dataset.
      !
@@ -142,18 +142,18 @@
                      mem_space_id = space_id, file_space_id = space_id)
           write(*,*) "Hypeslab selection"
           write(*,*)
-          do i = 1,2 
+          do i = 1,2
           write(*,*) (data_out (i,j), j = 1,9)
           enddo
           write(*,*)
      CALL h5sclose_f(space_id, error)
      CALL h5dclose_f(dsetv_id, error)
      data_out = 0
-     !  
+     !
      ! Dereference the second reference.
-     ! 
+     !
      CALL H5rdereference_f(dsetr_id, ref_out(2), dsetv_id, error)
-     CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error) 
+     CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error)
      !
      ! Read selected data from the dataset.
      !
@@ -161,7 +161,7 @@
                      mem_space_id = space_id, file_space_id = space_id)
           write(*,*) "Point selection"
           write(*,*)
-          do i = 1,2 
+          do i = 1,2
           write(*,*) (data_out (i,j), j = 1,9)
           enddo
      !
@@ -173,8 +173,8 @@
      !
      ! Close FORTRAN interface.
      !
-     CALL h5close_f(error) 
+     CALL h5close_f(error)
 
-     END PROGRAM REG_REFERENCE 
+     END PROGRAM REG_REFERENCE
 
 
diff --git a/fortran/examples/rwdsetexample.f90 b/fortran/examples/rwdsetexample.f90
index 37ee282..1e84e23 100644
--- a/fortran/examples/rwdsetexample.f90
+++ b/fortran/examples/rwdsetexample.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,34 +11,34 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! The following example shows how to write and read to/from an existing dataset. 
-! It opens the file created in the previous example, obtains the dataset 
-! identifier, writes the data to the dataset in the file, 
-! then reads the dataset  to memory. 
+! The following example shows how to write and read to/from an existing dataset.
+! It opens the file created in the previous example, obtains the dataset
+! identifier, writes the data to the dataset in the file,
+! then reads the dataset  to memory.
 !
 
 
      PROGRAM RWDSETEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "dsetf.h5" ! File name
      CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
 
      INTEGER     ::   error ! Error flag
      INTEGER     ::  i, j
 
      INTEGER, DIMENSION(4,6) :: dset_data, data_out ! Data buffers
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-     
+
      !
      ! Initialize the dset_data array.
      !
@@ -51,7 +51,7 @@
      !
      ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
      !
      ! Open an existing file.
@@ -59,7 +59,7 @@
      CALL h5fopen_f (filename, H5F_ACC_RDWR_F, file_id, error)
 
      !
-     ! Open an existing dataset. 
+     ! Open an existing dataset.
      !
      CALL h5dopen_f(file_id, dsetname, dset_id, error)
 
@@ -67,7 +67,7 @@
      ! Write the dataset.
      !
      data_dims(1) = 4
-     data_dims(2) = 6 
+     data_dims(2) = 6
      CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
 
      !
@@ -84,13 +84,13 @@
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
-     
+
      !
      ! Close FORTRAN interface.
      !
      CALL h5close_f(error)
 
-     END PROGRAM RWDSETEXAMPLE 
+     END PROGRAM RWDSETEXAMPLE
+
 
-               
 
diff --git a/fortran/examples/selectele.f90 b/fortran/examples/selectele.f90
index 461fd0b..3ab7ebc 100644
--- a/fortran/examples/selectele.f90
+++ b/fortran/examples/selectele.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,25 +11,25 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-!            This program creates two files, copy1.h5, and copy2.h5. 
-!            In copy1.h5, it creates a 3x4 dataset called 'Copy1',   
-!            and write 0's to this dataset.                         
-!            In copy2.h5, it create a 3x4 dataset called 'Copy2',    
-!            and write 1's to this dataset.                          
-!            It closes both files, reopens both files, selects two   
-!            points in copy1.h5 and writes values to them.  Then it  
-!            uses an H5Scopy to write the same selection to copy2.h5. 
-!            Program reopens the files, and reads and prints the contents of 
-!            the two datasets.   
-!                            
+!            This program creates two files, copy1.h5, and copy2.h5.
+!            In copy1.h5, it creates a 3x4 dataset called 'Copy1',
+!            and write 0's to this dataset.
+!            In copy2.h5, it create a 3x4 dataset called 'Copy2',
+!            and write 1's to this dataset.
+!            It closes both files, reopens both files, selects two
+!            points in copy1.h5 and writes values to them.  Then it
+!            uses an H5Scopy to write the same selection to copy2.h5.
+!            Program reopens the files, and reads and prints the contents of
+!            the two datasets.
+!
 
      PROGRAM SELECTEXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename1 = "copy1.h5" ! File name
@@ -41,27 +41,27 @@
 
      INTEGER(SIZE_T), PARAMETER :: NUMP = 2 ! Number of points selected
 
-     INTEGER(HID_T) :: file1_id       ! File1 identifier 
-     INTEGER(HID_T) :: file2_id       ! File2 identifier 
-     INTEGER(HID_T) :: dset1_id       ! Dataset1 identifier 
-     INTEGER(HID_T) :: dset2_id       ! Dataset2 identifier 
-     INTEGER(HID_T) :: dataspace1     ! Dataspace identifier 
-     INTEGER(HID_T) :: dataspace2     ! Dataspace identifier 
-     INTEGER(HID_T) :: memspace       ! memspace identifier 
+     INTEGER(HID_T) :: file1_id       ! File1 identifier
+     INTEGER(HID_T) :: file2_id       ! File2 identifier
+     INTEGER(HID_T) :: dset1_id       ! Dataset1 identifier
+     INTEGER(HID_T) :: dset2_id       ! Dataset2 identifier
+     INTEGER(HID_T) :: dataspace1     ! Dataspace identifier
+     INTEGER(HID_T) :: dataspace2     ! Dataspace identifier
+     INTEGER(HID_T) :: memspace       ! memspace identifier
 
-     INTEGER(HSIZE_T), DIMENSION(1) :: dimsm = (/2/)  
-                                                   ! Memory dataspace dimensions 
+     INTEGER(HSIZE_T), DIMENSION(1) :: dimsm = (/2/)
+                                                   ! Memory dataspace dimensions
      INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/3,4/)
                                                    ! File dataspace dimensions
      INTEGER(HSIZE_T), DIMENSION(RANK,NUMP) :: coord ! Elements coordinates
-                                                      ! in the file 
+                                                      ! in the file
 
      INTEGER, DIMENSION(3,4) :: buf1, buf2, bufnew ! Data buffers
      INTEGER, DIMENSION(2) :: val = (/53, 59/) ! Values to write
- 
+
      INTEGER :: memrank = 1  ! Rank of the dataset in memory
 
-     INTEGER :: i, j 
+     INTEGER :: i, j
 
      INTEGER :: error  ! Error flag
      LOGICAL :: status
@@ -70,11 +70,11 @@
 
    !
    ! Create two files containing identical datasets. Write 0's to one
-   ! and 1's to the other. 
+   ! and 1's to the other.
    !
 
      !
-     ! Data initialization. 
+     ! Data initialization.
      !
      do i = 1, 3
           do j = 1, 4
@@ -87,21 +87,21 @@
                buf2(i,j) = 1;
           end do
      end do
- 
+
      !
-     ! Initialize FORTRAN interface. 
+     ! Initialize FORTRAN interface.
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
 
      !
      ! Create file1, file2  using default properties.
-     ! 
+     !
      CALL h5fcreate_f(filename1, H5F_ACC_TRUNC_F, file1_id, error)
 
      CALL h5fcreate_f(filename2, H5F_ACC_TRUNC_F, file2_id, error)
 
      !
-     ! Create the data space for the  datasets. 
+     ! Create the data space for the  datasets.
      !
      CALL h5screate_simple_f(RANK, dimsf, dataspace1, error)
 
@@ -120,7 +120,7 @@
      ! Write the datasets.
      !
      data_dims(1) = 3
-     data_dims(2) = 4 
+     data_dims(2) = 4
      CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, buf1, data_dims, error)
 
      CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, buf2, data_dims, error)
@@ -147,8 +147,8 @@
      CALL h5fclose_f(file2_id, error)
 
   !
-  ! Open the two files.  Select two points in one file, write values to 
-  ! those point locations, then do H5Scopy and write the values to the  
+  ! Open the two files.  Select two points in one file, write values to
+  ! those point locations, then do H5Scopy and write the values to the
   ! other file.  Close files.
   !
 
@@ -156,7 +156,7 @@
      ! Open the files.
      !
      CALL h5fopen_f (filename1, H5F_ACC_RDWR_F, file1_id, error)
-       
+
      CALL h5fopen_f (filename2, H5F_ACC_RDWR_F, file2_id, error)
 
      !
@@ -170,19 +170,19 @@
      ! Get dataset1's dataspace identifier.
      !
      CALL h5dget_space_f(dset1_id, dataspace1, error)
-                                           
+
      !
      ! Create memory dataspace.
      !
      CALL h5screate_simple_f(memrank, dimsm, memspace, error)
-                                                               
+
      !
-     ! Set the selected point positions. Because Fortran array index starts 
+     ! Set the selected point positions. Because Fortran array index starts
      ! from 1, so add one to the actual select points in C.
      !
-     coord(1,1) = 1     
-     coord(2,1) = 2     
-     coord(1,2) = 1     
+     coord(1,1) = 1
+     coord(2,1) = 2
+     coord(1,2) = 1
      coord(2,2) = 4
 
      !
@@ -201,7 +201,7 @@
      !
      ! Copy the daspace1 into dataspace2.
      !
-     CALL h5scopy_f(dataspace1, dataspace2, error)  
+     CALL h5scopy_f(dataspace1, dataspace2, error)
 
      !
      ! Write value into the selected points in dataset2.
@@ -244,7 +244,7 @@
      ! Open the files.
      !
      CALL h5fopen_f (filename1, H5F_ACC_RDWR_F, file1_id, error)
-       
+
      CALL h5fopen_f (filename2, H5F_ACC_RDWR_F, file2_id, error)
 
      !
@@ -257,8 +257,8 @@
      !
      ! Read dataset from the first file.
      !
-     data_dims(1) = 3 
-     data_dims(2) = 4 
+     data_dims(1) = 3
+     data_dims(2) = 4
      CALL h5dread_f(dset1_id, H5T_NATIVE_INTEGER, bufnew, data_dims, error)
 
      !
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 271cc87..37718b9 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -972,7 +972,7 @@ nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
   size_t c_bufsize;
   char *c_buf=NULL;           /* Buffer to hold C string */
   int_f ret_value=0;          /* Return value */
-    
+
   c_bufsize = (size_t)*bufsize+1;
   /*
    * Allocate buffer to hold name of an attribute
@@ -983,7 +983,7 @@ nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
   /*
    * Call H5Aget_name function
    */
-  
+
   if ((ret_value = (int_f)H5Aget_name((hid_t)*attr_id, c_bufsize, c_buf)) < 0)
     HGOTO_DONE(FAIL);
 
@@ -1022,7 +1022,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aget_create_plist_c
- * Purpose:     Call H5Aget_create_plist 
+ * Purpose:     Call H5Aget_create_plist
  * Inputs:      attr_id - identifier of an attribute
  * Outputs:     creation_prop_id - Identifier for the attribute’s creation property
  * Returns:     0 on success, -1 on failure
@@ -1046,8 +1046,8 @@ done:
 /*----------------------------------------------------------------------------
  * Name:      h5arename_by_name_c
  * Purpose:   Calls H5Arename_by_name
- * Inputs:    loc_id        - Object identifier 
- *            obj_name      - Name of object, relative to location, 
+ * Inputs:    loc_id        - Object identifier
+ *            obj_name      - Name of object, relative to location,
  *                             whose attribute is to be renamed
  *            obj_name_len      - Object name length
  *            old_attr_name     - Prior attribute name
@@ -1063,9 +1063,9 @@ done:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen, 
+		      _fcd new_attr_name, size_t_f *new_attr_namelen,
 		      hid_t_f *lapl_id )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1076,9 +1076,9 @@ nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
       * Convert FORTRAN name to C name
       */
     if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-      HGOTO_DONE(FAIL);  
+      HGOTO_DONE(FAIL);
     if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
-      HGOTO_DONE(FAIL);  
+      HGOTO_DONE(FAIL);
     if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
       HGOTO_DONE(FAIL);
 
@@ -1132,15 +1132,15 @@ done:
     return ret_value;
 }
 /*----------------------------------------------------------------------------
- * Name:        h5adelete_by_name_c 
- * Purpose:     Call h5adelete_by_name to remove an attribute from a specified location 
+ * Name:        h5adelete_by_name_c
+ * Purpose:     Call h5adelete_by_name to remove an attribute from a specified location
  * Inputs:      loc_id - identifer for object to which attribute is attached
  *              obj_name - object identifier
  *              obj_namelen - name length
  *              attr_name - name of the attribute
  *              attr_namelen - name length
  *              lapl_id - link access property list
- *              
+ *
  * Outputs:     N/A
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1158,7 +1158,7 @@ nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fc
       * Convert FORTRAN name to C name
       */
     if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-      HGOTO_DONE(FAIL);  
+      HGOTO_DONE(FAIL);
     if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
       HGOTO_DONE(FAIL);
 
@@ -1176,15 +1176,15 @@ done:
     return ret_value;
 }
 /*----------------------------------------------------------------------------
- * Name:        h5adelete_by_idx_c 
- * Purpose:     Call h5adelete_by_idx 
- * Inputs:      loc_id - Location or object identifier; may be dataset or group 
+ * Name:        h5adelete_by_idx_c
+ * Purpose:     Call h5adelete_by_idx
+ * Inputs:      loc_id - Location or object identifier; may be dataset or group
  *              obj_name - object identifier
  *              obj_namelen - name length
  *              attr_name - name of the attribute
  *              attr_namelen - name length
  *              lapl_id - link access property list
- *              
+ *
  * Outputs:     N/A
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1192,7 +1192,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1210,7 +1210,7 @@ nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
     c_order = (H5_iter_order_t)*order;
 
      /*
-      * Call H5Adelete_by_name function. 
+      * Call H5Adelete_by_name function.
       */
 
     if(H5Adelete_by_idx((hid_t)*loc_id, c_obj_name, c_idx_type, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
@@ -1244,13 +1244,13 @@ done:
  *                          H5_ITER_N	     - Number of iteration orders
  *
  *            n  - Attribute’s position in index
- *      attr_id  - Attribute identifier 
+ *      attr_id  - Attribute identifier
  *         size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
- *   
+ *
  *     lapl_id   - Link access property list
  *      hdferr   - Error code:
  *                            Returns attribute name size, -1 if fail
- *              
+ *
  * Outputs:     name - Attribute name
  *
  * Returns:     Size of buffer on success, -1 on failure
@@ -1259,8 +1259,8 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-		       int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name, 
+nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		       int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
 		       size_t_f *size, hid_t_f *lapl_id)
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1282,7 +1282,7 @@ nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
     /*
      * Allocate buffer to hold name of an attribute
      */
-    c_buf_size = (size_t)*size + 1; 
+    c_buf_size = (size_t)*size + 1;
     c_buf = (char *)HDmalloc(c_buf_size);
     if (c_buf == NULL) return ret_value;
      /*
@@ -1308,7 +1308,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aopen_by_idx_c
- * Purpose:     Call H5Aopen_by_idx 
+ * Purpose:     Call H5Aopen_by_idx
  * Inputs:   loc_id    - Object identifier
  *            obj_name - Name of object to which attribute is attached
  *         obj_namelen - name length
@@ -1324,7 +1324,7 @@ done:
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
- *                
+ *
  *                   n - Attribute’s position in index
  *             aapl_id - Attribute access property list
  *             lapl_id - Link access property list
@@ -1335,7 +1335,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		   int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1367,8 +1367,8 @@ done:
  * Name:        h5aget_info_c
  * Purpose:     Call H5Aget_info
  * Inputs:     loc_id  - Object identifier
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -1379,7 +1379,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder, 
+nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
 		int_f *cset, hsize_t_f *data_size )
 {
 
@@ -1424,11 +1424,11 @@ done:
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
- *                
+ *
  *                   n - Attribute’s position in index
  *             lapl_id - Link access property list
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -1439,9 +1439,9 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-		int_f *corder_valid, int_f *corder, 
+		int_f *corder_valid, int_f *corder,
 		int_f *cset, hsize_t_f *data_size )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1487,8 +1487,8 @@ done:
  *           attr_name - Attribute name
  *        attr_namelen - attribute name length
  *             lapl_id - Link access property list
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -1501,7 +1501,7 @@ done:
 int_f
 nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 			_fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
-			int_f *corder_valid, int_f *corder, 
+			int_f *corder_valid, int_f *corder,
 			int_f *cset, hsize_t_f *data_size )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1553,8 +1553,8 @@ done:
  *         aapl_id - Attribute access property list identifier (Currently not used.)
  *         lapl_id - Link access property list
  *
- * Outputs:   
- *            attr - an attribute identifier 
+ * Outputs:
+ *            attr - an attribute identifier
  *
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1596,7 +1596,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aexists_c
- * Purpose:     CAll h5aexists 
+ * Purpose:     CAll h5aexists
  * Inputs:
  *             obj_id - Object identifier
  *          attr_name - Attribute name
@@ -1633,7 +1633,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aexists_by_name_c
- * Purpose:     CAll H5Aexists_by_name 
+ * Purpose:     CAll H5Aexists_by_name
  * Inputs:
  *     loc_id - Location identifier
  *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
@@ -1647,7 +1647,7 @@ done:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
 		      hid_t_f *lapl_id, int_f *attr_exists)
 {
   char *c_obj_name = NULL;          /* Buffer to hold object name C string */
@@ -1678,7 +1678,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aopen_by_name_c
- * Purpose:     Call H5Aopen_by_name 
+ * Purpose:     Call H5Aopen_by_name
  * Inputs:
  *     loc_id - Location identifier
  *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
@@ -1693,7 +1693,7 @@ done:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
 		    hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
 {
   char *c_obj_name = NULL;          /* Buffer to hold object name C string */
@@ -1738,7 +1738,7 @@ nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5arename_c( hid_t_f *loc_id, 
+nh5arename_c( hid_t_f *loc_id,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
 		      _fcd new_attr_name, size_t_f *new_attr_namelen)
 {
@@ -1747,9 +1747,9 @@ nh5arename_c( hid_t_f *loc_id,
   int_f ret_value=0;          /* Return value */
   /*
    * Convert FORTRAN name to C name
-   */ 
+   */
   if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);  
+    HGOTO_DONE(FAIL);
   if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
     HGOTO_DONE(FAIL);
 
diff --git a/fortran/src/H5Aff.f90 b/fortran/src/H5Aff.f90
index 9834914..af1e630 100644
--- a/fortran/src/H5Aff.f90
+++ b/fortran/src/H5Aff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5A functions.
@@ -20,29 +20,29 @@ MODULE H5A
 
   USE H5GLOBAL
 !
-!On Windows there are no big (integer*8) integers, so overloading 
+!On Windows there are no big (integer*8) integers, so overloading
 !for bug #670 does not work. I have to use DEC compilation directives to make
 !Windows DEC Visual Fortran and OSF compilers happy and do right things.
 !						05/01/02 EP
 !
   INTERFACE h5awrite_f
 
-     MODULE PROCEDURE h5awrite_integer_scalar 
-     MODULE PROCEDURE h5awrite_integer_1 
-     MODULE PROCEDURE h5awrite_integer_2 
-     MODULE PROCEDURE h5awrite_integer_3 
-     MODULE PROCEDURE h5awrite_integer_4 
-     MODULE PROCEDURE h5awrite_integer_5 
-     MODULE PROCEDURE h5awrite_integer_6 
-     MODULE PROCEDURE h5awrite_integer_7 
-     MODULE PROCEDURE h5awrite_char_scalar 
-     MODULE PROCEDURE h5awrite_char_1 
-     MODULE PROCEDURE h5awrite_char_2 
-     MODULE PROCEDURE h5awrite_char_3 
-     MODULE PROCEDURE h5awrite_char_4 
-     MODULE PROCEDURE h5awrite_char_5 
-     MODULE PROCEDURE h5awrite_char_6 
-     MODULE PROCEDURE h5awrite_char_7 
+     MODULE PROCEDURE h5awrite_integer_scalar
+     MODULE PROCEDURE h5awrite_integer_1
+     MODULE PROCEDURE h5awrite_integer_2
+     MODULE PROCEDURE h5awrite_integer_3
+     MODULE PROCEDURE h5awrite_integer_4
+     MODULE PROCEDURE h5awrite_integer_5
+     MODULE PROCEDURE h5awrite_integer_6
+     MODULE PROCEDURE h5awrite_integer_7
+     MODULE PROCEDURE h5awrite_char_scalar
+     MODULE PROCEDURE h5awrite_char_1
+     MODULE PROCEDURE h5awrite_char_2
+     MODULE PROCEDURE h5awrite_char_3
+     MODULE PROCEDURE h5awrite_char_4
+     MODULE PROCEDURE h5awrite_char_5
+     MODULE PROCEDURE h5awrite_char_6
+     MODULE PROCEDURE h5awrite_char_7
      MODULE PROCEDURE h5awrite_real_scalar
      MODULE PROCEDURE h5awrite_real_1
      MODULE PROCEDURE h5awrite_real_2
@@ -67,21 +67,21 @@ MODULE H5A
   INTERFACE h5aread_f
 
      MODULE PROCEDURE h5aread_integer_scalar
-     MODULE PROCEDURE h5aread_integer_1 
-     MODULE PROCEDURE h5aread_integer_2 
-     MODULE PROCEDURE h5aread_integer_3 
-     MODULE PROCEDURE h5aread_integer_4 
-     MODULE PROCEDURE h5aread_integer_5 
-     MODULE PROCEDURE h5aread_integer_6 
-     MODULE PROCEDURE h5aread_integer_7 
-     MODULE PROCEDURE h5aread_char_scalar 
-     MODULE PROCEDURE h5aread_char_1 
-     MODULE PROCEDURE h5aread_char_2 
-     MODULE PROCEDURE h5aread_char_3 
-     MODULE PROCEDURE h5aread_char_4 
-     MODULE PROCEDURE h5aread_char_5 
-     MODULE PROCEDURE h5aread_char_6 
-     MODULE PROCEDURE h5aread_char_7 
+     MODULE PROCEDURE h5aread_integer_1
+     MODULE PROCEDURE h5aread_integer_2
+     MODULE PROCEDURE h5aread_integer_3
+     MODULE PROCEDURE h5aread_integer_4
+     MODULE PROCEDURE h5aread_integer_5
+     MODULE PROCEDURE h5aread_integer_6
+     MODULE PROCEDURE h5aread_integer_7
+     MODULE PROCEDURE h5aread_char_scalar
+     MODULE PROCEDURE h5aread_char_1
+     MODULE PROCEDURE h5aread_char_2
+     MODULE PROCEDURE h5aread_char_3
+     MODULE PROCEDURE h5aread_char_4
+     MODULE PROCEDURE h5aread_char_5
+     MODULE PROCEDURE h5aread_char_6
+     MODULE PROCEDURE h5aread_char_7
      MODULE PROCEDURE h5aread_real_scalar
      MODULE PROCEDURE h5aread_real_1
      MODULE PROCEDURE h5aread_real_2
@@ -102,60 +102,60 @@ MODULE H5A
 ! End commnet if on Crays
 !
   END INTERFACE
-  
+
 CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5acreate_f 
+! Name:		h5acreate_f
 !
-! Purpose: 	Creates a dataset as an attribute of a group, dataset, 
-!		or named datatype 
+! Purpose: 	Creates a dataset as an attribute of a group, dataset,
+!		or named datatype
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- identifier of an object (group, dataset,
 !				  or named datatype) attribute is attached to
 !		name		- attribute name
 !		type_id		- attribute datatype identifier
 !		space_id	- attribute dataspace identifier
 !
-! Outputs:  
+! Outputs:
 !		attr_id		- attribute identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		acpl_id	- Attribute creation property list identifier
-!               appl_id - Attribute access property list identifier			
+!               appl_id - Attribute access property list identifier
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
   SUBROUTINE h5acreate_f(loc_id, name, type_id, space_id, attr_id, &
-                                 hdferr, acpl_id, aapl_id ) 
+                                 hdferr, acpl_id, aapl_id )
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5acreate_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier 
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
     CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
-    INTEGER(HID_T), INTENT(IN) :: type_id   
-    ! Attribute datatype identifier 
-    INTEGER(HID_T), INTENT(IN) :: space_id  
+    INTEGER(HID_T), INTENT(IN) :: type_id
+    ! Attribute datatype identifier
+    INTEGER(HID_T), INTENT(IN) :: space_id
     ! Attribute dataspace identifier
-    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: acpl_id ! Attribute creation property list identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list identifier
-    
+
     INTEGER(HID_T) :: acpl_id_default
-    INTEGER(HID_T) :: aapl_id_default 
+    INTEGER(HID_T) :: aapl_id_default
     INTEGER(SIZE_T) :: namelen
 !            INTEGER, EXTERNAL :: h5acreate_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -178,7 +178,7 @@ CONTAINS
          INTEGER(HID_T), INTENT(OUT) :: attr_id
        END FUNCTION h5acreate_c
     END INTERFACE
-    
+
     acpl_id_default = H5P_DEFAULT_F
     aapl_id_default = H5P_DEFAULT_F
     namelen = LEN(NAME)
@@ -192,40 +192,40 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:		h5aopen_name_f 
+! Name:		h5aopen_name_f
 !
-! Purpose:  	Opens an attribute specified by name. 
+! Purpose:  	Opens an attribute specified by name.
 !
-! Inputs:  	
-!		obj_id 		- identifier of a group, dataset, or named 
+! Inputs:
+!		obj_id 		- identifier of a group, dataset, or named
 !				  datatype atttribute to be attached to
 !		name		- attribute name
-! Outputs:  
+! Outputs:
 !		attr_id		- attribute identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aopen_name_f(obj_id, name, attr_id, hdferr) 
+  SUBROUTINE h5aopen_name_f(obj_id, name, attr_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aopen_name_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
+    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier
     CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
-    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     INTEGER(SIZE_T) :: namelen
 
@@ -245,49 +245,49 @@ CONTAINS
          INTEGER(HID_T), INTENT(OUT) :: attr_id
        END FUNCTION h5aopen_name_c
     END INTERFACE
-    
+
     namelen = LEN(name)
     hdferr = h5aopen_name_c(obj_id, name, namelen, attr_id)
   END SUBROUTINE h5aopen_name_f
 
 
 !----------------------------------------------------------------------
-! Name:		h5aopen_idx_f 
+! Name:		h5aopen_idx_f
 !
 ! Purpose:  	Opens the attribute specified by its index.
 !
-! Inputs:  
+! Inputs:
 !		obj_id		- identifier of a group, dataset, or named
 !				  datatype an attribute to be attached to
 !		index		- index of the attribute to open (zero-based)
-! Outputs:  
+! Outputs:
 !		attr_id		- attribute identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aopen_idx_f(obj_id, index, attr_id, hdferr) 
+  SUBROUTINE h5aopen_idx_f(obj_id, index, attr_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aopen_idx_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
-    INTEGER, INTENT(IN) :: index            ! Attribute index 
-    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier
+    INTEGER, INTENT(IN) :: index            ! Attribute index
+    INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    
+
 !            INTEGER, EXTERNAL :: h5aopen_idx_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -302,22 +302,22 @@ CONTAINS
          INTEGER(HID_T), INTENT(OUT) :: attr_id
        END FUNCTION h5aopen_idx_c
     END INTERFACE
-    
+
     hdferr = h5aopen_idx_c(obj_id, index, attr_id)
   END SUBROUTINE h5aopen_idx_f
 
 
-  SUBROUTINE h5awrite_integer_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_scalar
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-    INTEGER, INTENT(IN) :: buf              ! Attribute data 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    INTEGER, INTENT(IN) :: buf              ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_s_c
@@ -329,31 +329,31 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_S_C'::h5awrite_integer_s_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN)::buf
        END FUNCTION h5awrite_integer_s_c
     END INTERFACE
-    
+
     hdferr = h5awrite_integer_s_c(attr_id, memtype_id,  buf, dims)
   END SUBROUTINE h5awrite_integer_scalar
 
-  SUBROUTINE h5awrite_integer_1(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_1
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN) , &
          DIMENSION(dims(1)) :: buf
-    ! Attribute data 
+    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    
+
 !            INTEGER, EXTERNAL :: h5awrite_integer_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -363,7 +363,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_1_C'::h5awrite_integer_1_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), DIMENSION(dims(1)) :: buf
@@ -375,21 +375,21 @@ CONTAINS
   END SUBROUTINE h5awrite_integer_1
 
 
-  SUBROUTINE h5awrite_integer_2(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_2
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN) , &
          DIMENSION(dims(1),dims(2)) :: buf
-    ! Attribute data 
+    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    
+
 !            INTEGER, EXTERNAL :: h5awrite_integer_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -399,7 +399,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_2_C'::h5awrite_integer_2_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2)) :: buf
@@ -410,18 +410,18 @@ CONTAINS
   END SUBROUTINE h5awrite_integer_2
 
 
-  SUBROUTINE h5awrite_integer_3(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_3
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_3_c
@@ -433,30 +433,30 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_3_C'::h5awrite_integer_3_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3)) :: buf
        END FUNCTION h5awrite_integer_3_c
     END INTERFACE
-    
+
     hdferr = h5awrite_integer_3_c(attr_id, memtype_id,  buf, dims)
   END SUBROUTINE h5awrite_integer_3
 
 
-  SUBROUTINE h5awrite_integer_4(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_4
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-    ! Attribute data 
+    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_4_c
@@ -468,7 +468,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_4_C'::h5awrite_integer_4_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
@@ -479,18 +479,18 @@ CONTAINS
   END SUBROUTINE h5awrite_integer_4
 
 
-  SUBROUTINE h5awrite_integer_5(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_5
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_5_c
@@ -502,7 +502,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_5_C'::h5awrite_integer_5_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
@@ -513,21 +513,21 @@ CONTAINS
   END SUBROUTINE h5awrite_integer_5
 
 
-  SUBROUTINE h5awrite_integer_6(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_6
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-    ! Attribute data 
+    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    
+
 !            INTEGER, EXTERNAL :: h5awrite_integer_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -537,7 +537,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_6_C'::h5awrite_integer_6_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), &
@@ -549,19 +549,19 @@ CONTAINS
   END SUBROUTINE h5awrite_integer_6
 
 
-  SUBROUTINE h5awrite_integer_7(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_integer_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_integer_7
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     INTEGER, INTENT(IN), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-    ! Attribute data 
+    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_integer_7_c
@@ -573,7 +573,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_INTEGER_7_C'::h5awrite_integer_7_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          INTEGER, INTENT(IN), &
@@ -585,17 +585,17 @@ CONTAINS
   END SUBROUTINE h5awrite_integer_7
 
 
-  SUBROUTINE h5awrite_real_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_real_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_scalar
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-    REAL, INTENT(IN) :: buf                 ! Attribute data 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+    REAL, INTENT(IN) :: buf                 ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_s_c
@@ -607,7 +607,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_S_C'::h5awrite_real_s_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          REAL, INTENT(IN)::buf
@@ -617,19 +617,19 @@ CONTAINS
     hdferr = h5awrite_real_s_c(attr_id, memtype_id,  buf, dims)
   END SUBROUTINE h5awrite_real_scalar
 
-  SUBROUTINE h5awrite_real_1(attr_id, memtype_id,  buf, dims, hdferr) 
+  SUBROUTINE h5awrite_real_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_1
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+    INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+    INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
     ! identifier  (in memory)
-    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+    INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
     REAL, INTENT(IN), &
          DIMENSION(dims(1)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_1_c
@@ -641,7 +641,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_1_C'::h5awrite_real_1_c
          !DEC$ ENDIF
-         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+         INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
          INTEGER(HID_T), INTENT(IN) :: attr_id
          INTEGER(HID_T), INTENT(IN) :: memtype_id
          REAL, INTENT(IN), &
@@ -653,19 +653,19 @@ CONTAINS
   END SUBROUTINE h5awrite_real_1
 
 
-          SUBROUTINE h5awrite_real_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_real_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_2_c
@@ -677,7 +677,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_2_C'::h5awrite_real_2_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(IN), &
@@ -689,19 +689,19 @@ CONTAINS
           END SUBROUTINE h5awrite_real_2
 
 
-          SUBROUTINE h5awrite_real_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_real_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_3_c
@@ -713,7 +713,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_3_C'::h5awrite_real_3_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(IN), &
@@ -725,19 +725,19 @@ CONTAINS
           END SUBROUTINE h5awrite_real_3
 
 
-          SUBROUTINE h5awrite_real_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_real_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_4_c
@@ -749,7 +749,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_4_C'::h5awrite_real_4_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(IN), &
@@ -761,19 +761,19 @@ CONTAINS
           END SUBROUTINE h5awrite_real_4
 
 
-          SUBROUTINE h5awrite_real_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_real_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_5_c
@@ -785,7 +785,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_5_C'::h5awrite_real_5_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(IN), &
@@ -797,19 +797,19 @@ CONTAINS
           END SUBROUTINE h5awrite_real_5
 
 
-          SUBROUTINE h5awrite_real_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_real_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_6_c
@@ -821,7 +821,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_6_C'::h5awrite_real_6_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(IN), &
@@ -833,19 +833,19 @@ CONTAINS
           END SUBROUTINE h5awrite_real_6
 
 
-          SUBROUTINE h5awrite_real_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_real_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_real_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_real_7_c
@@ -857,7 +857,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_REAL_7_C'::h5awrite_real_7_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(IN), &
@@ -869,17 +869,17 @@ CONTAINS
           END SUBROUTINE h5awrite_real_7
 
 
-          SUBROUTINE h5awrite_double_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_scalar
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(IN) :: buf     ! Attribute data 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            DOUBLE PRECISION, INTENT(IN) :: buf     ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_s_c
@@ -891,7 +891,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_S_C'::h5awrite_double_s_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN)::buf
@@ -901,18 +901,18 @@ CONTAINS
             hdferr = h5awrite_double_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5awrite_double_scalar
 
-          SUBROUTINE h5awrite_double_1(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_1
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(IN), &
-            DIMENSION(dims(1)) :: buf ! Attribute data 
+            DIMENSION(dims(1)) :: buf ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_1_c
@@ -924,7 +924,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_1_C'::h5awrite_double_1_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -936,19 +936,19 @@ CONTAINS
           END SUBROUTINE h5awrite_double_1
 
 
-          SUBROUTINE h5awrite_double_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(IN), & 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_2_c
@@ -960,7 +960,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_2_C'::h5awrite_double_2_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -972,19 +972,19 @@ CONTAINS
           END SUBROUTINE h5awrite_double_2
 
 
-          SUBROUTINE h5awrite_double_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_3_c
@@ -996,7 +996,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_3_C'::h5awrite_double_3_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -1008,19 +1008,19 @@ CONTAINS
           END SUBROUTINE h5awrite_double_3
 
 
-          SUBROUTINE h5awrite_double_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_4_c
@@ -1032,7 +1032,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_4_C'::h5awrite_double_4_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -1044,19 +1044,19 @@ CONTAINS
           END SUBROUTINE h5awrite_double_4
 
 
-          SUBROUTINE h5awrite_double_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_5_c
@@ -1068,7 +1068,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_5_C'::h5awrite_double_5_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -1080,19 +1080,19 @@ CONTAINS
           END SUBROUTINE h5awrite_double_5
 
 
-          SUBROUTINE h5awrite_double_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_6_c
@@ -1104,7 +1104,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_6_C'::h5awrite_double_6_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -1116,19 +1116,19 @@ CONTAINS
           END SUBROUTINE h5awrite_double_6
 
 
-          SUBROUTINE h5awrite_double_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_double_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_double_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awrite_double_7_c
@@ -1140,7 +1140,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITE_DOUBLE_7_C'::h5awrite_double_7_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(IN), &
@@ -1151,18 +1151,18 @@ CONTAINS
             hdferr = h5awrite_double_7_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5awrite_double_7
 
-          SUBROUTINE h5awrite_char_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_scalar
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*),INTENT(IN) :: buf 
-                                                    ! Attribute data 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            CHARACTER(LEN=*),INTENT(IN) :: buf
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_s_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1173,7 +1173,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_S_C'::h5awritec_s_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
@@ -1184,19 +1184,19 @@ CONTAINS
             hdferr = h5awritec_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5awrite_char_scalar
 
-          SUBROUTINE h5awrite_char_1(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_1
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1208,7 +1208,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_1_C'::h5awritec_1_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(IN), DIMENSION(dims(1))::buf
@@ -1219,19 +1219,19 @@ CONTAINS
           END SUBROUTINE h5awrite_char_1
 
 
-          SUBROUTINE h5awrite_char_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5awritec_2_c
@@ -1243,7 +1243,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_2_C'::h5awritec_2_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
@@ -1256,19 +1256,19 @@ CONTAINS
           END SUBROUTINE h5awrite_char_2
 
 
-          SUBROUTINE h5awrite_char_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1280,7 +1280,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_3_C'::h5awritec_3_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(IN), &
@@ -1292,19 +1292,19 @@ CONTAINS
           END SUBROUTINE h5awrite_char_3
 
 
-          SUBROUTINE h5awrite_char_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1316,7 +1316,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_4_C'::h5awritec_4_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(IN), &
@@ -1328,19 +1328,19 @@ CONTAINS
           END SUBROUTINE h5awrite_char_4
 
 
-          SUBROUTINE h5awrite_char_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1352,7 +1352,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_5_C'::h5awritec_5_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(IN), &
@@ -1364,19 +1364,19 @@ CONTAINS
           END SUBROUTINE h5awrite_char_5
 
 
-          SUBROUTINE h5awrite_char_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1388,7 +1388,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_6_C'::h5awritec_6_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(IN), &
@@ -1400,19 +1400,19 @@ CONTAINS
           END SUBROUTINE h5awrite_char_6
 
 
-          SUBROUTINE h5awrite_char_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5awrite_char_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5awrite_char_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 !            INTEGER, EXTERNAL :: h5awritec_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1424,7 +1424,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AWRITEC_7_C'::h5awritec_7_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(IN), &
@@ -1436,29 +1436,29 @@ CONTAINS
           END SUBROUTINE h5awrite_char_7
 
 !----------------------------------------------------------------------
-! Name:		h5aread_f 
+! Name:		h5aread_f
 !
 ! Purpose:  	Reads an attribute.
 !
-! Inputs:  
+! Inputs:
 !		attr_id		- attribute identifier
 !		memtype_id	- attribute memory type identifier
-!		dims		- 1D array of size 7, stores sizes of the 
+!		dims		- 1D array of size 7, stores sizes of the
 !				- buf array dimensions.
-! Outputs:  
+! Outputs:
 !		buf		- buffer to read attribute data in
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !			dims parameter was added to make code portable;
 !			Aprile 4, 2001
@@ -1470,20 +1470,20 @@ CONTAINS
 !
 ! Comment:		This function is overloaded to write INTEGER,
 !			REAL, DOUBLE PRECISION and CHARACTER buffers
-!			up to 7 dimensions.	
+!			up to 7 dimensions.
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aread_integer_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_scalar
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            INTEGER, INTENT(INOUT) :: buf             ! Attribute data 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            INTEGER, INTENT(INOUT) :: buf             ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_s_c
@@ -1495,7 +1495,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_S_C'::h5aread_integer_s_c
               !DEC$ ENDIF
-              INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+              INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT)::buf
@@ -1504,16 +1504,16 @@ CONTAINS
             hdferr = h5aread_integer_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5aread_integer_scalar
 
-          SUBROUTINE h5aread_integer_1(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_1
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
@@ -1526,7 +1526,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_1_C'::h5aread_integer_1_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), DIMENSION(dims(1)) :: buf
@@ -1537,16 +1537,16 @@ CONTAINS
           END SUBROUTINE h5aread_integer_1
 
 
-          SUBROUTINE h5aread_integer_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT),DIMENSION(dims(1),dims(2)) :: buf
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
@@ -1559,7 +1559,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_2_C'::h5aread_integer_2_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), DIMENSION(dims(1),dims(2)) :: buf
@@ -1570,16 +1570,16 @@ CONTAINS
           END SUBROUTINE h5aread_integer_2
 
 
-          SUBROUTINE h5aread_integer_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT), &
                  DIMENSION(dims(1),dims(2),dims(3)) :: buf
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
@@ -1593,7 +1593,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_3_C'::h5aread_integer_3_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), &
@@ -1605,19 +1605,19 @@ CONTAINS
           END SUBROUTINE h5aread_integer_3
 
 
-          SUBROUTINE h5aread_integer_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_4_c
@@ -1629,7 +1629,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_4_C'::h5aread_integer_4_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), &
@@ -1641,19 +1641,19 @@ CONTAINS
           END SUBROUTINE h5aread_integer_4
 
 
-          SUBROUTINE h5aread_integer_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_5_c
@@ -1665,7 +1665,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_5_C'::h5aread_integer_5_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), &
@@ -1677,19 +1677,19 @@ CONTAINS
           END SUBROUTINE h5aread_integer_5
 
 
-          SUBROUTINE h5aread_integer_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_6_c
@@ -1701,7 +1701,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_6_C'::h5aread_integer_6_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), &
@@ -1713,19 +1713,19 @@ CONTAINS
           END SUBROUTINE h5aread_integer_6
 
 
-          SUBROUTINE h5aread_integer_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_integer_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_integer_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_integer_7_c
@@ -1737,7 +1737,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_INTEGER_7_C'::h5aread_integer_7_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               INTEGER, INTENT(INOUT), &
@@ -1749,17 +1749,17 @@ CONTAINS
           END SUBROUTINE h5aread_integer_7
 
 
-          SUBROUTINE h5aread_real_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_scalar
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            REAL, INTENT(INOUT) :: buf                ! Attribute data 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            REAL, INTENT(INOUT) :: buf                ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_s_c
@@ -1771,7 +1771,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_S_C'::h5aread_real_s_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT)::buf
@@ -1781,19 +1781,19 @@ CONTAINS
             hdferr = h5aread_real_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5aread_real_scalar
 
-          SUBROUTINE h5aread_real_1(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_1
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_1_c
@@ -1805,7 +1805,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_1_C'::h5aread_real_1_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -1817,19 +1817,19 @@ CONTAINS
           END SUBROUTINE h5aread_real_1
 
 
-          SUBROUTINE h5aread_real_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_2_c
@@ -1841,7 +1841,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_2_C'::h5aread_real_2_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -1853,19 +1853,19 @@ CONTAINS
           END SUBROUTINE h5aread_real_2
 
 
-          SUBROUTINE h5aread_real_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_3_c
@@ -1877,7 +1877,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_3_C'::h5aread_real_3_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -1889,19 +1889,19 @@ CONTAINS
           END SUBROUTINE h5aread_real_3
 
 
-          SUBROUTINE h5aread_real_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_4_c
@@ -1913,7 +1913,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_4_C'::h5aread_real_4_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -1925,19 +1925,19 @@ CONTAINS
           END SUBROUTINE h5aread_real_4
 
 
-          SUBROUTINE h5aread_real_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_5_c
@@ -1949,7 +1949,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_5_C'::h5aread_real_5_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -1961,19 +1961,19 @@ CONTAINS
           END SUBROUTINE h5aread_real_5
 
 
-          SUBROUTINE h5aread_real_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_6_c
@@ -1985,7 +1985,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_6_C'::h5aread_real_6_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -1997,19 +1997,19 @@ CONTAINS
           END SUBROUTINE h5aread_real_6
 
 
-          SUBROUTINE h5aread_real_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_real_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_real_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_real_7_c
@@ -2021,7 +2021,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_REAL_7_C'::h5aread_real_7_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               REAL, INTENT(INOUT), &
@@ -2033,17 +2033,17 @@ CONTAINS
           END SUBROUTINE h5aread_real_7
 
 
-          SUBROUTINE h5aread_double_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_scalar
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            DOUBLE PRECISION, INTENT(INOUT) :: buf    ! Attribute data 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            DOUBLE PRECISION, INTENT(INOUT) :: buf    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_s_c
@@ -2055,7 +2055,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_S_C'::h5aread_double_s_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT)::buf
@@ -2065,19 +2065,19 @@ CONTAINS
             hdferr = h5aread_double_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5aread_double_scalar
 
-          SUBROUTINE h5aread_double_1(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_1
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_1_c
@@ -2089,7 +2089,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_1_C'::h5aread_double_1_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2101,19 +2101,19 @@ CONTAINS
           END SUBROUTINE h5aread_double_1
 
 
-          SUBROUTINE h5aread_double_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_2_c
@@ -2125,7 +2125,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_2_C'::h5aread_double_2_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2137,19 +2137,19 @@ CONTAINS
           END SUBROUTINE h5aread_double_2
 
 
-          SUBROUTINE h5aread_double_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_3_c
@@ -2161,7 +2161,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_3_C'::h5aread_double_3_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2173,19 +2173,19 @@ CONTAINS
           END SUBROUTINE h5aread_double_3
 
 
-          SUBROUTINE h5aread_double_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_4_c
@@ -2197,7 +2197,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_4_C'::h5aread_double_4_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2209,19 +2209,19 @@ CONTAINS
           END SUBROUTINE h5aread_double_4
 
 
-          SUBROUTINE h5aread_double_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_5_c
@@ -2233,7 +2233,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_5_C'::h5aread_double_5_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2245,19 +2245,19 @@ CONTAINS
           END SUBROUTINE h5aread_double_5
 
 
-          SUBROUTINE h5aread_double_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_6_c
@@ -2269,7 +2269,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_6_C'::h5aread_double_6_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2281,19 +2281,19 @@ CONTAINS
           END SUBROUTINE h5aread_double_6
 
 
-          SUBROUTINE h5aread_double_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_double_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_double_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5aread_double_7_c
@@ -2305,7 +2305,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREAD_DOUBLE_7_C'::h5aread_double_7_c
               !DEC$ ENDIF
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               DOUBLE PRECISION, INTENT(INOUT), &
@@ -2317,18 +2317,18 @@ CONTAINS
           END SUBROUTINE h5aread_double_7
 
 
-          SUBROUTINE h5aread_char_scalar(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_scalar(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_scalar
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
-            CHARACTER(LEN=*), INTENT(INOUT) :: buf 
-                                                    ! Attribute data 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
+            CHARACTER(LEN=*), INTENT(INOUT) :: buf
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_s_c
@@ -2341,7 +2341,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_S_C'::h5areadc_s_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT) :: buf
@@ -2351,19 +2351,19 @@ CONTAINS
             hdferr = h5areadc_s_c(attr_id, memtype_id,  buf, dims)
           END SUBROUTINE h5aread_char_scalar
 
-          SUBROUTINE h5aread_char_1(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_1(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_1
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_1_c
@@ -2376,7 +2376,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_1_C'::h5areadc_1_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2388,19 +2388,19 @@ CONTAINS
           END SUBROUTINE h5aread_char_1
 
 
-          SUBROUTINE h5aread_char_2(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_2(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_2
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
                  DIMENSION(dims(1),dims(2)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_2_c
@@ -2413,7 +2413,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_2_C'::h5areadc_2_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2425,19 +2425,19 @@ CONTAINS
           END SUBROUTINE h5aread_char_2
 
 
-          SUBROUTINE h5aread_char_3(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_3(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_3
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_3_c
@@ -2450,7 +2450,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_3_C'::h5areadc_3_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2462,19 +2462,19 @@ CONTAINS
           END SUBROUTINE h5aread_char_3
 
 
-          SUBROUTINE h5aread_char_4(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_4(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_4
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_4_c
@@ -2487,7 +2487,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_4_C'::h5areadc_4_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2499,19 +2499,19 @@ CONTAINS
           END SUBROUTINE h5aread_char_4
 
 
-          SUBROUTINE h5aread_char_5(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_5(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_5
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_5_c
@@ -2524,7 +2524,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_5_C'::h5areadc_5_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2536,19 +2536,19 @@ CONTAINS
           END SUBROUTINE h5aread_char_5
 
 
-          SUBROUTINE h5aread_char_6(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_6(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_6
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_6_c
@@ -2561,7 +2561,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_6_C'::h5areadc_6_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2573,19 +2573,19 @@ CONTAINS
           END SUBROUTINE h5aread_char_6
 
 
-          SUBROUTINE h5aread_char_7(attr_id, memtype_id,  buf, dims, hdferr) 
+          SUBROUTINE h5aread_char_7(attr_id, memtype_id,  buf, dims, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aread_char_7
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier 
-            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype 
+            INTEGER(HID_T), INTENT(IN) :: attr_id   ! Attribute identifier
+            INTEGER(HID_T), INTENT(IN) :: memtype_id ! Attribute datatype
                                                      ! identifier  (in memory)
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-                                                    ! Attribute data 
+                                                    ! Attribute data
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5areadc_7_c
@@ -2598,7 +2598,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AREADC_7_C'::h5areadc_7_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: buf
-            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes 
+            INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims       ! Array to story buf dimension sizes
               INTEGER(HID_T), INTENT(IN) :: attr_id
               INTEGER(HID_T), INTENT(IN) :: memtype_id
               CHARACTER(LEN=*), INTENT(INOUT), &
@@ -2611,37 +2611,37 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:		h5aget_space_f 
+! Name:		h5aget_space_f
 !
 ! Purpose:  	Gets a copy of the dataspace for an attribute.
 !
-! Inputs:  
+! Inputs:
 !		attr_id		- attribute identifier
-! Outputs:  
+! Outputs:
 !		space_id	- attribite dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aget_space_f(attr_id, space_id, hdferr) 
+          SUBROUTINE h5aget_space_f(attr_id, space_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_space_f
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
-            INTEGER(HID_T), INTENT(OUT) :: space_id 
+            INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
+            INTEGER(HID_T), INTENT(OUT) :: space_id
                                             ! Attribute dataspace identifier
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
@@ -2663,37 +2663,37 @@ CONTAINS
           END SUBROUTINE h5aget_space_f
 
 !----------------------------------------------------------------------
-! Name:		h5aget_type_f 
+! Name:		h5aget_type_f
 !
 ! Purpose:  	Gets an attribute datatype.
 !
-! Inputs:  
+! Inputs:
 !		attr_id 	- attribute identifier
-! Outputs:  
+! Outputs:
 !		type_id		- attribute datatype identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5aget_type_f(attr_id, type_id, hdferr) 
+          SUBROUTINE h5aget_type_f(attr_id, type_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_type_f
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
-            INTEGER(HID_T), INTENT(OUT) :: type_id 
+            INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
+            INTEGER(HID_T), INTENT(OUT) :: type_id
                                               ! Attribute datatype identifier
             INTEGER, INTENT(OUT) :: hdferr    ! Error code
 
@@ -2715,40 +2715,40 @@ CONTAINS
           END SUBROUTINE h5aget_type_f
 
 !----------------------------------------------------------------------
-! Name:		h5aget_name_f 
+! Name:		h5aget_name_f
 !
-! Purpose: 	Gets an attribute name.  
+! Purpose: 	Gets an attribute name.
 !
-! Inputs:  
+! Inputs:
 !		attr_id		- attribute identifier
 !		size		- size of a buffer to read name in
-! Outputs:  
+! Outputs:
 !		buf		- buffer to read name in
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
 
-  SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr) 
+  SUBROUTINE h5aget_name_f(attr_id, size, buf, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_name_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
-    INTEGER(SIZE_T), INTENT(IN) :: size    ! Buffer size 
-    CHARACTER(LEN=*), INTENT(INOUT) :: buf   
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
+    INTEGER(SIZE_T), INTENT(IN) :: size    ! Buffer size
+    CHARACTER(LEN=*), INTENT(INOUT) :: buf
                                            ! Buffer to hold attribute name
     INTEGER, INTENT(OUT) :: hdferr ! Error code:
                                    ! name length is successful,
@@ -2775,9 +2775,9 @@ CONTAINS
 !----------------------------------------------------------------------
 ! Name:		h5aget_name_by_idx_f
 !
-! Purpose: 	Gets an attribute name, by attribute index position.  
+! Purpose: 	Gets an attribute name, by attribute index position.
 !
-! Inputs:  
+! Inputs:
 !          loc_id   - Location of object to which attribute is attached
 !          obj_name - Name of object to which attribute is attached, relative to location
 !          idx_type - Type of index; Possible values are:
@@ -2798,13 +2798,13 @@ CONTAINS
 !          order    - Index traversal order
 !              n    - Attribute’s position in index
 !
-! Outputs:  
+! Outputs:
 !		name            - Attribute name
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!        lapl_id    - Link access property list	
+!        lapl_id    - Link access property list
 !           size    - Size, in bytes, of attribute name
 !
 ! Programmer:   M.S. Breitenfeld
@@ -2814,7 +2814,7 @@ CONTAINS
 !----------------------------------------------------------------------
 
   SUBROUTINE h5aget_name_by_idx_f(loc_id, obj_name, idx_type, order, &
-       n, name, hdferr, size, lapl_id) 
+       n, name, hdferr, size, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_name_by_idx_f
@@ -2837,10 +2837,10 @@ CONTAINS
                                     !    H5_ITER_N_F 	    - Number of iteration orders
 
     INTEGER(HSIZE_T), INTENT(IN) :: n !  Attribute’s position in index
-     
+
     CHARACTER(LEN=*), INTENT(OUT) :: name ! Attribute name
 
-    
+
     INTEGER, INTENT(OUT) :: hdferr    ! Error code:
                                          ! Returns attribute name size,
                                          ! -1 if fail
@@ -2865,7 +2865,7 @@ CONTAINS
          INTEGER, INTENT(IN) :: idx_type
          INTEGER, INTENT(IN) :: order
          INTEGER(HSIZE_T), INTENT(IN) :: n
-     
+
          CHARACTER(LEN=*), INTENT(OUT) :: name
          INTEGER(SIZE_T) :: size_default
          INTEGER(HID_T) :: lapl_id_default
@@ -2881,7 +2881,7 @@ CONTAINS
 
     hdferr = h5aget_name_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, &
          n, name, size_default, lapl_id_default)
-    
+
     IF(PRESENT(size)) size = size_default
 
 
@@ -2889,37 +2889,37 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:		h5aget_num_attrs_f 
+! Name:		h5aget_num_attrs_f
 !
 ! Purpose:  	Determines the number of attributes attached to an object.
 !
-! Inputs:  
+! Inputs:
 !		obj_id		- object (group, dataset, or named datatype)
 !				  identifier
-! Outputs:  
+! Outputs:
 !		attr_num	- number of attributes attached to the object
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr) 
+  SUBROUTINE h5aget_num_attrs_f(obj_id, attr_num, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_num_attrs_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier 
+    INTEGER(HID_T), INTENT(IN) :: obj_id  ! Object identifier
     INTEGER, INTENT(OUT) :: attr_num      ! Number of attributes of the
     ! object
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
@@ -2937,43 +2937,43 @@ CONTAINS
          INTEGER, INTENT(OUT) :: attr_num
        END FUNCTION h5aget_num_attrs_c
     END INTERFACE
-    
+
     hdferr = h5aget_num_attrs_c(obj_id, attr_num)
   END SUBROUTINE h5aget_num_attrs_f
 
 !----------------------------------------------------------------------
-! Name:		h5adelete_f 
+! Name:		h5adelete_f
 !
 ! Purpose:  	Deletes an attribute of an object (group, dataset or
 !		named datatype)
 !
-! Inputs:  
+! Inputs:
 !		obj_id		- object identifier
 !		name		- attribute name
-! Outputs:  
+! Outputs:
 !
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5adelete_f(obj_id, name, hdferr) 
+  SUBROUTINE h5adelete_f(obj_id, name, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5adelete_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier 
+    INTEGER(HID_T), INTENT(IN) :: obj_id    ! Object identifier
     CHARACTER(LEN=*), INTENT(IN) :: name    ! Attribute name
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     INTEGER(SIZE_T) :: namelen
@@ -2982,7 +2982,7 @@ CONTAINS
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
-       INTEGER FUNCTION h5adelete_c(obj_id, name, namelen) 
+       INTEGER FUNCTION h5adelete_c(obj_id, name, namelen)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ADELETE_C'::h5adelete_c
@@ -2993,42 +2993,42 @@ CONTAINS
          INTEGER(SIZE_T) :: namelen
        END FUNCTION h5adelete_c
     END INTERFACE
-    
+
     namelen = LEN(name)
     hdferr = h5adelete_c(obj_id, name, namelen)
   END SUBROUTINE h5adelete_f
 
 !----------------------------------------------------------------------
-! Name:		h5aclose_f 
+! Name:		h5aclose_f
 !
 ! Purpose:  	Closes the specified attribute.
-!		
-! Inputs:  
+!
+! Inputs:
 !		attr_id		- attribute identifier
-! Outputs:  
+! Outputs:
 !
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces are added for 
+! Modifications: 	Explicit Fortran interfaces are added for
 !			called C functions (it is needed for Windows
-!			port).  February 27, 2001 
+!			port).  February 27, 2001
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aclose_f(attr_id, hdferr) 
+  SUBROUTINE h5aclose_f(attr_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aclose_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier 
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
     INTEGER, INTENT(OUT) :: hdferr         ! Error code:
 
 !            INTEGER, EXTERNAL :: h5aclose_c
@@ -3043,39 +3043,39 @@ CONTAINS
          INTEGER(HID_T), INTENT(IN) :: attr_id
        END FUNCTION h5aclose_c
     END INTERFACE
-    
+
     hdferr = h5aclose_c(attr_id)
   END SUBROUTINE h5aclose_f
 
 !----------------------------------------------------------------------
-! Name:		h5aget_storage_size_f 
+! Name:		h5aget_storage_size_f
 !
 ! Purpose:  	Returns the amount of storage required for an attribute.
-!		
-! Inputs:  
+!
+! Inputs:
 !		attr_id		- attribute identifier
-! Outputs:  
+! Outputs:
 !               size            - attribute storage size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M. S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aget_storage_size_f(attr_id, size, hdferr) 
+  SUBROUTINE h5aget_storage_size_f(attr_id, size, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_storage_size_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier  
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
     INTEGER(HSIZE_T), INTENT(OUT) :: size   ! Attribute storage requirement
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
@@ -3091,39 +3091,39 @@ CONTAINS
          INTEGER(HSIZE_T), INTENT(OUT) :: size
        END FUNCTION h5aget_storage_size_c
     END INTERFACE
-    
+
     hdferr = h5aget_storage_size_c(attr_id, size)
   END SUBROUTINE h5aget_storage_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5aget_create_plist_f 
+! Name:		h5aget_create_plist_f
 !
 ! Purpose:  	Gets an attribute creation property list identifier
-!		
-! Inputs:  
+!
+! Inputs:
 !		attr_id		  - Identifier of the attribute
-! Outputs:  
+! Outputs:
 !               creation_prop_id  - Identifier for the attribute’s creation property
-!		hdferr:		  - error code		
+!		hdferr:		  - error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M. S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aget_create_plist_f(attr_id, creation_prop_id, hdferr) 
+  SUBROUTINE h5aget_create_plist_f(attr_id, creation_prop_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_create_plist_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Identifier of the attribute 
+    INTEGER(HID_T), INTENT(IN) :: attr_id  ! Identifier of the attribute
     INTEGER(HID_T), INTENT(OUT) :: creation_prop_id   ! Identifier for the attribute’s creation property
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
@@ -3140,49 +3140,49 @@ CONTAINS
          INTEGER(HID_T), INTENT(OUT) :: creation_prop_id
        END FUNCTION h5aget_create_plist_c
     END INTERFACE
-    
+
     hdferr = h5aget_create_plist_c(attr_id, creation_prop_id)
   END SUBROUTINE h5aget_create_plist_f
 
 !----------------------------------------------------------------------
-! Name:		h5arename_by_name_f 
+! Name:		h5arename_by_name_f
 !
 ! Purpose: 	Renames an attribute
 !
-! Inputs:  
+! Inputs:
 !		loc_id        - Location or object identifier; may be dataset or group
-!		obj_name      - Name of object, relative to location, 
+!		obj_name      - Name of object, relative to location,
 !                                whose attribute is to be renamed
 !               old_attr_name - Prior attribute name
 !               new_attr_name - New attribute name
 !               lapl_id       - Link access property list identifier
 !
 ! Outputs:
-!		hdferr:	      - error code		
+!		hdferr:	      - error code
 !				 	Success:  0
-!				 	Failure: -1   			
+!				 	Failure: -1
 !
 ! Programmer:	M.S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications: N/A
 !
 !----------------------------------------------------------------------
 
   SUBROUTINE h5arename_by_name_f(loc_id, obj_name, old_attr_name, new_attr_name, &
-        hdferr, lapl_id) 
+        hdferr, lapl_id)
 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5arename_by_name_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location, 
+    INTEGER(HID_T), INTENT(IN) :: loc_id    ! Object identifier
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
                                               !  whose attribute is to be renamed
     CHARACTER(LEN=*), INTENT(IN) :: old_attr_name ! Prior attribute name
     CHARACTER(LEN=*), INTENT(IN) :: new_attr_name ! New attribute name
-    
+
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
@@ -3191,7 +3191,7 @@ CONTAINS
     INTEGER(SIZE_T) :: obj_namelen
     INTEGER(SIZE_T) :: old_attr_namelen
     INTEGER(SIZE_T) :: new_attr_namelen
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -3211,7 +3211,7 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
          INTEGER(SIZE_T) :: new_attr_namelen
          INTEGER(HID_T) :: lapl_id_default
-         
+
        END FUNCTION h5arename_by_name_c
     END INTERFACE
 
@@ -3221,49 +3221,49 @@ CONTAINS
 
     lapl_id_default = H5P_DEFAULT_F
     IF(PRESENT(lapl_id)) lapl_id_default=lapl_id
-    
+
     hdferr = h5arename_by_name_c(loc_id, obj_name, obj_namelen, &
          old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen, &
          lapl_id_default)
-    
+
   END SUBROUTINE h5arename_by_name_f
 
 !----------------------------------------------------------------------
-! Name:		h5aopen_f 
+! Name:		h5aopen_f
 !
-! Purpose:  	Opens an attribute for an object specified by object 
+! Purpose:  	Opens an attribute for an object specified by object
 !               identifier and attribute name
 !
-! Inputs:  	
+! Inputs:
 !		obj_id      - Identifer for object to which attribute is attached
 !               attr_name   - Name of attribute to open
-! Outputs:  
+! Outputs:
 !		attr_id     - attribute identifier
-!		hdferr:     - error code		
+!		hdferr:     - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !		aapl_id     - Attribute access property list
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aopen_f(obj_id, attr_name, attr_id, hdferr, aapl_id) 
+  SUBROUTINE h5aopen_f(obj_id, attr_name, attr_id, hdferr, aapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aopen_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: obj_id      ! Object identifier 
+    INTEGER(HID_T), INTENT(IN) :: obj_id      ! Object identifier
     CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
-    INTEGER(HID_T), INTENT(OUT) :: attr_id    ! Attribute identifier 
-    INTEGER, INTENT(OUT) :: hdferr            ! Error code 		
+    INTEGER(HID_T), INTENT(OUT) :: attr_id    ! Attribute identifier
+    INTEGER, INTENT(OUT) :: hdferr            ! Error code
                                               !   Success:  0
-                                              !   Failure: -1  
+                                              !   Failure: -1
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id     ! Attribute access property list
     INTEGER(HID_T) :: aapl_id_default
 
@@ -3281,7 +3281,7 @@ CONTAINS
          INTEGER(HID_T), INTENT(IN) :: obj_id
          CHARACTER(LEN=*), INTENT(IN) :: attr_name
          INTEGER(HID_T) :: aapl_id_default
-         INTEGER(SIZE_T) :: attr_namelen 
+         INTEGER(SIZE_T) :: attr_namelen
          INTEGER(HID_T), INTENT(OUT) :: attr_id
        END FUNCTION h5aopen_c
     END INTERFACE
@@ -3296,11 +3296,11 @@ CONTAINS
   END SUBROUTINE h5aopen_f
 
 !----------------------------------------------------------------------
-! Name:		h5adelete_by_idx_f 
+! Name:		h5adelete_by_idx_f
 !
-! Purpose:  	Deletes an attribute from an object according to index order 
+! Purpose:  	Deletes an attribute from an object according to index order
 !
-! Inputs:  	
+! Inputs:
 !		loc_id     - Location or object identifier; may be dataset or group
 !               obj_name   - Name of object, relative to location, from which attribute is to be removed
 !               idx_type   - Type of index; Possible values are:
@@ -3309,7 +3309,7 @@ CONTAINS
 !                  H5_INDEX_NAME_F          - Index on names
 !                  H5_INDEX_CRT_ORDER_F     - Index on creation order
 !                  H5_INDEX_N_F	            - Number of indices defined
-!                             
+!
 !               order - Order in which to iterate over index; Possible values are:
 !
 !                  H5_ITER_UNKNOWN_F   - Unknown order
@@ -3320,26 +3320,26 @@ CONTAINS
 !
 !               n          - Offset within index
 ! Outputs:
-!		hdferr:     - error code		
+!		hdferr:     - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !               lapl_id    - Link access property list
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
-  SUBROUTINE h5adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id) 
+  SUBROUTINE h5adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5adelete_by_idx_f
 !DEC$endif
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location, 
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
                                               !  from which attribute is to be removed
     INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
                                               !    H5_INDEX_UNKNOWN_F   - Unknown index type
@@ -3354,14 +3354,14 @@ CONTAINS
                                               !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
                                               !    H5_ITER_N_F	    - Number of iteration orders
 !
-    INTEGER(HSIZE_T), INTENT(IN) :: n         ! Offset within index 
+    INTEGER(HSIZE_T), INTENT(IN) :: n         ! Offset within index
     INTEGER, INTENT(OUT) :: hdferr         ! Error code:
                                            ! 0 on success and -1 on failure
     INTEGER(SIZE_T) :: obj_namelen
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list
 
     INTEGER(HID_T) :: lapl_id_default
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -3375,7 +3375,7 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: obj_name
          INTEGER, INTENT(IN) :: idx_type
          INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n 
+         INTEGER(HSIZE_T), INTENT(IN) :: n
          INTEGER(HID_T) :: lapl_id_default
          INTEGER(SIZE_T) :: obj_namelen
        END FUNCTION h5adelete_by_idx_c
@@ -3383,48 +3383,48 @@ CONTAINS
 
     lapl_id_default = H5P_DEFAULT_F
     IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-    
+
     obj_namelen = LEN(obj_name)
     hdferr = h5adelete_by_idx_c(loc_id, obj_name, obj_namelen, idx_type, order, n, lapl_id_default)
-    
+
   END SUBROUTINE h5adelete_by_idx_f
 
 !----------------------------------------------------------------------
-! Name:		h5adelete_by_name_f 
+! Name:		h5adelete_by_name_f
 !
 ! Purpose:  	Removes an attribute from a specified location
 !
-! Inputs:  	
+! Inputs:
 !		loc_id     - Identifer for object to which attribute is attached
 !               obj_name   - Name of attribute to open
 !		attr_name  - Attribute access property list
 !               lapl_id    - Link access property list
 ! Outputs:
-!		hdferr:     - error code		
+!		hdferr:     - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
-  SUBROUTINE h5adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id) 
+  SUBROUTINE h5adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5adelete_by_name_f
 !DEC$endif
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location, 
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
                                               !  from which attribute is to be removed
     CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Name of attribute to delete
     INTEGER, INTENT(OUT) :: hdferr          ! Error code:
                                             ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list  
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list
     INTEGER(SIZE_T) :: attr_namelen
     INTEGER(SIZE_T) :: obj_namelen
 
@@ -3447,7 +3447,7 @@ CONTAINS
          INTEGER(SIZE_T) :: obj_namelen
        END FUNCTION h5adelete_by_name_c
     END INTERFACE
-    
+
     obj_namelen = LEN(obj_name)
     attr_namelen = LEN(attr_name)
 
@@ -3459,32 +3459,32 @@ CONTAINS
   END SUBROUTINE h5adelete_by_name_f
 
 !----------------------------------------------------------------------
-! Name:		h5aopen_by_idx_f 
+! Name:		h5aopen_by_idx_f
 !
 ! Purpose:  	Opens an existing attribute that is attached to an object specified by location and name
 !
-! Inputs:  
+! Inputs:
 !		loc_id      - Location of object to which attribute is attached
 !               obj_name    - Name of object to which attribute is attached, relative to location
 !               idx_type    - Type of index
 !               order       - Index traversal order
 !               n           - Attribute’s position in index
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !               aapl_id     - Attribute access property list
 !               lapl_id     - Link access property list
 !
 ! Programmer:	M.S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aopen_by_idx_f(loc_id, obj_name, idx_type, order, n, attr_id, hdferr, aapl_id, lapl_id) 
+  SUBROUTINE h5aopen_by_idx_f(loc_id, obj_name, idx_type, order, n, attr_id, hdferr, aapl_id, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aopen_by_idx_f
@@ -3502,7 +3502,7 @@ CONTAINS
                                               !    H5_ITER_INC_F      - Increasing order
                                               !    H5_ITER_DEC_F      - Decreasing order
                                               !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-                 
+
     INTEGER(HSIZE_T), INTENT(IN) :: n      ! Attribute’s position in index
 
     INTEGER(HID_T), INTENT(OUT) :: attr_id  ! Attribute identifier
@@ -3512,7 +3512,7 @@ CONTAINS
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
 
     INTEGER(SIZE_T) :: obj_namelen
-    INTEGER(HID_T) :: aapl_id_default 
+    INTEGER(HID_T) :: aapl_id_default
     INTEGER(HID_T) :: lapl_id_default
 
 !
@@ -3553,31 +3553,31 @@ CONTAINS
 ! Name:		h5aget_info_f
 !
 ! Purpose:  	Retrieves attribute information, by attribute identifier
-!		
-! Inputs:  
+!
+! Inputs:
 !		attr_id		- attribute identifier
 !
 ! Outputs:  NOTE: In C it is defined as a structure: H5A_info_t
 !
 !    corder_valid   - indicates whether the creation order data is valid for this attribute
-!    corder         - is a positive integer containing the creation order of the attribute        
-!    cset           - indicates the character set used for the attribute’s name          
+!    corder         - is a positive integer containing the creation order of the attribute
+!    cset           - indicates the character set used for the attribute’s name
 !    data_size      - indicates the size, in the number of characters, of the attribute
-!		
-!    hdferr         - error code		
+!
+!    hdferr         - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M. S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  hdferr) 
+  SUBROUTINE h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_info_f
@@ -3585,7 +3585,7 @@ CONTAINS
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: attr_id  ! Attribute identifier
 
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
     INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
     INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
     INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -3612,10 +3612,10 @@ CONTAINS
     END INTERFACE
 
     hdferr = h5aget_info_c(attr_id, corder_valid, corder, cset, data_size)
-    
+
     f_corder_valid =.FALSE.
     IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-    
+
 
 
   END SUBROUTINE h5aget_info_f
@@ -3624,7 +3624,7 @@ CONTAINS
 ! Name:		h5aget_info_by_idx_f
 !
 ! Purpose:  	Retrieves attribute information, by attribute index position
-!		
+!
 ! Inputs:
 !	loc_id - Location of object to which attribute is attached
 !     obj_name - Name of object to which attribute is attached, relative to location
@@ -3634,23 +3634,23 @@ CONTAINS
 !
 ! Outputs:  NOTE: In C it is defined as a structure: H5A_info_t
 !    corder_valid   - indicates whether the creation order data is valid for this attribute
-!    corder         - is a positive integer containing the creation order of the attribute        
-!    cset           - indicates the character set used for the attribute’s name          
-!    data_size      - indicates the size, in the number of characters, of the attribute	
-!    hdferr         - error code		
+!    corder         - is a positive integer containing the creation order of the attribute
+!    cset           - indicates the character set used for the attribute’s name
+!    data_size      - indicates the size, in the number of characters, of the attribute
+!    hdferr         - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!      lapl_id - Link access property list		
+!      lapl_id - Link access property list
 !
 ! Programmer:	M. S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
   SUBROUTINE h5aget_info_by_idx_f(loc_id, obj_name, idx_type, order, n, &
-       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_info_by_idx_f
@@ -3668,11 +3668,11 @@ CONTAINS
                                               !    H5_ITER_INC_F      - Increasing order
                                               !    H5_ITER_DEC_F      - Decreasing order
                                               !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
-                 
+
     INTEGER(HSIZE_T), INTENT(IN) :: n      ! Attribute’s position in index
 
 
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
     INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
     INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
     INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -3698,7 +3698,7 @@ CONTAINS
          INTEGER, INTENT(IN) :: order
          INTEGER(HSIZE_T), INTENT(IN) :: n
          INTEGER(HID_T) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: corder_valid 
+         INTEGER, INTENT(OUT) :: corder_valid
          INTEGER, INTENT(OUT) :: corder
          INTEGER, INTENT(OUT) :: cset
          INTEGER(HSIZE_T), INTENT(OUT) :: data_size
@@ -3717,14 +3717,14 @@ CONTAINS
 
     f_corder_valid =.FALSE.
     IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-    
+
   END SUBROUTINE h5aget_info_by_idx_f
 
 !----------------------------------------------------------------------
 ! Name:		h5aget_info_by_name_f
 !
 ! Purpose:  	Retrieves attribute information, by attribute name
-!		
+!
 ! Inputs:
 !	loc_id - Location of object to which attribute is attached
 !     obj_name - Name of object to which attribute is attached, relative to location
@@ -3732,23 +3732,23 @@ CONTAINS
 !
 ! Outputs:  NOTE: In C it is defined as a structure: H5A_info_t
 !    corder_valid   - indicates whether the creation order data is valid for this attribute
-!    corder         - is a positive integer containing the creation order of the attribute        
-!    cset           - indicates the character set used for the attribute’s name          
-!    data_size      - indicates the size, in the number of characters, of the attribute	
-!    hdferr         - error code		
+!    corder         - is a positive integer containing the creation order of the attribute
+!    cset           - indicates the character set used for the attribute’s name
+!    data_size      - indicates the size, in the number of characters, of the attribute
+!    hdferr         - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!      lapl_id - Link access property list		
+!      lapl_id - Link access property list
 !
 ! Programmer:	M. S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
   SUBROUTINE h5aget_info_by_name_f(loc_id, obj_name, attr_name, &
-       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5aget_info_by_name_f
@@ -3759,7 +3759,7 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
 
 
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
     INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
     INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
     INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -3770,7 +3770,7 @@ CONTAINS
     INTEGER(SIZE_T)  :: attr_namelen
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
     INTEGER(HID_T) :: lapl_id_default
-    
+
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -3787,7 +3787,7 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: attr_name
          INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
          INTEGER(HID_T) :: lapl_id_default
-         INTEGER, INTENT(OUT) :: corder_valid 
+         INTEGER, INTENT(OUT) :: corder_valid
          INTEGER, INTENT(OUT) :: corder
          INTEGER, INTENT(OUT) :: cset
          INTEGER(HSIZE_T), INTENT(OUT) :: data_size
@@ -3799,21 +3799,21 @@ CONTAINS
     attr_namelen = LEN(attr_name)
 
     lapl_id_default = H5P_DEFAULT_F
-    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id 
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
 
     hdferr = h5aget_info_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, &
             corder_valid, corder, cset, data_size)
 
     f_corder_valid =.FALSE.
     IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-    
+
   END SUBROUTINE h5aget_info_by_name_f
 
 !----------------------------------------------------------------------
-! Name:	        H5Acreate_by_name_f	
+! Name:	        H5Acreate_by_name_f
 !
 ! Purpose:  	Creates an attribute attached to a specified object
-!		
+!
 ! Inputs:
 !   loc_id   	- Location or object identifier; may be dataset or group
 !   obj_name 	- Name, relative to loc_id, of object that attribute is to be attached to
@@ -3823,16 +3823,16 @@ CONTAINS
 !
 ! Outputs:
 !       attr    - an attribute identifier
-!     hdferr    - error code		
+!     hdferr    - error code
 !		       Success:  0
-!		       Failure: -1 
+!		       Failure: -1
 ! Optional parameters:
 !   acpl_id 	- Attribute creation property list identifier (Currently not used.)
 !   aapl_id 	- Attribute access property list identifier (Currently not used.)
-!   lapl_id 	- Link access property list		
+!   lapl_id 	- Link access property list
 !
 ! Programmer:	M. S. Breitenfeld
-!		February, 2008	
+!		February, 2008
 !
 ! Modifications:  N/A
 !
@@ -3882,7 +3882,7 @@ CONTAINS
          INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
          CHARACTER(LEN=*), INTENT(IN) :: attr_name
          INTEGER(SIZE_T), INTENT(IN) :: attr_namelen
-         INTEGER(HID_T), INTENT(IN) :: type_id 
+         INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER(HID_T), INTENT(IN) :: space_id
          INTEGER(HID_T) :: acpl_id_default
          INTEGER(HID_T) :: aapl_id_default
@@ -3902,30 +3902,30 @@ CONTAINS
     IF(PRESENT(acpl_id)) acpl_id_default = acpl_id
     IF(PRESENT(aapl_id)) aapl_id_default = aapl_id
     IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-    
+
     hdferr = h5acreate_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, &
             type_id, space_id, acpl_id_default, aapl_id_default, lapl_id_default, attr)
   END SUBROUTINE h5acreate_by_name_f
 
 !----------------------------------------------------------------------
-! Name:	        H5Aexists_f	
+! Name:	        H5Aexists_f
 !
 ! Purpose:  	Determines whether an attribute with a given name exists on an object
-!		
+!
 ! Inputs:
 !                 obj_id - Object identifier
 !              attr_name - Attribute name
 !
 ! Outputs:
 !       attr_exists  - attribute exists status
-!            hdferr  - error code		
+!            hdferr  - error code
 !		         Success:  0
-!		         Failure: -1 
+!		         Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M. S. Breitenfeld
-!		February, 2008	
+!		February, 2008
 !
 ! Modifications:  N/A
 !
@@ -3966,15 +3966,15 @@ CONTAINS
     hdferr = h5aexists_c(obj_id, attr_name, attr_namelen, attr_exists_c)
 
     attr_exists = .FALSE.
-    IF(attr_exists_c.GT.0) attr_exists = .TRUE. 
+    IF(attr_exists_c.GT.0) attr_exists = .TRUE.
 
   END SUBROUTINE h5aexists_f
 
 !----------------------------------------------------------------------
-! Name:	        H5Aexists_by_name_f	
+! Name:	        H5Aexists_by_name_f
 !
 ! Purpose:  	Determines whether an attribute with a given name exists on an object
-!		
+!
 ! Inputs:
 !     loc_id - Location identifier
 !   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
@@ -3982,14 +3982,14 @@ CONTAINS
 !
 ! Outputs:
 !       attr_exists  - attribute exists status
-!            hdferr  - error code		
+!            hdferr  - error code
 !		         Success:  0
-!		         Failure: -1 
+!		         Failure: -1
 ! Optional parameters:
-!    lapl_id - Link access property list identifier	
+!    lapl_id - Link access property list identifier
 !
 ! Programmer:	M. S. Breitenfeld
-!		February, 2008	
+!		February, 2008
 !
 ! Modifications:  N/A
 !
@@ -4003,7 +4003,7 @@ CONTAINS
 
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id    ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id, 
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id,
                                              ! absolute from the file’s root group, or '.'
     CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
     LOGICAL, INTENT(OUT) :: attr_exists ! .TRUE. if exists, .FALSE. otherwise
@@ -4024,7 +4024,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AEXISTS_BY_NAME_C'::h5aexists_by_name_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id  
+         INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: obj_name
          INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
          CHARACTER(LEN=*), INTENT(IN) :: attr_name
@@ -4043,30 +4043,30 @@ CONTAINS
     hdferr = h5aexists_by_name_c(loc_id, obj_name, obj_namelen, attr_name, attr_namelen, lapl_id_default, attr_exists_c)
 
     attr_exists = .FALSE.
-    IF(attr_exists_c.GT.0) attr_exists = .TRUE. 
+    IF(attr_exists_c.GT.0) attr_exists = .TRUE.
 
   END SUBROUTINE h5aexists_by_name_f
 !----------------------------------------------------------------------
-! Name:	        H5Aopen_by_name_f	
+! Name:	        H5Aopen_by_name_f
 !
 ! Purpose:  	Opens an attribute for an object by object name and attribute name.
-!		
+!
 ! Inputs:
-!     loc_id - Location from which to find object to which attribute is attached 
+!     loc_id - Location from which to find object to which attribute is attached
 !   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
 !  attr_name - Attribute name
 !
 ! Outputs:
 !       attr_id  - attribute identifier
-!        hdferr  - error code		
+!        hdferr  - error code
 !		         Success:  0
-!		         Failure: -1 
+!		         Failure: -1
 ! Optional parameters:
 !    aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
-!    lapl_id - Link access property list identifier	
+!    lapl_id - Link access property list identifier
 !
 ! Programmer:	M. S. Breitenfeld
-!		February, 2008	
+!		February, 2008
 !
 ! Modifications:  N/A
 !
@@ -4080,16 +4080,16 @@ CONTAINS
 
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id    ! Location identifier
-    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id, 
+    CHARACTER(LEN=*), INTENT(IN) :: obj_name ! Object name either relative to loc_id,
                                              ! absolute from the file’s root group, or '.'
     CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Attribute name
     INTEGER(HID_T), INTENT(OUT) :: attr_id ! Attribute identifier
     INTEGER, INTENT(OUT) :: hdferr         ! Error code:
                                            ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list 
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: aapl_id ! Attribute access property list
                                                     ! (Currently unused; should be passed in as H5P_DEFAULT_F)
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-    
+
     INTEGER(HID_T) :: aapl_id_default
     INTEGER(HID_T) :: lapl_id_default
 
@@ -4105,7 +4105,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5AOPEN_BY_NAME_C'::h5aopen_by_name_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id  
+         INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: obj_name
          INTEGER(SIZE_T), INTENT(IN) :: obj_namelen
          CHARACTER(LEN=*), INTENT(IN) :: attr_name
@@ -4130,28 +4130,28 @@ CONTAINS
   END SUBROUTINE h5aopen_by_name_f
 
 !----------------------------------------------------------------------
-! Name:		h5arename_f 
+! Name:		h5arename_f
 !
 ! Purpose: 	Renames an attribute
 !
-! Inputs:  
+! Inputs:
 !		loc_id        - Location or object identifier; may be dataset or group
 !               old_attr_name - Prior attribute name
 !               new_attr_name - New attribute name
 !
 ! Outputs:
-!		hdferr:	      - error code		
+!		hdferr:	      - error code
 !				 	Success:  0
-!				 	Failure: -1   			
+!				 	Failure: -1
 !
 ! Programmer:	M.S. Breitenfeld
-!		January, 2008	
+!		January, 2008
 !
 ! Modifications: N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5arename_f(loc_id, old_attr_name, new_attr_name, hdferr) 
+  SUBROUTINE h5arename_f(loc_id, old_attr_name, new_attr_name, hdferr)
 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4165,7 +4165,7 @@ CONTAINS
                                          ! 0 on success and -1 on failure
     INTEGER(SIZE_T) :: old_attr_namelen
     INTEGER(SIZE_T) :: new_attr_namelen
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -4181,16 +4181,16 @@ CONTAINS
          INTEGER(SIZE_T) :: old_attr_namelen
          CHARACTER(LEN=*), INTENT(IN) :: new_attr_name
          INTEGER(SIZE_T) :: new_attr_namelen
-         
+
        END FUNCTION h5arename_c
     END INTERFACE
 
     old_attr_namelen = LEN(old_attr_name)
     new_attr_namelen = LEN(new_attr_name)
-    
+
     hdferr = h5arename_c(loc_id, &
          old_attr_name, old_attr_namelen, new_attr_name, new_attr_namelen)
-    
+
   END SUBROUTINE h5arename_f
 
 END MODULE H5A
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index fab2eb5..58f3ce2 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -30,12 +30,12 @@
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, August 4, 1999
- * Modifications: 
+ * Modifications:
  *               - Added optional parameters introduced in version 1.8
  *                 February, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, 
+nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
 	      hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 {
      char *c_name = NULL;
@@ -51,7 +51,7 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_
      /*
       * Call H5Dcreate2 function.
       */
-     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, 
+     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id,
 				(hid_t)*lcpl_id, (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
          goto DONE;
      *dset_id = (hid_t_f)c_dset_id;
@@ -119,7 +119,7 @@ DONE:
  *              Tuesday, May 14, 2002
  * Modifications: This function is added to accomodate oveloaded h5dwrite_f
  *                with the dims argument being of INTEGER(HSIZE_T) type
- 
+
  *---------------------------------------------------------------------------*/
 int_f
 nh5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
@@ -257,7 +257,7 @@ nh5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, h
  *                complains about wrong parameter types in h5dwrite_c function
  *                called by Fortran rouitnes
  *                                           October 10, 2006 EIP
- * 
+ *
  *---------------------------------------------------------------------------*/
 int_f
 nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
@@ -788,7 +788,7 @@ nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hi
  *                complains about wrong parameter types in h5dwrite_c function
  *                called by Fortran rouitnes
  *                                           October 10, 2006 EIP
- * 
+ *
  *---------------------------------------------------------------------------*/
 int_f
 nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
@@ -1965,8 +1965,8 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
  *		type_id	   - Identifier of the datatype to use when creating the dataset.
  *		space_id   - Identifier of the dataspace to use when creating the dataset.
  *              dcpl_id    - Dataset creation property list identifier.
- *              dapl_id    - Dataset access property list identifier.    
- * Outputs:     
+ *              dapl_id    - Dataset access property list identifier.
+ * Outputs:
  *              dset_id - dataset identifier
  *
  * Returns:     0 on success, -1 on failure
@@ -1974,18 +1974,18 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
  *              February, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, 
+nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
 		   hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 {
   int ret_value = -1;
-  
+
   /*
    * Call H5Dcreate2 function.
    */
-  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id, 
+  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id,
 					 (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
     goto DONE;
-  
+
   ret_value = 0;
 
  DONE:
diff --git a/fortran/src/H5Dff.f90 b/fortran/src/H5Dff.f90
index 757e1e2..fc9808b 100644
--- a/fortran/src/H5Dff.f90
+++ b/fortran/src/H5Dff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,11 +11,11 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5D functions.
-! 
+!
 MODULE H5D
   USE H5GLOBAL
 
@@ -24,21 +24,21 @@ MODULE H5D
      MODULE PROCEDURE h5dwrite_reference_obj
      MODULE PROCEDURE h5dwrite_reference_dsetreg
      MODULE PROCEDURE h5dwrite_integer_scalar
-     MODULE PROCEDURE h5dwrite_integer_1 
-     MODULE PROCEDURE h5dwrite_integer_2 
-     MODULE PROCEDURE h5dwrite_integer_3 
-     MODULE PROCEDURE h5dwrite_integer_4 
-     MODULE PROCEDURE h5dwrite_integer_5 
-     MODULE PROCEDURE h5dwrite_integer_6 
-     MODULE PROCEDURE h5dwrite_integer_7 
+     MODULE PROCEDURE h5dwrite_integer_1
+     MODULE PROCEDURE h5dwrite_integer_2
+     MODULE PROCEDURE h5dwrite_integer_3
+     MODULE PROCEDURE h5dwrite_integer_4
+     MODULE PROCEDURE h5dwrite_integer_5
+     MODULE PROCEDURE h5dwrite_integer_6
+     MODULE PROCEDURE h5dwrite_integer_7
      MODULE PROCEDURE h5dwrite_char_scalar
-     MODULE PROCEDURE h5dwrite_char_1 
-     MODULE PROCEDURE h5dwrite_char_2 
-     MODULE PROCEDURE h5dwrite_char_3 
-     MODULE PROCEDURE h5dwrite_char_4 
-     MODULE PROCEDURE h5dwrite_char_5 
-     MODULE PROCEDURE h5dwrite_char_6 
-     MODULE PROCEDURE h5dwrite_char_7 
+     MODULE PROCEDURE h5dwrite_char_1
+     MODULE PROCEDURE h5dwrite_char_2
+     MODULE PROCEDURE h5dwrite_char_3
+     MODULE PROCEDURE h5dwrite_char_4
+     MODULE PROCEDURE h5dwrite_char_5
+     MODULE PROCEDURE h5dwrite_char_6
+     MODULE PROCEDURE h5dwrite_char_7
      MODULE PROCEDURE h5dwrite_real_scalar
      MODULE PROCEDURE h5dwrite_real_1
      MODULE PROCEDURE h5dwrite_real_2
@@ -64,21 +64,21 @@ MODULE H5D
      MODULE PROCEDURE h5dread_reference_obj
      MODULE PROCEDURE h5dread_reference_dsetreg
      MODULE PROCEDURE h5dread_integer_scalar
-     MODULE PROCEDURE h5dread_integer_1 
-     MODULE PROCEDURE h5dread_integer_2 
-     MODULE PROCEDURE h5dread_integer_3 
-     MODULE PROCEDURE h5dread_integer_4 
-     MODULE PROCEDURE h5dread_integer_5 
-     MODULE PROCEDURE h5dread_integer_6 
-     MODULE PROCEDURE h5dread_integer_7 
+     MODULE PROCEDURE h5dread_integer_1
+     MODULE PROCEDURE h5dread_integer_2
+     MODULE PROCEDURE h5dread_integer_3
+     MODULE PROCEDURE h5dread_integer_4
+     MODULE PROCEDURE h5dread_integer_5
+     MODULE PROCEDURE h5dread_integer_6
+     MODULE PROCEDURE h5dread_integer_7
      MODULE PROCEDURE h5dread_char_scalar
-     MODULE PROCEDURE h5dread_char_1 
-     MODULE PROCEDURE h5dread_char_2 
-     MODULE PROCEDURE h5dread_char_3 
-     MODULE PROCEDURE h5dread_char_4 
-     MODULE PROCEDURE h5dread_char_5 
-     MODULE PROCEDURE h5dread_char_6 
-     MODULE PROCEDURE h5dread_char_7 
+     MODULE PROCEDURE h5dread_char_1
+     MODULE PROCEDURE h5dread_char_2
+     MODULE PROCEDURE h5dread_char_3
+     MODULE PROCEDURE h5dread_char_4
+     MODULE PROCEDURE h5dread_char_5
+     MODULE PROCEDURE h5dread_char_6
+     MODULE PROCEDURE h5dread_char_7
      MODULE PROCEDURE h5dread_real_scalar
      MODULE PROCEDURE h5dread_real_1
      MODULE PROCEDURE h5dread_real_2
@@ -125,54 +125,54 @@ MODULE H5D
 
 
 CONTAINS
-          
+
 !----------------------------------------------------------------------
-! Name:		h5dcreate_f 
+! Name:		h5dcreate_f
 !
-! Purpose: 	Creates a dataset at the specified location 	
+! Purpose: 	Creates a dataset at the specified location
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- file or group identifier
 !		name		- dataset name
 !		type_id		- dataset datatype identifier
 !		space_id	- dataset dataspace identifier
-! Outputs:  
+! Outputs:
 !		dset_id		- dataset identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !            creation_prp - Dataset creation property list
 !            lcpl_id      - Link creation property list
 !            dapl_id      - Dataset access property list
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	
-!                 - Explicit Fortran interfaces were added for 
+! Modifications:
+!                 - Explicit Fortran interfaces were added for
 !	           called C functions (it is needed for Windows
-!		   port).  February 28, 2001 
+!		   port).  February 28, 2001
 !
 !                 - Added version's 1.8 new optional parameters
 !                  February, 2008
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  
-  SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, & 
+
+  SUBROUTINE h5dcreate_f(loc_id, name, type_id, space_id, dset_id, &
        hdferr, dcpl_id, lcpl_id, dapl_id)
- 
+
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dcreate_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset 
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
-    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier 
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
+    INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id ! Dataset creation property list
@@ -201,14 +201,14 @@ CONTAINS
          INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER(HID_T), INTENT(IN) :: space_id
 
-         INTEGER(HID_T) :: lcpl_id_default 
+         INTEGER(HID_T) :: lcpl_id_default
          INTEGER(HID_T) :: dcpl_id_default
          INTEGER(HID_T) :: dapl_id_default
 
          INTEGER(HID_T), INTENT(OUT) :: dset_id
        END FUNCTION h5dcreate_c
     END INTERFACE
-    
+
     lcpl_id_default = H5P_DEFAULT_F
     dcpl_id_default = H5P_DEFAULT_F
     dapl_id_default = H5P_DEFAULT_F
@@ -218,38 +218,38 @@ CONTAINS
     IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
 
     namelen = LEN(name)
-    hdferr = h5dcreate_c(loc_id, name, namelen, type_id, space_id, & 
+    hdferr = h5dcreate_c(loc_id, name, namelen, type_id, space_id, &
          lcpl_id_default, dcpl_id_default, dapl_id_default, dset_id)
- 
+
   END SUBROUTINE h5dcreate_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5dopen_f 
+! Name:		h5dopen_f
 !
-! Purpose: 	Opens an existing dataset.  	
+! Purpose: 	Opens an existing dataset.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- file or group identifier
 !		name		- dataset name
-! Outputs:  
+! Outputs:
 !		dset_id		- dataset identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!	       dapl_id	        - Dataset access property list		
+!	       dapl_id	        - Dataset access property list
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications:  -Explicit Fortran interfaces were added for 
+! Modifications:  -Explicit Fortran interfaces were added for
 !		   called C functions (it is needed for Windows
-!		   port).  February 28, 2001 
+!		   port).  February 28, 2001
 !
 !                 -Added 1.8 (optional) parameter dapl_id
 !                  February, 2008, M.S. Breitenfeld
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5dopen_f(loc_id, name, dset_id, hdferr, dapl_id)
@@ -258,10 +258,10 @@ CONTAINS
 !DEC$attributes dllexport :: h5dopen_f
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset
             INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
             INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id ! Dataset access property list
             INTEGER :: namelen                     ! Name length
 
@@ -289,32 +289,32 @@ CONTAINS
             IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
 
             namelen = LEN(name)
-            hdferr = h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id) 
+            hdferr = h5dopen_c(loc_id, name, namelen, dapl_id_default, dset_id)
 
           END SUBROUTINE h5dopen_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5dclose_f 
+! Name:		h5dclose_f
 !
-! Purpose: 	Closes a dataset.  	
+! Purpose: 	Closes a dataset.
 !
-! Inputs:  
+! Inputs:
 !		dset_id		- dataset identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5dclose_f(dset_id, hdferr)
@@ -356,14 +356,14 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
             TYPE(hobj_ref_t_f), DIMENSION(dims(1)), INTENT(IN) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
@@ -379,26 +379,26 @@ CONTAINS
                                file_space_id_default, xfer_prp_default, ref_buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_OBJ_C'::h5dwrite_ref_obj_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_OBJ_C'::h5dwrite_ref_obj_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id   
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id 
+              INTEGER(HID_T), INTENT(IN) :: dset_id
+              INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HID_T)  :: mem_space_id_default
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HADDR_T), DIMENSION(*) :: ref_buf
               INTEGER(HSIZE_T), DIMENSION(*) :: dims
               END FUNCTION h5dwrite_ref_obj_c
-            END INTERFACE 
+            END INTERFACE
 
             xfer_prp_default = H5P_DEFAULT_F
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
-            
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
+
             allocate(ref_buf(dims(1)), stat=hdferr)
             if (hdferr .NE. 0 ) then
                 hdferr = -1
@@ -406,7 +406,7 @@ CONTAINS
             else
                 do j = 1, dims(1)
                    ref_buf(j) = buf(j)%ref
-                enddo  
+                enddo
             endif
             hdferr = h5dwrite_ref_obj_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, ref_buf, dims(1))
@@ -424,16 +424,16 @@ CONTAINS
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf  
+            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
             TYPE(hdset_reg_ref_t_f), DIMENSION(dims(1)), INTENT(IN) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
@@ -449,26 +449,26 @@ CONTAINS
                                file_space_id_default, xfer_prp_default, ref_buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_REG_C'::h5dwrite_ref_reg_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITE_REF_REG_C'::h5dwrite_ref_reg_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id   
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id 
+              INTEGER(HID_T), INTENT(IN) :: dset_id
+              INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HID_T)  :: mem_space_id_default
               INTEGER(HID_T) :: file_space_id_default
               INTEGER, DIMENSION(*) :: ref_buf
               INTEGER(HSIZE_T), DIMENSION(*) ::  dims
               END FUNCTION h5dwrite_ref_reg_c
-            END INTERFACE 
+            END INTERFACE
 
 
             xfer_prp_default = H5P_DEFAULT_F
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             allocate(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
             if (hdferr .NE. 0 ) then
@@ -476,7 +476,7 @@ CONTAINS
                 return
             else
                 do j = 1, dims(1)
-                  do i = 1, REF_REG_BUF_LEN  
+                  do i = 1, REF_REG_BUF_LEN
                    ref_buf(REF_REG_BUF_LEN*(j-1) + i) = buf(j)%ref(i)
                  enddo
                 enddo
@@ -486,8 +486,8 @@ CONTAINS
             deallocate(ref_buf)
 
           END SUBROUTINE h5dwrite_reference_dsetreg
-           
-           
+
+
           SUBROUTINE h5dwrite_integer_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
                                         mem_space_id, file_space_id, xfer_prp)
 !This definition is needed for Windows DLLs
@@ -500,14 +500,14 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER, INTENT(IN) :: buf ! Data buffer
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
@@ -517,7 +517,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -539,13 +539,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_scalar
 
           SUBROUTINE h5dwrite_integer_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -561,24 +561,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_integer_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -601,13 +601,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_1
 
           SUBROUTINE h5dwrite_integer_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -623,24 +623,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf   ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_integer_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -663,13 +663,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
             hdferr = h5dwrite_integer_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_2
 
           SUBROUTINE h5dwrite_integer_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -685,16 +685,16 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_integer_3_c
@@ -702,7 +702,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -725,14 +725,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_3
 
           SUBROUTINE h5dwrite_integer_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -748,24 +748,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_integer_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -787,14 +787,14 @@ CONTAINS
             xfer_prp_default = H5P_DEFAULT_F
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_4
 
           SUBROUTINE h5dwrite_integer_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -810,15 +810,15 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
@@ -827,7 +827,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -851,14 +851,14 @@ CONTAINS
             file_space_id_default = H5S_ALL_F
 
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_5
 
           SUBROUTINE h5dwrite_integer_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -874,24 +874,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_integer_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -914,14 +914,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_6
 
           SUBROUTINE h5dwrite_integer_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -937,24 +937,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_integer_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_integer_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -976,14 +976,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_integer_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dwrite_integer_7
 
 
@@ -999,15 +999,15 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
@@ -1016,14 +1016,14 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_S_C'::h5dwritec_s_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1039,13 +1039,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_scalar
 
           SUBROUTINE h5dwrite_char_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1061,31 +1061,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwritec_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_1_C'::h5dwritec_1_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1102,13 +1102,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_1
 
           SUBROUTINE h5dwrite_char_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1124,31 +1124,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwritec_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_2_C'::h5dwritec_2_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1165,13 +1165,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_2
 
           SUBROUTINE h5dwrite_char_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1187,31 +1187,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwritec_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_3_C'::h5dwritec_3_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1228,13 +1228,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_3
 
           SUBROUTINE h5dwrite_char_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1250,31 +1250,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwritec_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_4_C'::h5dwritec_4_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1291,13 +1291,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_4
 
           SUBROUTINE h5dwrite_char_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1313,14 +1313,14 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
@@ -1330,14 +1330,14 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_5_C'::h5dwritec_5_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1354,13 +1354,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_5
 
           SUBROUTINE h5dwrite_char_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1376,31 +1376,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwritec_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_6_C'::h5dwritec_6_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1417,13 +1417,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_6
 
           SUBROUTINE h5dwrite_char_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1439,31 +1439,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwritec_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwritec_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DWRITEC_7_C'::h5dwritec_7_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -1479,13 +1479,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwritec_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_char_7
 
           SUBROUTINE h5dwrite_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1500,15 +1500,15 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_s_c
@@ -1516,7 +1516,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1537,13 +1537,13 @@ CONTAINS
             xfer_prp_default  = H5P_DEFAULT_F
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_scalar
 
           SUBROUTINE h5dwrite_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1559,24 +1559,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1599,13 +1599,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_1
 
           SUBROUTINE h5dwrite_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1621,24 +1621,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1661,13 +1661,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_2
 
           SUBROUTINE h5dwrite_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1683,15 +1683,15 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_3_c
@@ -1699,7 +1699,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1722,13 +1722,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_3
 
           SUBROUTINE h5dwrite_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1744,23 +1744,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1783,13 +1783,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_4
 
           SUBROUTINE h5dwrite_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1805,23 +1805,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1844,13 +1844,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_5
 
           SUBROUTINE h5dwrite_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1866,23 +1866,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1905,13 +1905,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_6
 
           SUBROUTINE h5dwrite_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -1927,23 +1927,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_real_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_real_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -1965,13 +1965,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_real_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_real_7
 
 
@@ -1987,16 +1987,16 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(IN) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_s_c
@@ -2004,7 +2004,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2026,13 +2026,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_scalar
 
           SUBROUTINE h5dwrite_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2048,16 +2048,16 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_1_c
@@ -2065,7 +2065,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2088,13 +2088,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_1
 
           SUBROUTINE h5dwrite_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2110,24 +2110,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2150,13 +2150,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_2
 
           SUBROUTINE h5dwrite_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2172,24 +2172,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2212,13 +2212,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_3
 
           SUBROUTINE h5dwrite_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2234,15 +2234,15 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
@@ -2251,7 +2251,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2274,13 +2274,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_4
 
           SUBROUTINE h5dwrite_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2296,24 +2296,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2336,13 +2336,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_5
 
           SUBROUTINE h5dwrite_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2359,24 +2359,24 @@ CONTAINS
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
                                                 ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2399,13 +2399,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_6
 
           SUBROUTINE h5dwrite_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2422,24 +2422,24 @@ CONTAINS
             DOUBLE PRECISION, INTENT(IN), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
                                                 ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dwrite_double_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dwrite_double_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2461,43 +2461,43 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dwrite_double_7
 
 !----------------------------------------------------------------------
-! Name:		h5dread_f 
+! Name:		h5dread_f
 !
-! Purpose: 	Reads raw data from the specified dataset into buf, 
-!		converting from file datatype and dataspace to memory 
+! Purpose: 	Reads raw data from the specified dataset into buf,
+!		converting from file datatype and dataspace to memory
 !		datatype and dataspace.
 !
-! Inputs:  
+! Inputs:
 !		dset_id		- dataset identifier
 !		mem_type_id	- memory type identifier
-!		dims		- 1-dim array of size 7; dims(k) has the size 
+!		dims		- 1-dim array of size 7; dims(k) has the size
 !				- of k-th dimension of the buf array
-! Outputs:  
+! Outputs:
 !		buf		- buffer to read data in
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		mem_space_id	- memory dataspace identifier
 !		file_space_id 	- file dataspace identifier
-!		xfer_prp	- trasfer property list identifier	
+!		xfer_prp	- trasfer property list identifier
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
 !                       dims parameter was added to make code portable;
 !                       n parameter was replaced with dims parameter in
@@ -2508,7 +2508,7 @@ CONTAINS
 !			REAL, DOUBLE PRECISION and CHARACTER buffers
 !			up to 7 dimensions, and one dimensional buffers
 !			of the TYPE(hobj_ref_t_f) and TYPE(hdset_reg_ref_t_f)
-!			types.	
+!			types.
 !----------------------------------------------------------------------
           SUBROUTINE h5dread_reference_obj(dset_id, mem_type_id, buf, dims, hdferr, &
                                         mem_space_id, file_space_id, xfer_prp)
@@ -2523,19 +2523,19 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             TYPE(hobj_ref_t_f), INTENT(INOUT) , &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
             INTEGER(HADDR_T), ALLOCATABLE, DIMENSION(:) :: ref_buf
-            INTEGER :: j  
+            INTEGER :: j
 
 !            INTEGER, EXTERNAL :: h5dread_ref_obj_c
 ! MS FORTRAN needs explicit interface for C functions called here.
@@ -2546,38 +2546,38 @@ CONTAINS
                                file_space_id_default, xfer_prp_default, ref_buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_OBJ_C'::h5dread_ref_obj_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_OBJ_C'::h5dread_ref_obj_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id   
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id 
+              INTEGER(HID_T), INTENT(IN) :: dset_id
+              INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HID_T)  :: mem_space_id_default
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
               INTEGER(HADDR_T), DIMENSION(*) :: ref_buf
               END FUNCTION h5dread_ref_obj_c
-            END INTERFACE 
+            END INTERFACE
 
             allocate(ref_buf(dims(1)), stat=hdferr)
             if (hdferr .NE. 0) then
                 hdferr = -1
                 return
-            endif 
+            endif
 
             xfer_prp_default = H5P_DEFAULT_F
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_ref_obj_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, ref_buf, dims)
              do j = 1, dims(1)
                 buf(j)%ref = ref_buf(j)
-             enddo  
-             deallocate(ref_buf) 
+             enddo
+             deallocate(ref_buf)
           END SUBROUTINE h5dread_reference_obj
 
           SUBROUTINE h5dread_reference_dsetreg(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2591,21 +2591,21 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-            TYPE(hdset_reg_ref_t_f), INTENT(INOUT), & 
+            TYPE(hdset_reg_ref_t_f), INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
             INTEGER, ALLOCATABLE, DIMENSION(:) :: ref_buf
-            INTEGER :: i,j 
+            INTEGER :: i,j
 
 !            INTEGER, EXTERNAL :: h5dread_ref_reg_c
 ! MS FORTRAN needs explicit interface for C functions called here.
@@ -2616,17 +2616,17 @@ CONTAINS
                                file_space_id_default, xfer_prp_default, ref_buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_REG_C'::h5dread_ref_reg_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREAD_REF_REG_C'::h5dread_ref_reg_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id   
-              INTEGER(HID_T), INTENT(IN) :: mem_type_id 
+              INTEGER(HID_T), INTENT(IN) :: dset_id
+              INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HID_T)  :: mem_space_id_default
               INTEGER(HID_T) :: file_space_id_default
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
               INTEGER, DIMENSION(*) :: ref_buf
               END FUNCTION h5dread_ref_reg_c
-            END INTERFACE 
+            END INTERFACE
 
             allocate(ref_buf(REF_REG_BUF_LEN*dims(1)), stat=hdferr)
             if (hdferr .NE. 0) then
@@ -2638,18 +2638,18 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_ref_reg_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, ref_buf, dims)
-           
+
             do j = 1, dims(1)
-             do i = 1, REF_REG_BUF_LEN  
+             do i = 1, REF_REG_BUF_LEN
                    buf(j)%ref(i) = ref_buf(REF_REG_BUF_LEN*(j-1) + i)
              enddo
-            enddo   
+            enddo
             deallocate(ref_buf)
           END SUBROUTINE h5dread_reference_dsetreg
 
@@ -2666,15 +2666,15 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
@@ -2683,7 +2683,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2705,13 +2705,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_scalar
 
           SUBROUTINE h5dread_integer_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2727,14 +2727,14 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
@@ -2744,7 +2744,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2767,13 +2767,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_1
 
           SUBROUTINE h5dread_integer_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2789,24 +2789,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_integer_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2829,14 +2829,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_2
 
           SUBROUTINE h5dread_integer_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2852,24 +2852,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_integer_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2892,14 +2892,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_3
 
           SUBROUTINE h5dread_integer_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2915,24 +2915,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_integer_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -2955,14 +2955,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_4
 
           SUBROUTINE h5dread_integer_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -2978,24 +2978,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_integer_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3018,14 +3018,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_5
 
           SUBROUTINE h5dread_integer_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3041,16 +3041,16 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T)  :: mem_space_id_default 
+            INTEGER(HID_T)  :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_integer_6_c
@@ -3058,7 +3058,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3081,14 +3081,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_6
 
           SUBROUTINE h5dread_integer_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3104,24 +3104,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T)  :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T)  :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_integer_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_integer_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3143,14 +3143,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_integer_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims)
-           
+
           END SUBROUTINE h5dread_integer_7
 
           SUBROUTINE h5dread_char_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3165,16 +3165,16 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_s_c
@@ -3182,14 +3182,14 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_S_C'::h5dreadc_s_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3205,13 +3205,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_scalar
 
           SUBROUTINE h5dread_char_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3227,14 +3227,14 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
@@ -3244,14 +3244,14 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_1_C'::h5dreadc_1_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3268,13 +3268,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_1
 
           SUBROUTINE h5dread_char_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3290,31 +3290,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_2_C'::h5dreadc_2_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3331,13 +3331,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_2
 
           SUBROUTINE h5dread_char_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3353,31 +3353,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_3_C'::h5dreadc_3_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3394,13 +3394,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_3
 
           SUBROUTINE h5dread_char_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3416,31 +3416,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_4_C'::h5dreadc_4_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3457,13 +3457,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_4
 
           SUBROUTINE h5dread_char_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3479,16 +3479,16 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_5_c
@@ -3496,14 +3496,14 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_5_C'::h5dreadc_5_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3520,13 +3520,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_5
 
           SUBROUTINE h5dread_char_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3542,31 +3542,31 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_6_C'::h5dreadc_6_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3583,13 +3583,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_6
 
           SUBROUTINE h5dread_char_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3605,16 +3605,16 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             CHARACTER(LEN=*), INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dreadc_7_c
@@ -3622,14 +3622,14 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dreadc_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DREADC_7_C'::h5dreadc_7_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: buf 
+              !DEC$ATTRIBUTES reference :: buf
               INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HID_T), INTENT(IN) :: mem_type_id
               INTEGER(HID_T)  :: mem_space_id_default
@@ -3645,13 +3645,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dreadc_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_char_7
 
           SUBROUTINE h5dread_real_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3666,15 +3666,15 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_s_c
@@ -3682,7 +3682,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3704,13 +3704,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_scalar
 
           SUBROUTINE h5dread_real_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3726,23 +3726,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3765,13 +3765,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_1
 
           SUBROUTINE h5dread_real_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3787,15 +3787,15 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_2_c
@@ -3803,7 +3803,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3826,13 +3826,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_2
 
           SUBROUTINE h5dread_real_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3848,23 +3848,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_3_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3877,7 +3877,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              REAL, INTENT(INOUT), & 
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf
               END FUNCTION h5dread_real_3_c
             END INTERFACE
@@ -3887,13 +3887,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_3
 
           SUBROUTINE h5dread_real_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3909,23 +3909,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3948,13 +3948,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_4
 
           SUBROUTINE h5dread_real_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -3970,23 +3970,23 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default  
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -3999,7 +3999,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              REAL, INTENT(INOUT), & 
+              REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
               END FUNCTION h5dread_real_5_c
             END INTERFACE
@@ -4009,13 +4009,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_5
 
           SUBROUTINE h5dread_real_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4031,14 +4031,14 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
@@ -4047,7 +4047,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4070,13 +4070,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_6
 
           SUBROUTINE h5dread_real_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4092,24 +4092,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_real_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_real_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4131,13 +4131,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_real_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_real_7
 
           SUBROUTINE h5dread_double_scalar(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4152,16 +4152,16 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(INOUT) :: buf ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_s_c
@@ -4169,7 +4169,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_s_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4191,13 +4191,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_s_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_scalar
 
           SUBROUTINE h5dread_double_1(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4213,24 +4213,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_1_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_1_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4253,13 +4253,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_1_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_1
 
           SUBROUTINE h5dread_double_2(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4275,24 +4275,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_2_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_2_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4305,7 +4305,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              DOUBLE PRECISION, INTENT(INOUT), & 
+              DOUBLE PRECISION, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5dread_double_2_c
             END INTERFACE
@@ -4315,13 +4315,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_2_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_2
 
           SUBROUTINE h5dread_double_3(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4337,16 +4337,16 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
+            INTEGER(HID_T) :: mem_space_id_default
             INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_3_c
@@ -4354,7 +4354,7 @@ CONTAINS
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_3_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4377,13 +4377,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_3_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_3
 
           SUBROUTINE h5dread_double_4(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4400,24 +4400,24 @@ CONTAINS
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf
                                                 ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_4_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_4_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4440,13 +4440,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_4_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_4
 
           SUBROUTINE h5dread_double_5(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4462,24 +4462,24 @@ CONTAINS
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_5_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4502,13 +4502,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_5_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_5
 
           SUBROUTINE h5dread_double_6(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4525,24 +4525,24 @@ CONTAINS
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf
                                                 ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_6_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_6_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4565,13 +4565,13 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_6_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_6
 
           SUBROUTINE h5dread_double_7(dset_id, mem_type_id, buf, dims, hdferr, &
@@ -4588,24 +4588,24 @@ CONTAINS
             DOUBLE PRECISION, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf
                                                 ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
             INTEGER(HID_T) :: xfer_prp_default
-            INTEGER(HID_T) :: mem_space_id_default 
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: mem_space_id_default
+            INTEGER(HID_T) :: file_space_id_default
 
 !            INTEGER, EXTERNAL :: h5dread_double_7_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
               INTEGER FUNCTION h5dread_double_7_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims)
               USE H5GLOBAL
@@ -4627,49 +4627,49 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_double_7_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, buf, dims)
-           
+
           END SUBROUTINE h5dread_double_7
 
 !----------------------------------------------------------------------
-! Name:		h5dget_space_f 
+! Name:		h5dget_space_f
 !
-! Purpose:	Returns an identifier for a copy of the dataspace for a 
-!		dataset.   	
+! Purpose:	Returns an identifier for a copy of the dataspace for a
+!		dataset.
 !
-! Inputs:  
+! Inputs:
 !		dataset_id	- dataset identifier
-! Outputs:  
+! Outputs:
 !		dataspace_id	- dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5dget_space_f(dataset_id, dataspace_id, hdferr) 
+          SUBROUTINE h5dget_space_f(dataset_id, dataspace_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dget_space_f
 !DEC$endif
-            IMPLICIT NONE 
+            IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
             INTEGER(HID_T), INTENT(OUT) :: dataspace_id   ! Dataspace identifier
-            INTEGER, INTENT(OUT) :: hdferr                ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr                ! Error code
 
 !            INTEGER, EXTERNAL :: h5dget_space_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -4686,43 +4686,43 @@ CONTAINS
             END INTERFACE
 
             hdferr = h5dget_space_c(dataset_id, dataspace_id)
-          END SUBROUTINE h5dget_space_f  
+          END SUBROUTINE h5dget_space_f
 
 !----------------------------------------------------------------------
-! Name:		h5dget_type_f 
+! Name:		h5dget_type_f
 !
-! Purpose:	Returns an identifier for a copy of the datatype for a 
-!		dataset.   	
+! Purpose:	Returns an identifier for a copy of the datatype for a
+!		dataset.
 !
-! Inputs:  
+! Inputs:
 !		dataset_id	- dataset identifier
-! Outputs:  
+! Outputs:
 !		datatype_id	- dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5dget_type_f(dataset_id, datatype_id, hdferr) 
+          SUBROUTINE h5dget_type_f(dataset_id, datatype_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dget_type_f
 !DEC$endif
-            IMPLICIT NONE 
+            IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
             INTEGER(HID_T), INTENT(OUT) :: datatype_id    ! Datatype identifier
-            INTEGER, INTENT(OUT) :: hdferr                ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr                ! Error code
 !            INTEGER, EXTERNAL :: h5dget_type_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -4738,51 +4738,51 @@ CONTAINS
             END INTERFACE
 
             hdferr = h5dget_type_c (dataset_id, datatype_id)
-          END SUBROUTINE h5dget_type_f  
+          END SUBROUTINE h5dget_type_f
 
 !----------------------------------------------------------------------
-! Name:		h5dset_extent (instead of obsolete name: h5dextend_f) 
+! Name:		h5dset_extent (instead of obsolete name: h5dextend_f)
 !
-! Purpose:	Extends a dataset with unlimited dimension.	
+! Purpose:	Extends a dataset with unlimited dimension.
 !
-! Inputs:  
+! Inputs:
 !		dataset_id	- dataset identifier
-!		size		- array containing the new magnitude of 
+!		size		- array containing the new magnitude of
 !				  each dimension
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
 !                       Changed name from the now obsolete h5dextend_f
 !                       to h5dset_extent_f. Provided interface to old name
 !                       for backward compatability. -MSB- March 14, 2008
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-  SUBROUTINE h5dset_extent_f(dataset_id, size, hdferr) 
+  SUBROUTINE h5dset_extent_f(dataset_id, size, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dset_extent_f
 !DEC$endif
-    IMPLICIT NONE 
+    IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
     INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
-    ! Array containing 
-    ! dimensions' sizes 
-    INTEGER, INTENT(OUT) :: hdferr                ! Error code 
-    
+    ! Array containing
+    ! dimensions' sizes
+    INTEGER, INTENT(OUT) :: hdferr                ! Error code
+
     !
     !  MS FORTRAN needs explicit interface for C functions called here.
     !
@@ -4796,48 +4796,48 @@ CONTAINS
          INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN)  :: size
        END FUNCTION h5dset_extent_c
     END INTERFACE
-    
+
     hdferr = H5Dset_extent_c(dataset_id, size)
   END SUBROUTINE h5dset_extent_f
 
 
 !----------------------------------------------------------------------
-! Name:		h5dget_create_plist_f 
+! Name:		h5dget_create_plist_f
 !
-! Purpose:	Returns an identifier for a copy of the dataset creation 
-!		property list for a dataset. 	
+! Purpose:	Returns an identifier for a copy of the dataset creation
+!		property list for a dataset.
 !
-! Inputs:  
+! Inputs:
 !		dataset_id	- dataset identifier
-! Outputs:  
+! Outputs:
 !		plist_id	- creation property list identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5dget_create_plist_f(dataset_id, plist_id, hdferr) 
+          SUBROUTINE h5dget_create_plist_f(dataset_id, plist_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dget_create_plist_f
 !DEC$endif
-            IMPLICIT NONE 
+            IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
             INTEGER(HID_T), INTENT(OUT) :: plist_id    ! Dataset creation
                                                   ! property list identifier
-            INTEGER, INTENT(OUT) :: hdferr                ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr                ! Error code
 
 !            INTEGER, EXTERNAL :: h5dget_create_plist_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -4854,43 +4854,43 @@ CONTAINS
             END INTERFACE
 
             hdferr = h5dget_create_plist_c(dataset_id, plist_id)
-          END SUBROUTINE h5dget_create_plist_f  
+          END SUBROUTINE h5dget_create_plist_f
 
 !----------------------------------------------------------------------
-! Name:		h5dget_storage_size_f 
+! Name:		h5dget_storage_size_f
 !
-! Purpose:	Returns the amount of storage requires by a dataset	
+! Purpose:	Returns the amount of storage requires by a dataset
 !
-! Inputs:  
+! Inputs:
 !		dataset_id	- dataset identifier
-! Outputs:  
+! Outputs:
 !		size		- datastorage size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		October 15, 2002	
+!		October 15, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5dget_storage_size_f(dataset_id, size, hdferr) 
+          SUBROUTINE h5dget_storage_size_f(dataset_id, size, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dget_storage_size_f
 !DEC$endif
-            IMPLICIT NONE 
+            IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
             INTEGER(HSIZE_T),  INTENT(OUT)  :: size
-                                                          ! Amount of storage 
+                                                          ! Amount of storage
                                                           ! allocated for dataset
-            INTEGER, INTENT(OUT) :: hdferr                ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr                ! Error code
 
             INTERFACE
               INTEGER FUNCTION h5dget_storage_size_c(dataset_id, size)
@@ -4904,45 +4904,45 @@ CONTAINS
             END INTERFACE
 
             hdferr = h5dget_storage_size_c(dataset_id, size)
-          END SUBROUTINE h5dget_storage_size_f  
+          END SUBROUTINE h5dget_storage_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5dvlen_get_max_len_f 
+! Name:		h5dvlen_get_max_len_f
 !
 ! Purpose:	Returns maximum lenght of the VL array elements
 !
-! Inputs:  
+! Inputs:
 !		dataset_id	- dataset identifier
 !		type_id		- datatype identifier
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		size		- buffer size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		October 15, 2002	
+!		October 15, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5dvlen_get_max_len_f(dataset_id, type_id, space_id, len,  hdferr) 
+          SUBROUTINE h5dvlen_get_max_len_f(dataset_id, type_id, space_id, len,  hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5dvlen_get_max_len_f
 !DEC$endif
-            IMPLICIT NONE 
+            IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dataset_id      ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: type_id         ! Datatype identifier
             INTEGER(HID_T), INTENT(IN) :: space_id        ! Dataspace identifier
             INTEGER(SIZE_T),  INTENT(OUT)  :: len         ! Maximum length of the element
-            INTEGER, INTENT(OUT) :: hdferr                ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr                ! Error code
 
             INTERFACE
               INTEGER FUNCTION h5dvlen_get_max_len_c(dataset_id, type_id, space_id, len)
@@ -4951,14 +4951,14 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DVLEN_GET_MAX_LEN_C'::h5dvlen_get_max_len_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: dataset_id
-              INTEGER(HID_T), INTENT(IN) :: type_id 
-              INTEGER(HID_T), INTENT(IN) :: space_id     
-              INTEGER(SIZE_T), INTENT(OUT)  :: len 
+              INTEGER(HID_T), INTENT(IN) :: type_id
+              INTEGER(HID_T), INTENT(IN) :: space_id
+              INTEGER(SIZE_T), INTENT(OUT)  :: len
               END FUNCTION h5dvlen_get_max_len_c
             END INTERFACE
 
             hdferr = h5dvlen_get_max_len_c(dataset_id, type_id,  space_id, len)
-          END SUBROUTINE h5dvlen_get_max_len_f  
+          END SUBROUTINE h5dvlen_get_max_len_f
 
           SUBROUTINE h5dwrite_vl_integer(dset_id, mem_type_id, buf, dims, len, &
                                          hdferr, &
@@ -4972,26 +4972,26 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! MAX len x num_elem
-            INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len ! Array to store 
+            INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len ! Array to store
                                                               ! the lenght of each
                                                               ! element
             INTEGER, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf   ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
             INTERFACE
               INTEGER FUNCTION h5dwrite_vl_integer_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims, len)
               USE H5GLOBAL
@@ -5004,7 +5004,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len 
+              INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
               INTEGER, INTENT(IN), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5dwrite_vl_integer_c
@@ -5015,14 +5015,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_vl_integer_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims, len)
-           
+
           END SUBROUTINE h5dwrite_vl_integer
 
           SUBROUTINE h5dread_vl_integer(dset_id, mem_type_id, buf, dims, len, &
@@ -5037,29 +5037,29 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! MAX len x num_elem
-            INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len ! Array to store 
+            INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len ! Array to store
                                                               ! the lenght of each
                                                               ! element
             INTEGER, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf   ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
                                                 ! -1 if failed, 0 otherwise
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
             INTEGER(HID_T) :: tmp
             INTEGER :: error
 
             INTERFACE
               INTEGER FUNCTION h5dread_vl_integer_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims, len)
               USE H5GLOBAL
@@ -5072,25 +5072,25 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len 
+              INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
               INTEGER, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5dread_vl_integer_c
             END INTERFACE
 
-            CALL h5dget_space_f(dset_id, tmp, error) 
+            CALL h5dget_space_f(dset_id, tmp, error)
             xfer_prp_default = H5P_DEFAULT_F
             mem_space_id_default = tmp
             file_space_id_default = tmp
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_vl_integer_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims, len)
-           
+
           END SUBROUTINE h5dread_vl_integer
 
           SUBROUTINE h5dwrite_vl_real(dset_id, mem_type_id, buf, dims, len, &
@@ -5105,26 +5105,26 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! MAX len x num_elem
-            INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len ! Array to store 
+            INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len ! Array to store
                                                               ! the lenght of each
                                                               ! element
             REAL, INTENT(IN), &
             DIMENSION(dims(1),dims(2)) :: buf   ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 
             INTERFACE
               INTEGER FUNCTION h5dwrite_vl_real_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims, len)
               USE H5GLOBAL
@@ -5137,7 +5137,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len 
+              INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: len
               REAL, INTENT(IN), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5dwrite_vl_real_c
@@ -5148,14 +5148,14 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dwrite_vl_real_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims, len)
-           
+
           END SUBROUTINE h5dwrite_vl_real
 
           SUBROUTINE h5dread_vl_real(dset_id, mem_type_id, buf, dims, len, &
@@ -5170,29 +5170,29 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! MAX len x num_elem
-            INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len ! Array to store 
+            INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len ! Array to store
                                                               ! the lenght of each
                                                               ! element
             REAL, INTENT(INOUT), &
             DIMENSION(dims(1),dims(2)) :: buf   ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
                                                 ! -1 if failed, 0 otherwise
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
             INTEGER(HID_T) :: tmp
             INTEGER :: error
 
             INTERFACE
               INTEGER FUNCTION h5dread_vl_real_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
                                           xfer_prp_default, buf, dims, len)
               USE H5GLOBAL
@@ -5205,25 +5205,25 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(*) :: dims
-              INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len 
+              INTEGER(SIZE_T), INTENT(INOUT), DIMENSION(*) :: len
               REAL, INTENT(INOUT), &
               DIMENSION(dims(1),dims(2)) :: buf
               END FUNCTION h5dread_vl_real_c
             END INTERFACE
 
-            CALL h5dget_space_f(dset_id, tmp, error) 
+            CALL h5dget_space_f(dset_id, tmp, error)
             xfer_prp_default = H5P_DEFAULT_F
             mem_space_id_default = tmp
             file_space_id_default = tmp
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 
             hdferr = h5dread_vl_real_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims, len)
-           
+
           END SUBROUTINE h5dread_vl_real
 
           SUBROUTINE h5dwrite_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
@@ -5238,27 +5238,27 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! number of strings
-            INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len ! Array to store 
+            INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len ! Array to store
                                                               ! the lenght of each
                                                               ! element
             CHARACTER(LEN=*), INTENT(IN), &
             DIMENSION(dims(2)) :: buf           ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                                ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                                ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 !            CHARACTER, DIMENSION(dims(1)*dims(2)) :: tmp_buf
 
             INTERFACE
               INTEGER FUNCTION h5dwrite_vl_string_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
 !                                          xfer_prp_default, tmp_buf, dims, str_len)
                                           xfer_prp_default, buf, dims, str_len)
@@ -5273,7 +5273,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
-              INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len 
+              INTEGER(SIZE_T), INTENT(IN), DIMENSION(*) :: str_len
 !              CHARACTER, INTENT(IN), &
 !              DIMENSION(dims(1)*dims(2)) :: tmp_buf
               CHARACTER(LEN=*), DIMENSION(dims(2)) :: buf
@@ -5285,21 +5285,21 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 !            do i = 1, dims(2)
 !               do j = 1, dims(1)
 !               tmp_buf((i-1)*dims(1) +j) = buf(i)(j:j)
 !               enddo
-!            enddo 
+!            enddo
 !              write(*,*) (tmp_buf(j:j), j=1,dims(1)*dims(2))
 !              write(*,*) str_len(1), str_len(2), str_len(3), str_len(4)
 
             hdferr = h5dwrite_vl_string_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims, str_len)
-           
+
           END SUBROUTINE h5dwrite_vl_string
 
           SUBROUTINE h5dread_vl_string(dset_id, mem_type_id, buf, dims, str_len, &
@@ -5314,28 +5314,28 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
             INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
             INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims ! number of strings
-            INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len ! Array to store 
+            INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len ! Array to store
                                                               ! the lenght of each
                                                               ! element
             CHARACTER(LEN=*), INTENT(OUT), &
             DIMENSION(dims(2)) :: buf           ! Data buffer
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id 
-                                               ! Memory dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id 
-                                                ! File dataspace identfier 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp 
-                                                ! Transfer property list identifier 
-            
-            INTEGER(HID_T) :: xfer_prp_default 
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id
+                                               ! Memory dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: file_space_id
+                                                ! File dataspace identfier
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: xfer_prp
+                                                ! Transfer property list identifier
+
+            INTEGER(HID_T) :: xfer_prp_default
             INTEGER(HID_T)  :: mem_space_id_default
-            INTEGER(HID_T) :: file_space_id_default 
+            INTEGER(HID_T) :: file_space_id_default
 !            CHARACTER, DIMENSION(dims(1)*dims(2)) :: tmp_buf
 !            integer i, j
 
             INTERFACE
               INTEGER FUNCTION h5dread_vl_string_c(dset_id, mem_type_id, &
-                                          mem_space_id_default, & 
+                                          mem_space_id_default, &
                                           file_space_id_default, &
 !                                          xfer_prp_default, tmp_buf, dims, str_len)
                                           xfer_prp_default, buf, dims, str_len)
@@ -5350,7 +5350,7 @@ CONTAINS
               INTEGER(HID_T) :: file_space_id_default
               INTEGER(HID_T) :: xfer_prp_default
               INTEGER(HSIZE_T), INTENT(IN), DIMENSION(2) :: dims
-              INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len 
+              INTEGER(SIZE_T), INTENT(OUT), DIMENSION(*) :: str_len
 !              CHARACTER, INTENT(IN), &
 !              DIMENSION(dims(1)*dims(2)) :: tmp_buf
               CHARACTER(LEN=*), DIMENSION(dims(2)) :: buf
@@ -5362,41 +5362,41 @@ CONTAINS
             mem_space_id_default = H5S_ALL_F
             file_space_id_default = H5S_ALL_F
 
-            if (present(xfer_prp)) xfer_prp_default = xfer_prp 
-            if (present(mem_space_id))  mem_space_id_default = mem_space_id 
-            if (present(file_space_id)) file_space_id_default = file_space_id 
+            if (present(xfer_prp)) xfer_prp_default = xfer_prp
+            if (present(mem_space_id))  mem_space_id_default = mem_space_id
+            if (present(file_space_id)) file_space_id_default = file_space_id
 !            do i = 1, dims(2)
 !               do j = 1, dims(1)
 !               tmp_buf((i-1)*dims(1) +j) = buf(i)(j:j)
 !               enddo
-!            enddo 
+!            enddo
 !              write(*,*) (tmp_buf(j:j), j=1,dims(1)*dims(2))
 !              write(*,*) str_len(1), str_len(2), str_len(3), str_len(4)
 
             hdferr = h5dread_vl_string_c(dset_id, mem_type_id, mem_space_id_default, &
                                 file_space_id_default, xfer_prp_default, &
                                 buf, dims, str_len)
-          RETURN 
+          RETURN
           END SUBROUTINE h5dread_vl_string
 
 !----------------------------------------------------------------------
 ! Name:		h5dfill_integer
 !
-! Purpose:      Fills dataspace elements with a fill value in a memory buffer.	
-!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes 
+! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
+!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
 !               of the fillvalues and buffers are supported. Buffer and fillvalue
 !               are assumed to have the same datatype.
 !               Only one-dimesional buffers are supported.
 !
-! Inputs:  
+! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
 !		buf		- data buffer iin memory ro apply selection to
 !				- of k-th dimension of the buf array
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
@@ -5413,11 +5413,11 @@ CONTAINS
             INTEGER, INTENT(IN) :: fill_value  ! Fill value
             INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
             INTEGER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
             INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
-            
+            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
 !            INTEGER, EXTERNAL :: h5dfill_integer_c
 ! MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -5426,19 +5426,19 @@ CONTAINS
                                          buf, mem_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_INTEGER_C'::h5dfill_integer_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_INTEGER_C'::h5dfill_integer_c
               !DEC$ ENDIF
               INTEGER, INTENT(IN) :: fill_value  ! Fill value
               INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
               INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
               INTEGER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
+              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
               END FUNCTION h5dfill_integer_c
-            END INTERFACE 
+            END INTERFACE
             fill_type_id = H5T_NATIVE_INTEGER
             mem_type_id  = H5T_NATIVE_INTEGER
 
-            hdferr = h5dfill_integer_c(fill_value, fill_type_id, space_id, & 
+            hdferr = h5dfill_integer_c(fill_value, fill_type_id, space_id, &
                                buf, mem_type_id)
 
           END SUBROUTINE h5dfill_integer
@@ -5446,21 +5446,21 @@ CONTAINS
 !----------------------------------------------------------------------
 ! Name:		h5dfill_real
 !
-! Purpose:      Fills dataspace elements with a fill value in a memory buffer.	
-!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes 
+! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
+!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
 !               of the fillvalues and buffers are supported. Buffer and fillvalue
 !               are assumed to have the same datatype.
 !               Only one-dimesional buffers are supported.
 !
-! Inputs:  
+! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
 !		buf		- data buffer iin memory ro apply selection to
 !				- of k-th dimension of the buf array
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
@@ -5477,11 +5477,11 @@ CONTAINS
             REAL, INTENT(IN) :: fill_valuer  ! Fill value
             INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
             REAL, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
             INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
-            
+            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
 !            INTEGER, EXTERNAL :: h5dfill_real_c
 ! MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -5490,40 +5490,40 @@ CONTAINS
                                          buf, mem_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_REAL_C'::h5dfill_real_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_REAL_C'::h5dfill_real_c
               !DEC$ ENDIF
               REAL, INTENT(IN) :: fill_valuer  ! Fill value
               INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
               INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
               REAL, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
+              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
               END FUNCTION h5dfill_real_c
-            END INTERFACE 
+            END INTERFACE
             fill_type_id = H5T_NATIVE_REAL
             mem_type_id  = H5T_NATIVE_REAL
 
-            hdferr = h5dfill_real_c(fill_valuer, fill_type_id, space_id, & 
+            hdferr = h5dfill_real_c(fill_valuer, fill_type_id, space_id, &
                                buf, mem_type_id)
           END SUBROUTINE h5dfill_real
 
 !----------------------------------------------------------------------
 ! Name:		h5dfill_double
 !
-! Purpose:      Fills dataspace elements with a fill value in a memory buffer.	
-!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes 
+! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
+!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
 !               of the fillvalues and buffers are supported. Buffer and fillvalue
 !               are assumed to have the same datatype.
 !               Only one-dimesional buffers are supported.
 !
-! Inputs:  
+! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
 !		buf		- data buffer iin memory ro apply selection to
 !				- of k-th dimension of the buf array
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
@@ -5540,11 +5540,11 @@ CONTAINS
             DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
             INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
             DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
             INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
-            
+            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
 !            INTEGER, EXTERNAL :: h5dfill_double_c
 ! MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -5553,19 +5553,19 @@ CONTAINS
                                          buf, mem_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_DOUBLE_C'::h5dfill_double_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILL_DOUBLE_C'::h5dfill_double_c
               !DEC$ ENDIF
               DOUBLE PRECISION, INTENT(IN) :: fill_value  ! Fill value
               INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
               INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
               DOUBLE PRECISION, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
+              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
               END FUNCTION h5dfill_double_c
-            END INTERFACE 
+            END INTERFACE
             fill_type_id = H5T_NATIVE_DOUBLE
             mem_type_id  = H5T_NATIVE_DOUBLE
 
-            hdferr = h5dfill_double_c(fill_value, fill_type_id, space_id, & 
+            hdferr = h5dfill_double_c(fill_value, fill_type_id, space_id, &
                                buf, mem_type_id)
 
 
@@ -5574,21 +5574,21 @@ CONTAINS
 !----------------------------------------------------------------------
 ! Name:		h5dfill_char
 !
-! Purpose:      Fills dataspace elements with a fill value in a memory buffer.	
-!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes 
+! Purpose:      Fills dataspace elements with a fill value in a memory buffer.
+!               Only INTEGER, CHARACTER, REAL and DOUBLE PRECISION datatypes
 !               of the fillvalues and buffers are supported. Buffer and fillvalue
 !               are assumed to have the same datatype.
 !               Only one-dimesional buffers are supported.
 !
-! Inputs:  
+! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
 !		buf		- data buffer iin memory ro apply selection to
 !				- of k-th dimension of the buf array
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
@@ -5605,11 +5605,11 @@ CONTAINS
             CHARACTER, INTENT(IN) :: fill_value  ! Fill value
             INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
             CHARACTER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
-            
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
+
             INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
-            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
-            
+            INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
+
 !            INTEGER, EXTERNAL :: h5dfillc_c
 ! MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -5618,19 +5618,19 @@ CONTAINS
                                          buf, mem_type_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILLC_C'::h5dfillc_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DFILLC_C'::h5dfillc_c
               !DEC$ ENDIF
               CHARACTER, INTENT(IN) :: fill_value  ! Fill value
               INTEGER(HID_T) :: fill_type_id ! Fill value datatype identifier
               INTEGER(HID_T), INTENT(IN) :: space_id ! Memory dataspace selection identifier
               CHARACTER, INTENT(IN), DIMENSION(*) :: buf ! Memory buffer to fill in
-              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier 
+              INTEGER(HID_T) :: mem_type_id !  Buffer dadtype identifier
               END FUNCTION h5dfillc_c
-            END INTERFACE 
+            END INTERFACE
             fill_type_id = H5T_NATIVE_CHARACTER
             mem_type_id  = H5T_NATIVE_CHARACTER
 
-            hdferr = h5dfillc_c(fill_value, fill_type_id, space_id, & 
+            hdferr = h5dfillc_c(fill_value, fill_type_id, space_id, &
                                buf, mem_type_id)
 
           END SUBROUTINE h5dfill_char
@@ -5638,19 +5638,19 @@ CONTAINS
 !----------------------------------------------------------------------
 ! Name:		h5dget_space_status_f
 !
-! Purpose:      Returns the status of data space allocation. 
+! Purpose:      Returns the status of data space allocation.
 !
-! Inputs:  
+! Inputs:
 !		dset_id		- dataset identifier
-! Outputs:  
+! Outputs:
 !               flag            - status; may have one of the following values:
 !				  H5D_SPACE_STS_ERROR_F
 !				  H5D_SPACE_STS_NOT_ALLOCATED_F
 !				  H5D_SPACE_STS_PART_ALLOCATED_F
 !				  H5D_SPACE_STS_ALLOCATED_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
@@ -5666,8 +5666,8 @@ CONTAINS
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dset_id  ! Dataspace identifier
             INTEGER, INTENT(IN)        :: flag     ! Memory buffer to fill in
-            INTEGER, INTENT(OUT)       :: hdferr   ! Error code 
-            
+            INTEGER, INTENT(OUT)       :: hdferr   ! Error code
+
 !            INTEGER, EXTERNAL :: h5dget_space_status_c
 ! MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -5675,30 +5675,30 @@ CONTAINS
               INTEGER FUNCTION h5dget_space_status_c(dset_id, flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DGET_SPACE_STATUS_C'::h5dget_space_status_c  
+              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DGET_SPACE_STATUS_C'::h5dget_space_status_c
               !DEC$ ENDIF
               INTEGER(HID_T) :: dset_id
               INTEGER        :: flag
               END FUNCTION h5dget_space_status_c
-            END INTERFACE 
+            END INTERFACE
 
             hdferr = h5dget_space_status_c(dset_id, flag)
           END SUBROUTINE h5dget_space_status_f
 
 !----------------------------------------------------------------------
-! Name:		h5dcreate_anon_f 
+! Name:		h5dcreate_anon_f
 !
-! Purpose: 	Creates a dataset in a file without linking it into the file structure 
+! Purpose: 	Creates a dataset in a file without linking it into the file structure
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- Identifier of the file or group within which to create the dataset.
 !		type_id		- Identifier of the datatype to use when creating the dataset.
 !		space_id	- Identifier of the dataspace to use when creating the dataset.
-! Outputs:  
+! Outputs:
 !		dset_id		- dataset identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !               dcpl_id         - Dataset creation property list identifier.
 !               dapl_id  	- Dataset access property list identifier.
@@ -5708,9 +5708,9 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  
+
   SUBROUTINE h5dcreate_anon_f(loc_id, type_id, space_id, dset_id, hdferr, dcpl_id, dapl_id)
 
 !This definition is needed for Windows DLLs
@@ -5718,10 +5718,10 @@ CONTAINS
 !DEC$attributes dllexport :: h5dcreate_anon_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier. 
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier. 
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier.
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier.
     INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier.
-    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier. 
+    INTEGER(HID_T), INTENT(OUT) :: dset_id ! Dataset identifier.
     INTEGER, INTENT(OUT) :: hdferr         ! Error code.
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dcpl_id  ! Dataset creation property list identifier.
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: dapl_id  ! Dataset access property list identifier.
@@ -5738,7 +5738,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5DCREATE_ANON_C'::h5dcreate_anon_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id 
+         INTEGER(HID_T), INTENT(IN) :: loc_id
          INTEGER(HID_T), INTENT(IN) :: type_id
          INTEGER(HID_T), INTENT(IN) :: space_id
          INTEGER(HID_T) :: dcpl_id_default
@@ -5752,7 +5752,7 @@ CONTAINS
 
     IF(PRESENT(dcpl_id)) dcpl_id_default = dcpl_id
     IF(PRESENT(dapl_id)) dapl_id_default = dapl_id
-    
+
     hdferr = h5dcreate_anon_c(loc_id, type_id, space_id, dcpl_id_default, dapl_id_default, dset_id)
 
   END SUBROUTINE h5dcreate_anon_f
diff --git a/fortran/src/H5Eff.f90 b/fortran/src/H5Eff.f90
index 74ee739..076996f 100644
--- a/fortran/src/H5Eff.f90
+++ b/fortran/src/H5Eff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5E functions
@@ -19,35 +19,35 @@
       MODULE H5E
 
         USE H5GLOBAL
-      
+
       CONTAINS
 
 !----------------------------------------------------------------------
 ! Name:		h5eclear_f
 !
-! Purpose:	Clears the error stack for the current thread. 
+! Purpose:	Clears the error stack for the current thread.
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!		
-!	
+!
+!
 !
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  April 6, 2001 
+!			port).  April 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5eclear_f(hdferr) 
+          SUBROUTINE h5eclear_f(hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -74,25 +74,25 @@
 !----------------------------------------------------------------------
 ! Name:		h5h5eprint_f
 !
-! Purpose:	Prints the error stack in a default manner. 
+! Purpose:	Prints the error stack in a default manner.
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		name		- name of the file that
-!				  contains print output		
+!				  contains print output
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  April 6, 2001 
+!			port).  April 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5eprint_f(hdferr, name)
@@ -104,7 +104,7 @@
 !
             CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: name ! File name
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
-!            INTEGER, EXTERNAL :: h5eprint_c1, h5eprint_c2 
+!            INTEGER, EXTERNAL :: h5eprint_c1, h5eprint_c2
             INTEGER :: namelen
 
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -132,36 +132,36 @@
             END INTERFACE
             namelen = LEN(NAME)
             if (present(name)) then
-               hdferr = h5eprint_c1(name, namelen) 
+               hdferr = h5eprint_c1(name, namelen)
             else
-            hdferr = h5eprint_c2() 
+            hdferr = h5eprint_c2()
             endif
           END SUBROUTINE h5eprint_f
 
 !----------------------------------------------------------------------
 ! Name:		h5eget_major_f
 !
-! Purpose:	Returns a character string describing an error specified 
-!		by a major error number. 
+! Purpose:	Returns a character string describing an error specified
+!		by a major error number.
 !
-! Inputs:  
-!		error_no	- mojor error number 
-! Outputs:  
+! Inputs:
+!		error_no	- mojor error number
+! Outputs:
 !		name		- character string describing the error
 !		namelen		- number of characters in the name buffer
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!		
+!
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  April 6, 2001 
+!			port).  April 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5eget_major_f(error_no, name, namelen, hdferr)
@@ -188,40 +188,40 @@
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER :: error_no
-              CHARACTER(LEN=*) :: name 
+              CHARACTER(LEN=*) :: name
               INTEGER(SIZE_T), INTENT(IN) :: namelen
               END FUNCTION h5eget_major_c
             END INTERFACE
 
-            hdferr = h5eget_major_c(error_no, name, namelen) 
+            hdferr = h5eget_major_c(error_no, name, namelen)
           END SUBROUTINE h5eget_major_f
 
 !----------------------------------------------------------------------
 ! Name:		h5eget_minor_f
 !
-! Purpose:	Returns a character string describing an error specified 
-!		by a minor error number. 
+! Purpose:	Returns a character string describing an error specified
+!		by a minor error number.
 !
-! Inputs:  
-!		error_no	- minor error number 
-! Outputs:  
+! Inputs:
+!		error_no	- minor error number
+! Outputs:
 !		name		- character string describing the error
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!		
-!	
+!
+!
 !
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  April 6, 2001 
+!			port).  April 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5eget_minor_f(error_no, name, hdferr)
@@ -247,38 +247,38 @@
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER :: error_no
-               CHARACTER(LEN=*) :: name 
+               CHARACTER(LEN=*) :: name
               END FUNCTION h5eget_minor_c
             END INTERFACE
 
-            hdferr = h5eget_minor_c(error_no, name) 
+            hdferr = h5eget_minor_c(error_no, name)
           END SUBROUTINE h5eget_minor_f
 !----------------------------------------------------------------------
 ! Name:		h5eset_auto_f
 !
 ! Purpose:	Turns automatic error printing on or off
 !
-! Inputs:  
+! Inputs:
 !		printflag	- flag to turn automatic error
 !				- Possible values are:
 !				- 1 (on), 0 (off)
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!		
-!	
+!
+!
 !
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  April 6, 2001 
+!			port).  April 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
@@ -309,8 +309,8 @@
               END FUNCTION h5eset_auto_c
             END INTERFACE
 
-            hdferr = h5eset_auto_c(printflag) 
+            hdferr = h5eset_auto_c(printflag)
           END SUBROUTINE h5eset_auto_f
 
       END MODULE H5E
-          
+
diff --git a/fortran/src/H5FDmpioff.f90 b/fortran/src/H5FDmpioff.f90
index f98f654..787f0d5 100644
--- a/fortran/src/H5FDmpioff.f90
+++ b/fortran/src/H5FDmpioff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5P functions needed by || MPI programs.
@@ -21,19 +21,19 @@
          CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_mpio_f 
+! Name:		h5pset_fapl_mpio_f
 !
-! Purpose: 	Stores MPI IO communicator information to the file 
-!		access property list. 
+! Purpose: 	Stores MPI IO communicator information to the file
+!		access property list.
 !
-! Inputs:  	
+! Inputs:
 !		prp_id		- file access property list identifier
 !		comm		- MPI-2 communicator
 !		info		- MPI-2 info object
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -42,9 +42,9 @@
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-         SUBROUTINE h5pset_fapl_mpio_f(prp_id, comm, info, hdferr) 
+         SUBROUTINE h5pset_fapl_mpio_f(prp_id, comm, info, hdferr)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: comm ! MPI communicator to be used for file open
@@ -58,34 +58,34 @@
           END SUBROUTINE h5pset_fapl_mpio_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_fapl_mpio_f 
+! Name:		h5pget_fapl_mpio_f
 !
-! Purpose: 	Returns MPI communicator information. 	
+! Purpose: 	Returns MPI communicator information.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
+! Outputs:
 !		comm		- MPI-2 communicator
 !		info		- MPI-2 info object
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		November, 2000
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_fapl_mpio_f(prp_id, comm, info, hdferr) 
+          SUBROUTINE h5pget_fapl_mpio_f(prp_id, comm, info, hdferr)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-            INTEGER, INTENT(OUT) :: comm ! buffer to return communicator 
-            INTEGER, INTENT(OUT) :: info ! buffer to return info object 
+            INTEGER, INTENT(OUT) :: comm ! buffer to return communicator
+            INTEGER, INTENT(OUT) :: info ! buffer to return info object
                                         ! as defined in MPI_FILE_OPEN of MPI-2
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -94,32 +94,32 @@
           END SUBROUTINE h5pget_fapl_mpio_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_dxpl_mpio_f 
+! Name:		h5pset_dxpl_mpio_f
 !
-! Purpose: 	Sets data transfer mode. 
+! Purpose: 	Sets data transfer mode.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- data transfer property list identifier
 !		data_xfer_mode	- transfer mode
 !				  Possible values are:
 !				  H5FD_MPIO_INDEPENDENT_F
 !				  H5FD_MPIO_COLLECTIVE_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		November, 2000
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-         SUBROUTINE h5pset_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr) 
+         SUBROUTINE h5pset_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: data_xfer_mode ! Data transfer mode. Possible values are:
@@ -127,37 +127,37 @@
                                                   ! H5FD_MPIO_COLLECTIVE_F
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
-            INTEGER, EXTERNAL :: h5pset_dxpl_mpio_c 
+            INTEGER, EXTERNAL :: h5pset_dxpl_mpio_c
             hdferr = h5pset_dxpl_mpio_c(prp_id, data_xfer_mode)
           END SUBROUTINE h5pset_dxpl_mpio_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_dxpl_mpio_f 
+! Name:		h5pget_dxpl_mpio_f
 !
-! Purpose: 	Returns the data transfer mode. 
+! Purpose: 	Returns the data transfer mode.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- data transfer property list identifier
-! Outputs:  
+! Outputs:
 !		data_xfer_mode	- transfer mode
 !				  Possible values are:
 !				  H5FD_MPIO_INDEPENDENT_F
 !				  H5FD_MPIO_COLLECTIVE_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		November, 2000
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-         SUBROUTINE h5pget_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr) 
+         SUBROUTINE h5pget_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: data_xfer_mode ! Data transfer mode. Possible values are:
@@ -171,19 +171,19 @@
 
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_mpiposix_f 
+! Name:		h5pset_fapl_mpiposix_f
 !
-! Purpose: 	Stores MPI IO communicator information to the file 
-!		access property list. 
+! Purpose: 	Stores MPI IO communicator information to the file
+!		access property list.
 !
-! Inputs:  	
+! Inputs:
 !		prp_id		- file access property list identifier
 !		comm		- MPI-2 communicator
 !		use_gpfs	- logical flag to use the GPFS hints
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -192,9 +192,9 @@
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-         SUBROUTINE h5pset_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr) 
+         SUBROUTINE h5pset_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: comm ! MPI communicator to be used for file open
@@ -205,38 +205,38 @@
 
             INTEGER, EXTERNAL :: h5pset_fapl_mpiposix_c
             flag = 0
-            if(use_gpfs) flag = 1 
+            if(use_gpfs) flag = 1
             hdferr = h5pset_fapl_mpiposix_c(prp_id, comm, flag)
           END SUBROUTINE h5pset_fapl_mpiposix_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_fapl_mpiposix_f 
+! Name:		h5pget_fapl_mpiposix_f
 !
-! Purpose: 	Returns MPI communicator information. 	
+! Purpose: 	Returns MPI communicator information.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
+! Outputs:
 !		comm		- MPI-2 communicator
 !		use_gpfs        - flag to use GPFS hints
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		May 6, 2003
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr) 
+          SUBROUTINE h5pget_fapl_mpiposix_f(prp_id, comm, use_gpfs, hdferr)
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
-            INTEGER, INTENT(OUT) :: comm ! buffer to return communicator 
+            INTEGER, INTENT(OUT) :: comm ! buffer to return communicator
             LOGICAL, INTENT(OUT) :: use_gpfs
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: flag
diff --git a/fortran/src/H5Fff.f90 b/fortran/src/H5Fff.f90
index 6cf6c05..e1ff3fd 100644
--- a/fortran/src/H5Fff.f90
+++ b/fortran/src/H5Fff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,43 +11,43 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5F functions.
-! 
+!
       MODULE H5F
       USE H5GLOBAL
- 
+
         CONTAINS
-          
+
 !----------------------------------------------------------------------
-! Name:		h5fcreate_f 
+! Name:		h5fcreate_f
 !
-! Purpose:	Creates HDF5 files. 
+! Purpose:	Creates HDF5 files.
 !
-! Inputs:  
+! Inputs:
 !		name		- name of the file to create
-!		access_flags	- File access flags. Allowable values are: 
-!				  H5F_ACC_TRUNC_F 
-!				  H5F_ACC_EXCL_F 
-! Outputs:  
+!		access_flags	- File access flags. Allowable values are:
+!				  H5F_ACC_TRUNC_F
+!				  H5F_ACC_EXCL_F
+! Outputs:
 !		file_id		- file identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		creation_prp	- file creation property list identifier
 !		access_prp	- file access property list identifier
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
           SUBROUTINE h5fcreate_f(name, access_flags, file_id, hdferr, &
                                  creation_prp, access_prp)
@@ -57,19 +57,19 @@
 !DEC$attributes dllexport :: h5fcreate_f
 !DEC$endif
 !
-           
-            IMPLICIT NONE 
+
+            IMPLICIT NONE
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
             INTEGER, INTENT(IN) :: access_flags    ! File access flags
-            INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp 
+            INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
+            INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp
                                                    ! File creation propertly
-                                                   ! list identifier 
+                                                   ! list identifier
             INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
                                                    ! File access property list
                                                    ! identifier
-            INTEGER(HID_T) :: creation_prp_default 
+            INTEGER(HID_T) :: creation_prp_default
             INTEGER(HID_T) :: access_prp_default
             INTEGER :: namelen ! Length of the name character string
 
@@ -83,7 +83,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5FCREATE_C':: h5fcreate_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
+              !DEC$ATTRIBUTES reference :: name
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN) :: access_flags
               INTEGER(HID_T), INTENT(OUT) :: file_id
@@ -92,46 +92,46 @@
               INTEGER :: namelen
               END FUNCTION h5fcreate_c
             END INTERFACE
-  
+
             creation_prp_default = H5P_DEFAULT_F
             access_prp_default = H5P_DEFAULT_F
 
-            if (present(creation_prp)) creation_prp_default = creation_prp 
-            if (present(access_prp))   access_prp_default   = access_prp 
+            if (present(creation_prp)) creation_prp_default = creation_prp
+            if (present(access_prp))   access_prp_default   = access_prp
             namelen = LEN(name)
             hdferr = h5fcreate_c(name, namelen, access_flags, &
-                     creation_prp_default, access_prp_default, file_id) 
+                     creation_prp_default, access_prp_default, file_id)
 
           END SUBROUTINE h5fcreate_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5fflush_f 
+! Name:		h5fflush_f
 !
-! Purpose:	Flushes all buffers associated with a file to disk	
+! Purpose:	Flushes all buffers associated with a file to disk
 !
-! Inputs:  
-!		object_id	- identifier of object used to identify 
-!				  the file. 
-!		scope		- specifies the scope of the flushing action. 
+! Inputs:
+!		object_id	- identifier of object used to identify
+!				  the file.
+!		scope		- specifies the scope of the flushing action.
 !				  Possible values are:
 !				  H5F_SCOPE_GLOBAL_F
 !				  H5F_SCOPE_LOCAL_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		creation_prp	- file creation property list identifier
 !		access_prp	- file access property list identifier
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
           SUBROUTINE h5fflush_f(object_id, scope, hdferr)
 !
@@ -140,25 +140,25 @@
 !DEC$attributes dllexport :: h5fflush_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: object_id !identifier for any object
-                                                    !associate with a file, 
+                                                    !associate with a file,
                                                     !including the file itself,
                                                     !a dataset, a group, an
                                                     !attribute, or a named
                                                     !data type
 
             INTEGER, INTENT(IN) :: scope            !scope of the flushing
-                                                    !action, possible values 
+                                                    !action, possible values
                                                     !are: H5F_SCOPE_GLOBAL_F
                                                     ! which flushes the entire
-                                                    !virtual file, 
+                                                    !virtual file,
                                                     !and H5F_SCOPE_LOCAL_F
-                                                    !which flushes only the 
+                                                    !which flushes only the
                                                     !specified file.
 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5fflush_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -174,38 +174,38 @@
               END FUNCTION h5fflush_c
             END INTERFACE
 
-           hdferr = h5fflush_c(object_id, scope) 
+           hdferr = h5fflush_c(object_id, scope)
 
           END SUBROUTINE h5fflush_f
 
 !----------------------------------------------------------------------
-! Name:		h5fmount_f 
+! Name:		h5fmount_f
 !
-! Purpose:	Mounts a file. 	
+! Purpose:	Mounts a file.
 !
-! Inputs:  
-!		loc_id		- the identifier for of file or group in 
+! Inputs:
+!		loc_id		- the identifier for of file or group in
 !				  which name is defined
-!		name		- the name of the group onto which the file 
-!				  specified by child_id is to be mounted. 
-!		child_id	- the identifier of the file to be mounted. 
-! Outputs:  
-!		hdferr:		- error code		
+!		name		- the name of the group onto which the file
+!				  specified by child_id is to be mounted.
+!		child_id	- the identifier of the file to be mounted.
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		access_prp	- the identifier of the property list to be used
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
- 
+
           SUBROUTINE h5fmount_f(loc_id, name, child_id, hdferr, access_prp)
 !
 !This definition is needed for Windows DLLs
@@ -213,20 +213,20 @@
 !DEC$attributes dllexport :: h5fmount_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for file or group 
-                                                   ! in which dsetname is defined 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for file or group
+                                                   ! in which dsetname is defined
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of the group
             INTEGER(HID_T), INTENT(IN) :: child_id ! File identifier for the
-                                                   ! file to be mounted 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+                                                   ! file to be mounted
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
             INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
                                                    ! File access property list
                                                    ! identifier
-            INTEGER(HID_T) :: access_prp_default 
+            INTEGER(HID_T) :: access_prp_default
             INTEGER :: namelen ! Length of the name character string
-  
+
 !            INTEGER, EXTERNAL :: h5fmount_c
 !  Interface is needed for MS FORTRAN
 !
@@ -237,47 +237,47 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5FMOUNT_C':: h5fmount_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
-              INTEGER(HID_T), INTENT(IN) :: loc_id 
-              CHARACTER(LEN=*), INTENT(IN) :: name 
-              INTEGER(HID_T), INTENT(IN) :: child_id 
+              !DEC$ATTRIBUTES reference :: name
+              INTEGER(HID_T), INTENT(IN) :: loc_id
+              CHARACTER(LEN=*), INTENT(IN) :: name
+              INTEGER(HID_T), INTENT(IN) :: child_id
               INTEGER(HID_T), INTENT(IN) :: access_prp_default
-              INTEGER :: namelen 
+              INTEGER :: namelen
               END FUNCTION h5fmount_c
             END INTERFACE
 
             access_prp_default = H5P_DEFAULT_F
-            if (present(access_prp))   access_prp_default   = access_prp 
+            if (present(access_prp))   access_prp_default   = access_prp
             namelen = LEN(name)
-            hdferr = h5fmount_c(loc_id, name, namelen, child_id, access_prp_default) 
-                      
+            hdferr = h5fmount_c(loc_id, name, namelen, child_id, access_prp_default)
+
           END SUBROUTINE h5fmount_f
 
 
 !----------------------------------------------------------------------
-! Name:		h5funmount_f 
+! Name:		h5funmount_f
 !
-! Purpose:	Unmounts a file. 	
+! Purpose:	Unmounts a file.
 !
-! Inputs:  
-!		loc_id		- the identifier for of file or group in 
+! Inputs:
+!		loc_id		- the identifier for of file or group in
 !				  which name is defined
 !		name		- the name of the mount point
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5funmount_f(loc_id, name, hdferr)
@@ -287,15 +287,15 @@
 !DEC$attributes dllexport :: h5funmount_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for file or group 
-                                                   ! at which the specified file 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for file or group
+                                                   ! at which the specified file
                                                    ! is to be unmounted
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the mount point
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
             INTEGER :: namelen ! Length of the name character string
-  
+
 !            INTEGER, EXTERNAL :: h5fumount_c
 !  Interface is needed for MS FORTRAN
 !
@@ -305,44 +305,44 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5FUNMOUNT_C':: h5funmount_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
-              INTEGER(HID_T), INTENT(IN) :: loc_id 
-              CHARACTER(LEN=*), INTENT(IN) :: name 
-              INTEGER :: namelen 
+              !DEC$ATTRIBUTES reference :: name
+              INTEGER(HID_T), INTENT(IN) :: loc_id
+              CHARACTER(LEN=*), INTENT(IN) :: name
+              INTEGER :: namelen
               END FUNCTION h5funmount_c
             END INTERFACE
-  
+
             namelen = LEN(name)
-            hdferr = h5funmount_c(loc_id, name, namelen) 
-    
+            hdferr = h5funmount_c(loc_id, name, namelen)
+
           END SUBROUTINE h5funmount_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5fopen_f 
+! Name:		h5fopen_f
 !
-! Purpose:	Opens HDF5 file. 
+! Purpose:	Opens HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !		name		- name of the file to acecss
-!		access_flags	- File access flags. Allowable values are: 
-!				  H5F_ACC_RDWR_F 
-!				  H5F_ACC_RDONLY_F 
-! Outputs:  
+!		access_flags	- File access flags. Allowable values are:
+!				  H5F_ACC_RDWR_F
+!				  H5F_ACC_RDONLY_F
+! Outputs:
 !		file_id		- file identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		access_prp	- file access property list identifier
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
           SUBROUTINE h5fopen_f(name, access_flags, file_id, hdferr, &
                                access_prp)
@@ -352,16 +352,16 @@
 !DEC$attributes dllexport :: h5fopen_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
             INTEGER, INTENT(IN) :: access_flags    ! File access flags
-            INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
             INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
                                                    ! File access property list
                                                    ! identifier
-            INTEGER(HID_T) :: access_prp_default 
+            INTEGER(HID_T) :: access_prp_default
             INTEGER :: namelen ! Length of the name character string
 
 !            INTEGER, EXTERNAL :: h5fopen_c
@@ -382,39 +382,39 @@
               INTEGER(HID_T), INTENT(OUT) :: file_id
               END FUNCTION h5fopen_c
             END INTERFACE
-  
+
             access_prp_default = H5P_DEFAULT_F
-            if (present(access_prp))   access_prp_default   = access_prp 
+            if (present(access_prp))   access_prp_default   = access_prp
             namelen = LEN(name)
             hdferr = h5fopen_c(name, namelen, access_flags, &
-                               access_prp_default, file_id) 
+                               access_prp_default, file_id)
 
           END SUBROUTINE h5fopen_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5freopen_f 
+! Name:		h5freopen_f
 !
-! Purpose:	Reopens HDF5 file. 
+! Purpose:	Reopens HDF5 file.
 !
-! Inputs:  
-!		file_id		- identifier of a file for which an 
+! Inputs:
+!		file_id		- identifier of a file for which an
 !				  additional identifier is required
-! Outputs:  
+! Outputs:
 !		ret_file_id	- new file identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5freopen_f(file_id, ret_file_id, hdferr)
@@ -424,11 +424,11 @@
 !DEC$attributes dllexport :: h5freopen_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier 
-            INTEGER(HID_T), INTENT(OUT) :: ret_file_id ! New File identifier 
-            INTEGER, INTENT(OUT) :: hdferr             ! Error code 
+            INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier
+            INTEGER(HID_T), INTENT(OUT) :: ret_file_id ! New File identifier
+            INTEGER, INTENT(OUT) :: hdferr             ! Error code
 
 !            INTEGER, EXTERNAL :: h5freopen_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -444,36 +444,36 @@
               END FUNCTION h5freopen_c
             END INTERFACE
 
-            hdferr = h5freopen_c(file_id, ret_file_id) 
-          
+            hdferr = h5freopen_c(file_id, ret_file_id)
+
           END SUBROUTINE h5freopen_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5fget_create_plist_f
 !
-! Purpose:	Returns a file creation property list identifier.	
+! Purpose:	Returns a file creation property list identifier.
 !
-! Inputs:  
-!		file_id		- identifier of a file to get 
-!				  get creation property list of 
-! Outputs:  
+! Inputs:
+!		file_id		- identifier of a file to get
+!				  get creation property list of
+! Outputs:
 !		prop_id 	- creation property list identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          
+
           SUBROUTINE h5fget_create_plist_f(file_id, prop_id, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -481,12 +481,12 @@
 !DEC$attributes dllexport :: h5fget_create_plist_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: file_id    ! File identifier 
+            INTEGER(HID_T), INTENT(IN) :: file_id    ! File identifier
             INTEGER(HID_T), INTENT(OUT) :: prop_id   ! File creation property
-                                                     ! list identifier 
-            INTEGER, INTENT(OUT) :: hdferr           ! Error code 
+                                                     ! list identifier
+            INTEGER, INTENT(OUT) :: hdferr           ! Error code
 
 !            INTEGER, EXTERNAL :: h5fget_create_plist_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -501,35 +501,35 @@
               INTEGER(HID_T), INTENT(OUT) :: prop_id
               END FUNCTION h5fget_create_plist_c
             END INTERFACE
-  
-            hdferr = h5fget_create_plist_c(file_id, prop_id) 
+
+            hdferr = h5fget_create_plist_c(file_id, prop_id)
 
           END SUBROUTINE h5fget_create_plist_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5fget_access_plist_f
 !
-! Purpose:	Returns a file access property list identifier.	
+! Purpose:	Returns a file access property list identifier.
 !
-! Inputs:  
-!		file_id		- identifier of a file to get 
-!				  get creation property list of 
-! Outputs:  
+! Inputs:
+!		file_id		- identifier of a file to get
+!				  get creation property list of
+! Outputs:
 !		access_id 	- access property list identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5fget_access_plist_f(file_id, access_id, hdferr)
@@ -539,12 +539,12 @@
 !DEC$attributes dllexport :: h5fget_access_plist_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier 
+            INTEGER(HID_T), INTENT(IN) :: file_id      ! File identifier
             INTEGER(HID_T), INTENT(OUT) :: access_id   ! File access property
-                                                       ! list identifier 
-            INTEGER, INTENT(OUT) :: hdferr             ! Error code 
+                                                       ! list identifier
+            INTEGER, INTENT(OUT) :: hdferr             ! Error code
 
 !            INTEGER, EXTERNAL :: h5fget_access_plist_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -559,37 +559,37 @@
               INTEGER(HID_T), INTENT(OUT) :: access_id
               END FUNCTION h5fget_access_plist_c
             END INTERFACE
-  
-  
-            hdferr = h5fget_access_plist_c(file_id, access_id) 
+
+
+            hdferr = h5fget_access_plist_c(file_id, access_id)
 
           END SUBROUTINE h5fget_access_plist_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5fis_hdf5_f
 !
-! Purpose:	Determines whether a file is in the HDF5 format. 
+! Purpose:	Determines whether a file is in the HDF5 format.
 !
-! Inputs:  
+! Inputs:
 !		name		- name of the file to check
-! Outputs:  
+! Outputs:
 !		status		- indicates if file is and HDF5 file
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
- 
+
           SUBROUTINE h5fis_hdf5_f(name, status, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -597,15 +597,15 @@
 !DEC$attributes dllexport :: h5fis_hdf5_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the file
             LOGICAL, INTENT(OUT) :: status         ! Indicates if file
                                                    ! is an HDF5 file
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
             INTEGER :: namelen ! Length of the name character string
             INTEGER :: flag    ! "TRUE/FALSE" flag from C routine
-                               ! to define status value. 
+                               ! to define status value.
 
 !            INTEGER, EXTERNAL :: h5fis_hdf5_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -622,38 +622,38 @@
               INTEGER :: flag
               END FUNCTION h5fis_hdf5_c
             END INTERFACE
-  
+
             namelen = LEN(name)
-            hdferr = h5fis_hdf5_c(name, namelen, flag) 
+            hdferr = h5fis_hdf5_c(name, namelen, flag)
             status = .TRUE.
             if (flag .EQ. 0) status = .FALSE.
 
           END SUBROUTINE h5fis_hdf5_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5fclose_f
 !
 ! Purpose:	Closes HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !		file_id		- file identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          
+
           SUBROUTINE h5fclose_f(file_id, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -688,30 +688,30 @@
 !
 ! Purpose:	Gets number of the objects open within a file
 !
-! Inputs:  
+! Inputs:
 !		file_id		- file identifier
 !               obj_type        - type of the object; possible values are:
-!                                 H5F_OBJ_FILE_F 
-!                                 H5F_OBJ_DATASET_F 
-!                                 H5F_OBJ_GROUP_F 
-!                                 H5F_OBJ_DATATYPE_F 
-!                                 H5F_OBJ_ALL_F 
-! Outputs:  
+!                                 H5F_OBJ_FILE_F
+!                                 H5F_OBJ_DATASET_F
+!                                 H5F_OBJ_GROUP_F
+!                                 H5F_OBJ_DATATYPE_F
+!                                 H5F_OBJ_ALL_F
+! Outputs:
 !               obj_count       - number of open objects
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 30, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          
+
           SUBROUTINE h5fget_obj_count_f(file_id, obj_type, obj_count, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -747,30 +747,30 @@
 !
 ! Purpose:	Get list of open objects identifiers within a file
 !
-! Inputs:  
+! Inputs:
 !		file_id		- file identifier
 !               obj_type        - type of the object; possible values are:
-!                                 H5F_OBJ_FILE_F 
-!                                 H5F_OBJ_DATASET_F 
-!                                 H5F_OBJ_GROUP_F 
-!                                 H5F_OBJ_DATATYPE_F 
-!                                 H5F_OBJ_ALL_F 
-! Outputs:  
+!                                 H5F_OBJ_FILE_F
+!                                 H5F_OBJ_DATASET_F
+!                                 H5F_OBJ_GROUP_F
+!                                 H5F_OBJ_DATATYPE_F
+!                                 H5F_OBJ_ALL_F
+! Outputs:
 !               obj_ids         - array of open object identifiers
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 30, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          
+
           SUBROUTINE h5fget_obj_ids_f(file_id, obj_type, max_objs, obj_ids, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -794,9 +794,9 @@
        !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5FGET_OBJ_IDS_C':: h5fget_obj_ids_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: file_id
-              INTEGER, INTENT(IN)  :: obj_type      
+              INTEGER, INTENT(IN)  :: obj_type
               INTEGER, INTENT(IN)  :: max_objs
-              INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids  
+              INTEGER(HID_T), DIMENSION(*), INTENT(INOUT) :: obj_ids
               END FUNCTION h5fget_obj_ids_c
             END INTERFACE
 
@@ -809,24 +809,24 @@
 !
 ! Purpose:	Get amount of free space within a file
 !
-! Inputs:  
+! Inputs:
 !		file_id		- file identifier
-! Outputs:  
+! Outputs:
 !               free_space      - amount of free space in file
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Quincey Koziol
 !		October 7, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          
+
           SUBROUTINE h5fget_freespace_f(file_id, free_space, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -837,7 +837,7 @@
 
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: file_id ! File identifier
-            INTEGER(HSSIZE_T), INTENT(OUT) :: free_space 
+            INTEGER(HSSIZE_T), INTENT(OUT) :: free_space
                                              !amount of free space in file
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -848,7 +848,7 @@
        !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5FGET_FREESPACE_C':: h5fget_freespace_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: file_id
-              INTEGER(HSSIZE_T), INTENT(OUT) :: free_space 
+              INTEGER(HSSIZE_T), INTENT(OUT) :: free_space
               END FUNCTION h5fget_freespace_c
             END INTERFACE
 
@@ -857,19 +857,19 @@
           END SUBROUTINE h5fget_freespace_f
 
 !----------------------------------------------------------------------
-! Name:		h5fget_name_f 
+! Name:		h5fget_name_f
 !
 ! Purpose: 	Gets the name of the file from the object identifier
 !
-! Inputs:  
+! Inputs:
 !		obj_id		- object identifier
 ! Inputs/Outputs:
 !		buf		- buffer to read name in
-! Outputs:  
+! Outputs:
 !		size		- actual size of the name
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !
 ! Programmer:	Elena Pourmal
@@ -878,14 +878,14 @@
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5fget_name_f(obj_id, buf, size, hdferr) 
+          SUBROUTINE h5fget_name_f(obj_id, buf, size, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5fget_name_f
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id   ! Object identifier 
-            CHARACTER(LEN=*), INTENT(INOUT) :: buf   
+            INTEGER(HID_T), INTENT(IN) :: obj_id   ! Object identifier
+            CHARACTER(LEN=*), INTENT(INOUT) :: buf
                                                    ! Buffer to hold file name
             INTEGER(SIZE_T), INTENT(OUT) :: size   ! Size of the file name
             INTEGER, INTENT(OUT) :: hdferr         ! Error code: 0 on success,
@@ -912,17 +912,17 @@
           END SUBROUTINE h5fget_name_f
 
 !----------------------------------------------------------------------
-! Name:		h5fget_filesize_f 
+! Name:		h5fget_filesize_f
 !
 ! Purpose: 	Retrieves the file size of the HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !		file_id		- file identifier
-! Outputs:  
-!		size		- file size 
-!		hdferr:		- error code		
+! Outputs:
+!		size		- file size
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !
 ! Programmer:	Elena Pourmal
@@ -931,14 +931,14 @@
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5fget_filesize_f(file_id, size, hdferr) 
+          SUBROUTINE h5fget_filesize_f(file_id, size, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5fget_filesize_f
 !DEC$endif
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: file_id  ! file identifier
-            INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Size of the file 
+            INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Size of the file
             INTEGER, INTENT(OUT) :: hdferr         ! Error code: 0 on success,
                                                    ! -1 if fail
 !            INTEGER, EXTERNAL :: h5fget_filesize_c
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 1f3e416..f40b595 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -87,7 +87,7 @@ DONE:
  * Inputs:      loc_id - file or group identifier
  *              name - name of the group
  *              namelen - name length
- *              gapl_id - Group access property list identifier 
+ *              gapl_id - Group access property list identifier
  * Outputs:     grp_id - group identifier
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
@@ -664,8 +664,8 @@ DONE:
 /*----------------------------------------------------------------------------
  * Name:        h5gcreate_anon_c
  * Purpose:     Call H5Gcreate_anon
- * Inputs:      
- *              loc_id  - Location identifier 
+ * Inputs:
+ *              loc_id  - Location identifier
  *              gcpl_id - Group creation property list identifier
  *              gapl_id - Group access property list identifier
  *
@@ -680,7 +680,7 @@ nh5gcreate_anon_c(hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *
 {
 
   int_f ret_value=0;          /* Return value */
-  
+
   if ((*grp_id = (hid_t_f)H5Gcreate_anon((hid_t)*loc_id,(hid_t)*gcpl_id,(hid_t)*gapl_id)) < 0)
     HGOTO_DONE(FAIL);
 
@@ -689,9 +689,9 @@ done:
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5gget_create_plist_c 
+ * Name:        h5gget_create_plist_c
  * Purpose:     Call H5Gget_create_plist
- * Inputs:      
+ * Inputs:
  *              grp_id - group identifier
  *
  * Outputs:     gcpl_id - Group creation property list identifier
@@ -717,7 +717,7 @@ done:
  * Name:      h5gget_info_c
  * Purpose:   Call H5Gget_info
  * Inputs:    group_id - Group identifier
- * Outputs: 
+ * Outputs:
  *            storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
@@ -730,7 +730,7 @@ done:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 15, 2008
- * Modifications:     
+ * Modifications:
  *          - Added 'mounted' paramater
  *            M.S. Breitenfeld
  *            July 16, 2008
@@ -764,7 +764,7 @@ done:
 /*----------------------------------------------------------------------------
  * Name:      h5gget_info_by_idx_c
  * Purpose:   Call H5Gget_info_by_idx
- * Inputs:    
+ * Inputs:
  *          loc_id - File or group identifier
  *      group_name - Name of group containing group for which information is to be retrieved
  *   group_namelen - name length
@@ -772,7 +772,7 @@ done:
  *           order - Order of the count in the index
  *               n - Position in the index of the group for which information is retrieved
  *         lapl_id - Link access property list
- * Outputs: 
+ * Outputs:
  *            storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
@@ -785,14 +785,14 @@ done:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 18, 2008
- * Modifications:      
+ * Modifications:
  *          - Added 'mounted' paramater
  *            M.S. Breitenfeld
  *            July 16, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-		      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, 
+nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+		      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
 		      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
 
 {
@@ -829,12 +829,12 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 /*----------------------------------------------------------------------------
  * Name:      h5gget_info_by_name_c
  * Purpose:   Call H5Gget_info_by_name
- * Inputs:    
+ * Inputs:
  *          loc_id - File or group identifier
  *      group_name - Name of group containing group for which information is to be retrieved
  *   group_namelen - name length
  *         lapl_id - Link access property list
- * Outputs: 
+ * Outputs:
  *            storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
@@ -847,13 +847,13 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 18, 2008
- * Modifications:      
+ * Modifications:
  *          - Added 'mounted' paramater
  *            M.S. Breitenfeld
  *            July 16, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, 
+nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
 		       int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
 
 {
diff --git a/fortran/src/H5Gff.f90 b/fortran/src/H5Gff.f90
index 13baa94..02dea4a 100644
--- a/fortran/src/H5Gff.f90
+++ b/fortran/src/H5Gff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,11 +11,11 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5F functions.
-! 
+!
 MODULE H5G
   USE H5GLOBAL
 
@@ -28,39 +28,39 @@ MODULE H5G
 !  END INTERFACE
 
 CONTAINS
-          
+
 !----------------------------------------------------------------------
-! Name:		h5gcreate_f 
+! Name:		h5gcreate_f
 !
-! Purpose:	Creates a new group. 
+! Purpose:	Creates a new group.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- group name at the specified location
-! Outputs:  
+! Outputs:
 !		grp_id		- group identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!		      size_hint	- a parameter indicating the number of bytes 
-!				  to reserve for the names that will appear 
+!		      size_hint	- a parameter indicating the number of bytes
+!				  to reserve for the names that will appear
 !				  in the group
 !                       lcpl_id - Property list for link creation
 !                       gcpl_id - Property list for group creation
 !                       gapl_id - Property list for group access
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
 !                       Added additional optional paramaters in 1.8
 !                       MSB - February 27, 2008
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
   SUBROUTINE h5gcreate_f(loc_id, name, grp_id, hdferr, size_hint, lcpl_id, gcpl_id, gapl_id)
 !
@@ -68,19 +68,19 @@ CONTAINS
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gcreate_f
 !DEC$endif
-!    
+!
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
-    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-    INTEGER(SIZE_T), OPTIONAL, INTENT(IN) :: size_hint 
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
+    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    INTEGER(SIZE_T), OPTIONAL, INTENT(IN) :: size_hint
                                            ! Parameter indicating
                                            ! the number of bytes
                                            ! to reserve for the
                                            ! names that will appear
                                            ! in the group. Set to OBJECT_NAMELEN_DEFAULT_F
-                                           ! if using any of the optional 
+                                           ! if using any of the optional
                                            ! parameters lcpl_id, gcpl_id, and/or gapl_id when not
                                            ! using keywords in specifying the optional parameters
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id  ! Property list for link creation
@@ -92,7 +92,7 @@ CONTAINS
     INTEGER(HID_T) :: gapl_id_default
 
     INTEGER :: namelen ! Length of the name character string
-    INTEGER(SIZE_T) :: size_hint_default 
+    INTEGER(SIZE_T) :: size_hint_default
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -115,7 +115,7 @@ CONTAINS
        END FUNCTION h5gcreate_c
     END INTERFACE
 
-    size_hint_default = OBJECT_NAMELEN_DEFAULT_F 
+    size_hint_default = OBJECT_NAMELEN_DEFAULT_F
     IF (PRESENT(size_hint)) size_hint_default = size_hint
     lcpl_id_default = H5P_DEFAULT_F
     IF(PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
@@ -132,18 +132,18 @@ CONTAINS
   END SUBROUTINE h5gcreate_f
 
 !!$!----------------------------------------------------------------------
-!!$! Name:		h5gcreate2_f 
+!!$! Name:		h5gcreate2_f
 !!$!
-!!$! Purpose:	Creates a new group. 
+!!$! Purpose:	Creates a new group.
 !!$!
-!!$! Inputs:  
+!!$! Inputs:
 !!$!		loc_id		- location identifier
 !!$!		name		- group name at the specified location
-!!$! Outputs:  
+!!$! Outputs:
 !!$!		grp_id		- group identifier
-!!$!		hdferr:		- error code		
+!!$!		hdferr:		- error code
 !!$!				 	Success:  0
-!!$!				 	Failure: -1   
+!!$!				 	Failure: -1
 !!$! Optional parameters:
 !!$!
 !!$!    lcpl_id  - Property list for link creation
@@ -153,25 +153,25 @@ CONTAINS
 !!$! Programmer:	M.S. BREITENFELD
 !!$!		February 27, 2008
 !!$!
-!!$! Modifications: 
+!!$! Modifications:
 !!$!
 !!$! Comment: Needed to switch the first 2 arguments to avoid conflect
-!!$!          with h5gcreate1_f	
+!!$!          with h5gcreate1_f
 !!$!----------------------------------------------------------------------
 !!$
-!!$  SUBROUTINE h5gcreate2_f(name, loc_id, grp_id, hdferr, & 
-!!$        lcpl_id, gcpl_id, gapl_id) 
+!!$  SUBROUTINE h5gcreate2_f(name, loc_id, grp_id, hdferr, &
+!!$        lcpl_id, gcpl_id, gapl_id)
 !!$!
 !!$!This definition is needed for Windows DLLs
 !!$!DEC$if defined(BUILD_HDF5_DLL)
 !!$!DEC$attributes dllexport :: h5gcreate_f
 !!$!DEC$endif
 !!$!
-!!$    IMPLICIT NONE 
+!!$    IMPLICIT NONE
 !!$    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
 !!$    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
 !!$    INTEGER, INTENT(OUT) :: hdferr         ! Error code
-!!$    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
+!!$    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
 !!$
 !!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id  ! Property list for link creation
 !!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
@@ -223,32 +223,32 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:		h5gopen_f 
+! Name:		h5gopen_f
 !
-! Purpose: 	Opens an existing group. 	
+! Purpose: 	Opens an existing group.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name 		- name of the group to open
-! Outputs:  
+! Outputs:
 !		grp_id		- group identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !               gapl_id         - Group access property list identifier
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
 !			port).  March 5, 2001
-!                   
+!
 !                       Added 1.8 (optional) parameter gapl_id
 !                       February, 2008 M.S. Breitenfeld
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
   SUBROUTINE h5gopen_f(loc_id, name, grp_id, hdferr, gapl_id)
 !
@@ -258,15 +258,15 @@ CONTAINS
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
-    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! File identifier 
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Group access property list identifier 
-    
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
+    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! File identifier
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Group access property list identifier
+
     INTEGER(HID_T) :: gapl_id_default
     INTEGER :: namelen ! Length of the name character string
-    
+
 !            INTEGER, EXTERNAL :: h5gopen_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -279,7 +279,7 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: name
          INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: name
-         INTEGER :: namelen 
+         INTEGER :: namelen
          INTEGER(HID_T), INTENT(IN) :: gapl_id_default
          INTEGER(HID_T), INTENT(OUT) :: grp_id
        END FUNCTION h5gopen_c
@@ -287,34 +287,34 @@ CONTAINS
 
     gapl_id_default = H5P_DEFAULT_F
     IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
-  
+
     namelen = LEN(name)
-    hdferr = h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id) 
-    
+    hdferr = h5gopen_c(loc_id, name, namelen, gapl_id_default, grp_id)
+
   END SUBROUTINE h5gopen_f
 
 !----------------------------------------------------------------------
-! Name:		h5gclose_f 
+! Name:		h5gclose_f
 !
-! Purpose:	Closes the specified group. 	
+! Purpose:	Closes the specified group.
 !
-! Inputs:  
+! Inputs:
 !		grp_id		- group identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
           SUBROUTINE h5gclose_f(grp_id, hdferr)
 !
@@ -347,32 +347,32 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:		h5gget_obj_info_idx_f 
+! Name:		h5gget_obj_info_idx_f
 !
-! Purpose:	Returns name and type of the group member identified by 
-!		its index. 
+! Purpose:	Returns name and type of the group member identified by
+!		its index.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the group at the specified location
 !		idx		- object index (zero-based)
-! Outputs:  
+! Outputs:
 !		obj_name	- object name
 !		obj_type	- object type
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
           SUBROUTINE h5gget_obj_info_idx_f(loc_id, name, idx, &
                                            obj_name, obj_type, hdferr)
@@ -382,14 +382,14 @@ CONTAINS
 !DEC$attributes dllexport :: h5gget_obj_info_idx_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
-            INTEGER, INTENT(IN) :: idx             ! Index of member object 
-            CHARACTER(LEN=*), INTENT(OUT) :: obj_name   ! Name of the object 
-            INTEGER, INTENT(OUT) :: obj_type       ! Object type 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
+            INTEGER, INTENT(IN) :: idx             ! Index of member object
+            CHARACTER(LEN=*), INTENT(OUT) :: obj_name   ! Name of the object
+            INTEGER, INTENT(OUT) :: obj_type       ! Object type
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
             INTEGER :: namelen ! Length of the name character string
             INTEGER :: obj_namelen ! Length of the obj_name character string
@@ -420,34 +420,34 @@ CONTAINS
             namelen = LEN(name)
             obj_namelen = LEN(obj_name)
             hdferr = h5gget_obj_info_idx_c(loc_id, name, namelen, idx, &
-                                           obj_name, obj_namelen, obj_type)     
+                                           obj_name, obj_namelen, obj_type)
 
           END SUBROUTINE h5gget_obj_info_idx_f
 
 !----------------------------------------------------------------------
-! Name:		h5gn_members_f 
+! Name:		h5gn_members_f
 !
-! Purpose: 	Returns the number of group members. 	
+! Purpose: 	Returns the number of group members.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the group at the specified location
-! Outputs:  
+! Outputs:
 !		nmembers	- number of group members
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5gn_members_f(loc_id, name, nmembers, hdferr)
@@ -457,16 +457,16 @@ CONTAINS
 !DEC$attributes dllexport :: h5gn_members_f
 !DEC$endif
 !
-           
+
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the group
             INTEGER, INTENT(OUT) :: nmembers       ! Number of members in the
-                                                   ! group 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+                                                   ! group
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
             INTEGER :: namelen ! Length of the name character string
-  
+
 !            INTEGER, EXTERNAL :: h5gn_members_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -485,40 +485,40 @@ CONTAINS
             END INTERFACE
 
             namelen = LEN(name)
-            hdferr = h5gn_members_c(loc_id, name, namelen, nmembers) 
+            hdferr = h5gn_members_c(loc_id, name, namelen, nmembers)
 
           END SUBROUTINE h5gn_members_f
 
 !----------------------------------------------------------------------
-! Name:		h5glink_f 
+! Name:		h5glink_f
 !
-! Purpose: 	Creates a link of the specified type from new_name 
-!		to current_name. 	
+! Purpose: 	Creates a link of the specified type from new_name
+!		to current_name.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		link_type	- link type
 !				  Possible values are:
 !				  H5G_LINK_HARD_F (0) or
-!				  H5G_LINK_SOFT_F (1) 
-!		current_name	- name of the existing object if link is a 
-!				  hard link. Can be anything for the soft link. 
+!				  H5G_LINK_SOFT_F (1)
+!		current_name	- name of the existing object if link is a
+!				  hard link. Can be anything for the soft link.
 !		new_name	- new name for the object
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5glink_f(loc_id, link_type, current_name, &
@@ -531,17 +531,17 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
             INTEGER, INTENT(IN) :: link_type       ! link type
                                                    ! Possible values are:
                                                    ! H5G_LINK_HARD_F (0) or
-                                                   ! H5G_LINK_SOFT_F (1) 
-            
-            CHARACTER(LEN=*), INTENT(IN) :: current_name   
-                                                   ! Current name of an object 
+                                                   ! H5G_LINK_SOFT_F (1)
+
+            CHARACTER(LEN=*), INTENT(IN) :: current_name
+                                                   ! Current name of an object
             CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: current_namelen ! Lenghth of the current_name string
             INTEGER :: new_namelen     ! Lenghth of the new_name string
 
@@ -551,14 +551,14 @@ CONTAINS
             INTERFACE
               INTEGER FUNCTION h5glink_c(loc_id, link_type, current_name, &
                                current_namelen, new_name, new_namelen)
-                              
+
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GLINK_C'::h5glink_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: current_name
               !DEC$ATTRIBUTES reference :: new_name
-              INTEGER(HID_T), INTENT(IN) :: loc_id 
+              INTEGER(HID_T), INTENT(IN) :: loc_id
               INTEGER, INTENT(IN) :: link_type
               CHARACTER(LEN=*), INTENT(IN) :: current_name
               INTEGER :: current_namelen
@@ -566,7 +566,7 @@ CONTAINS
               INTEGER :: new_namelen
               END FUNCTION h5glink_c
             END INTERFACE
-            
+
             current_namelen = LEN(current_name)
             new_namelen = LEN(new_name)
             hdferr = h5glink_c(loc_id, link_type, current_name, &
@@ -574,33 +574,33 @@ CONTAINS
           END SUBROUTINE h5glink_f
 
 !----------------------------------------------------------------------
-! Name:		h5glink2_f 
+! Name:		h5glink2_f
 !
-! Purpose: 	Creates a link of the specified type from new_name 
+! Purpose: 	Creates a link of the specified type from new_name
 !		to current_name. current_name and new_name are interpreted
-!               releative to current and new location identifiers.	
+!               releative to current and new location identifiers.
 !
-! Inputs:  
+! Inputs:
 !		cur_loc_id	- location identifier
-!		cur_name	- name of the existing object if link is a 
-!				  hard link. Can be anything for the soft link. 
+!		cur_name	- name of the existing object if link is a
+!				  hard link. Can be anything for the soft link.
 !		link_type	- link type
 !				  Possible values are:
 !				  H5G_LINK_HARD_F (0) or
-!				  H5G_LINK_SOFT_F (1) 
+!				  H5G_LINK_SOFT_F (1)
 !		new_loc_id	- new location identifier
 !		new_name	- new name for the object
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 25, 2002
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5glink2_f(cur_loc_id, cur_name, link_type, new_loc_id, &
@@ -613,18 +613,18 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: cur_loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: cur_name   
-                                                   ! Current name of an object 
+            INTEGER(HID_T), INTENT(IN) :: cur_loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: cur_name
+                                                   ! Current name of an object
             INTEGER, INTENT(IN) :: link_type       ! link type
                                                    ! Possible values are:
                                                    ! H5G_LINK_HARD_F (0) or
-                                                   ! H5G_LINK_SOFT_F (1) 
-            
-            INTEGER(HID_T), INTENT(IN) :: new_loc_id ! File or group identifier 
+                                                   ! H5G_LINK_SOFT_F (1)
+
+            INTEGER(HID_T), INTENT(IN) :: new_loc_id ! File or group identifier
             CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: cur_namelen ! Lenghth of the current_name string
             INTEGER :: new_namelen ! Lenghth of the new_name string
 
@@ -632,15 +632,15 @@ CONTAINS
               INTEGER FUNCTION h5glink2_c(cur_loc_id, cur_name, cur_namelen, &
                                link_type, new_loc_id, &
                                new_name, new_namelen)
-                              
+
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GLINK2_C'::h5glink2_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: cur_name
               !DEC$ATTRIBUTES reference :: new_name
-              INTEGER(HID_T), INTENT(IN) :: cur_loc_id 
-              INTEGER(HID_T), INTENT(IN) :: new_loc_id 
+              INTEGER(HID_T), INTENT(IN) :: cur_loc_id
+              INTEGER(HID_T), INTENT(IN) :: new_loc_id
               INTEGER, INTENT(IN) :: link_type
               CHARACTER(LEN=*), INTENT(IN) :: cur_name
               CHARACTER(LEN=*), INTENT(IN) :: new_name
@@ -648,7 +648,7 @@ CONTAINS
               INTEGER :: new_namelen
               END FUNCTION h5glink2_c
             END INTERFACE
-            
+
             cur_namelen = LEN(cur_name)
             new_namelen = LEN(new_name)
             hdferr = h5glink2_c(cur_loc_id, cur_name, cur_namelen, link_type, &
@@ -656,30 +656,30 @@ CONTAINS
           END SUBROUTINE h5glink2_f
 
 !----------------------------------------------------------------------
-! Name:		h5gunlink_f 
+! Name:		h5gunlink_f
 !
-! Purpose: 	Removes the specified name from the group graph and 
-!		decrements the link count for the object to which name 
-!		points	
+! Purpose: 	Removes the specified name from the group graph and
+!		decrements the link count for the object to which name
+!		points
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the object to unlink
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5gunlink_f(loc_id, name, hdferr)
@@ -691,12 +691,12 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of an object 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of an object
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: namelen ! Lenghth of the name character string
-            
+
 !            INTEGER, EXTERNAL :: h5gunlink_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -712,38 +712,38 @@ CONTAINS
               INTEGER :: namelen
               END FUNCTION h5gunlink_c
             END INTERFACE
-            
+
             namelen = LEN(name)
             hdferr = h5gunlink_c(loc_id, name, namelen)
           END SUBROUTINE h5gunlink_f
 
 !----------------------------------------------------------------------
-! Name:		h5gmove_f 
+! Name:		h5gmove_f
 !
-! Purpose:	Renames an object within an HDF5 file.  	
+! Purpose:	Renames an object within an HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- object's name at specified location
 !		new_name	- object's new name
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          
+
           SUBROUTINE h5gmove_f(loc_id, name, new_name, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -753,11 +753,11 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
             CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: namelen         ! Lenghth of the current_name string
             INTEGER :: new_namelen     ! Lenghth of the new_name string
 
@@ -779,36 +779,36 @@ CONTAINS
               INTEGER :: new_namelen
               END FUNCTION h5gmove_c
             END INTERFACE
-            
+
             namelen = LEN(name)
             new_namelen = LEN(new_name)
             hdferr = h5gmove_c(loc_id, name, namelen, new_name, new_namelen)
           END SUBROUTINE h5gmove_f
 
 !----------------------------------------------------------------------
-! Name:		h5gmove2_f 
+! Name:		h5gmove2_f
 !
-! Purpose:	Renames an object within an HDF5 file.  	
+! Purpose:	Renames an object within an HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !		src_loc_id	- original location identifier
 !		src_name	- object's name at specified original location
 !		dst_loc_id	- original location identifier
 !		dst_name	- object's new name
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 25, 2002
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          
+
           SUBROUTINE h5gmove2_f(src_loc_id, src_name, dst_loc_id, dst_name, hdferr)
 !
 !This definition is needed for Windows DLLs
@@ -818,12 +818,12 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN)   :: src_loc_id  ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: src_name    ! Original name of an object 
-            INTEGER(HID_T), INTENT(IN)   :: dst_loc_id  ! File or group identifier 
+            INTEGER(HID_T), INTENT(IN)   :: src_loc_id  ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: src_name    ! Original name of an object
+            INTEGER(HID_T), INTENT(IN)   :: dst_loc_id  ! File or group identifier
             CHARACTER(LEN=*), INTENT(IN) :: dst_name    ! New name of an object
             INTEGER, INTENT(OUT)         :: hdferr      ! Error code
-            
+
             INTEGER :: src_namelen         ! Length of the current_name string
             INTEGER :: dst_namelen         ! Lenghth of the new_name string
 
@@ -847,7 +847,7 @@ CONTAINS
               INTEGER :: dst_namelen
               END FUNCTION h5gmove2_c
             END INTERFACE
-            
+
             src_namelen = LEN(src_name)
             dst_namelen = LEN(dst_name)
             hdferr = h5gmove2_c(src_loc_id, src_name, src_namelen,&
@@ -855,33 +855,33 @@ CONTAINS
           END SUBROUTINE h5gmove2_f
 
 !----------------------------------------------------------------------
-! Name:		h5gget_linkval_f 
+! Name:		h5gget_linkval_f
 !
-! Purpose: 	Returns the name of the object that the symbolic link 
-! 		points to. 	
+! Purpose: 	Returns the name of the object that the symbolic link
+! 		points to.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
-!		name		- symbolic link to the object whose name 
-!				  is to be returned.  
+!		name		- symbolic link to the object whose name
+!				  is to be returned.
 !		size		- maximum number of characters to be returned
-! Outputs:  
-!		buffer		- a buffer to hold the name of the object 
-!				  being sought 
-!		hdferr:		- error code		
+! Outputs:
+!		buffer		- a buffer to hold the name of the object
+!				  being sought
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5gget_linkval_f(loc_id, name, size, buffer, hdferr)
@@ -893,15 +893,15 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
             INTEGER(SIZE_T), INTENT(IN) :: size    ! Maximum number of buffer
-            CHARACTER(LEN=size), INTENT(OUT) :: buffer 
+            CHARACTER(LEN=size), INTENT(OUT) :: buffer
                                                    ! Buffer to hold a name of
                                                    ! the object symbolic link
                                                    ! points to
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: namelen ! Lenghth of the current_name string
 
 !            INTEGER, EXTERNAL :: h5gget_linkval_c
@@ -914,43 +914,43 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_LINKVAL_C'::h5gget_linkval_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
-              !DEC$ATTRIBUTES reference :: buffer 
+              !DEC$ATTRIBUTES reference :: buffer
               INTEGER(HID_T), INTENT(IN) :: loc_id
-              CHARACTER(LEN=*), INTENT(IN) :: name 
+              CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER :: namelen
               INTEGER(SIZE_T), INTENT(IN) :: size
               CHARACTER(LEN=*), INTENT(OUT) :: buffer
               END FUNCTION h5gget_linkval_c
             END INTERFACE
-            
+
             namelen = LEN(name)
             hdferr = h5gget_linkval_c(loc_id, name, namelen, size, buffer)
           END SUBROUTINE h5gget_linkval_f
 
 !----------------------------------------------------------------------
-! Name:		h5gset_comment_f 
+! Name:		h5gset_comment_f
 !
-! Purpose: 	Sets comment for specified object. 	
+! Purpose: 	Sets comment for specified object.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the object
 !		comment		- comment to set for the object
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
            SUBROUTINE h5gset_comment_f(loc_id, name, comment, hdferr)
@@ -962,11 +962,11 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
             CHARACTER(LEN=*), INTENT(IN) :: comment ! New name of an object
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: namelen ! Lenghth of the current_name string
             INTEGER :: commentlen     ! Lenghth of the comment string
 
@@ -980,8 +980,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GSET_COMMENT_C'::h5gset_comment_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
-              !DEC$ATTRIBUTES reference :: comment 
+              !DEC$ATTRIBUTES reference :: name
+              !DEC$ATTRIBUTES reference :: comment
               INTEGER(HID_T), INTENT(IN) :: loc_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER :: namelen
@@ -989,37 +989,37 @@ CONTAINS
               INTEGER :: commentlen
               END FUNCTION h5gset_comment_c
             END INTERFACE
-            
+
             namelen = LEN(name)
             commentlen = LEN(comment)
             hdferr = h5gset_comment_c(loc_id, name, namelen, comment, commentlen)
           END SUBROUTINE h5gset_comment_f
 
 !----------------------------------------------------------------------
-! Name:		h5gget_comment_f 
+! Name:		h5gget_comment_f
 !
-! Purpose:	Retrieves comment for specified object.  	
+! Purpose:	Retrieves comment for specified object.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the object at specified location
 !		size		- size of the buffer required to hold comment
-! Outputs:  
+! Outputs:
 !		buffer		- buffer to hold object's comment
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5gget_comment_f(loc_id, name, size, buffer, hdferr)
@@ -1031,13 +1031,13 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name   ! Current name of an object
             INTEGER(SIZE_T), INTENT(IN) :: size    ! Maximum number of buffer
-            CHARACTER(LEN=size), INTENT(OUT) :: buffer 
+            CHARACTER(LEN=size), INTENT(OUT) :: buffer
                                                    ! Buffer to hold a comment
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
-            
+
             INTEGER :: namelen ! Lenghth of the current_name string
 
 !            INTEGER, EXTERNAL :: h5gget_comment_c
@@ -1050,8 +1050,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_COMMENT_C'::h5gget_comment_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
-              !DEC$ATTRIBUTES reference :: buffer 
+              !DEC$ATTRIBUTES reference :: name
+              !DEC$ATTRIBUTES reference :: buffer
               INTEGER(HID_T), INTENT(IN) :: loc_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER :: namelen
@@ -1059,7 +1059,7 @@ CONTAINS
               CHARACTER(LEN=*), INTENT(OUT) :: buffer
               END FUNCTION h5gget_comment_c
             END INTERFACE
-            
+
             namelen = LEN(name)
             hdferr = h5gget_comment_c(loc_id, name, namelen, size, buffer)
   END SUBROUTINE h5gget_comment_f
@@ -1067,25 +1067,25 @@ CONTAINS
 !----------------------------------------------------------------------
 ! Name:		H5Gcreate_anon_f
 !
-! Purpose:	Creates a new empty group without linking it into the file structure. 
+! Purpose:	Creates a new empty group without linking it into the file structure.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- Location identifier
-! Outputs:  
+! Outputs:
 !		grp_id		- group identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !               gcpl_id   	- Group creation property list identifier
 !               gapl_id         - Group access property list identifier
 !
 ! Programmer:	M.S. Breitenfeld
-!		February 15, 2008	
+!		February 15, 2008
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
   SUBROUTINE h5Gcreate_anon_f(loc_id, grp_id, hdferr, gcpl_id, gapl_id)
 !
@@ -1096,14 +1096,14 @@ CONTAINS
 !
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id   ! File or group identifier
-    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier 
+    INTEGER(HID_T), INTENT(OUT) :: grp_id  ! Group identifier
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gcpl_id  ! Property list for group creation
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: gapl_id  ! Property list for group access
 
     INTEGER(HID_T) :: gcpl_id_default
     INTEGER(HID_T) :: gapl_id_default
-    
+
     INTERFACE
        INTEGER FUNCTION h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
          USE H5GLOBAL
@@ -1117,36 +1117,36 @@ CONTAINS
        END FUNCTION h5gcreate_anon_c
     END INTERFACE
 
-    gcpl_id_default = H5P_DEFAULT_F 
-    gapl_id_default = H5P_DEFAULT_F 
+    gcpl_id_default = H5P_DEFAULT_F
+    gapl_id_default = H5P_DEFAULT_F
 
     IF(PRESENT(gcpl_id)) gcpl_id_default = gcpl_id
     IF(PRESENT(gapl_id)) gapl_id_default = gapl_id
-    
+
     hdferr = h5gcreate_anon_c(loc_id, gcpl_id_default, gapl_id_default, grp_id)
-    
+
   END SUBROUTINE h5Gcreate_anon_f
 
 !----------------------------------------------------------------------
 ! Name:		H5Gget_create_plist_f
 !
-! Purpose:	Gets a group creation property list identifier. 
+! Purpose:	Gets a group creation property list identifier.
 !
-! Inputs:  
+! Inputs:
 !		grp_id		- group identifier
-! Outputs:  
+! Outputs:
 !               gcpl_id   	- Group creation property list identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !
 ! Programmer:	M.S. Breitenfeld
-!		February 15, 2008	
+!		February 15, 2008
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
   SUBROUTINE h5gget_create_plist_f(grp_id, gcpl_id, hdferr)
 !
@@ -1159,7 +1159,7 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN)  :: grp_id  ! Group identifier
     INTEGER(HID_T), INTENT(OUT) :: gcpl_id ! Property list for group creation
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -1172,17 +1172,17 @@ CONTAINS
          INTEGER(HID_T), INTENT(OUT) :: gcpl_id
        END FUNCTION h5gget_create_plist_c
     END INTERFACE
-    
+
     hdferr = h5gget_create_plist_c(grp_id, gcpl_id )
-    
+
   END SUBROUTINE h5gget_create_plist_f
 
 !----------------------------------------------------------------------
 ! Name:		h5gget_info_f
 !
 ! Purpose:  	Retrieves information about a group
-!		
-! Inputs:  
+!
+! Inputs:
 !		group_id - Group identifier
 !
 ! Outputs:  NOTE: In C it is defined as a structure: H5G_info_t
@@ -1193,30 +1193,30 @@ CONTAINS
 !                       H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
 !            nlinks - Number of links in group
 !     	 max_corder - Current maximum creation order value for group
-!            hdferr - error code		
+!            hdferr - error code
 !		          Success:  0
-!		          Failure: -1   
+!		          Failure: -1
 ! Optional parameters:
-!	    mounted - Whether group has a file mounted on it			
+!	    mounted - Whether group has a file mounted on it
 !
 ! Programmer:	M. S. Breitenfeld
-!		February 15, 2008	
+!		February 15, 2008
 !
-! Modifications:     
+! Modifications:
 !          - Added 'mounted' paramater
 !            M.S. Breitenfeld
 !            July 16, 2008
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr, mounted) 
+  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr, mounted)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gget_info_f
 !DEC$endif
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: group_id ! Group identifier
- 
+
     INTEGER, INTENT(OUT) :: storage_type ! Type of storage for links in group:
                                           ! H5G_STORAGE_TYPE_COMPACT_F: Compact storage
                                           ! H5G_STORAGE_TYPE_DENSE_F: Indexed storage
@@ -1248,20 +1248,20 @@ CONTAINS
     hdferr = h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c)
 
     IF(PRESENT(mounted))THEN
-       IF(mounted_c.EQ.0) THEN 
+       IF(mounted_c.EQ.0) THEN
           mounted = .FALSE.
-       ELSE 
+       ELSE
           mounted = .TRUE.
        ENDIF
     ENDIF
-    
+
   END SUBROUTINE h5gget_info_f
 
 !----------------------------------------------------------------------
 ! Name:		h5gget_info_by_idx_f
 !
 ! Purpose:  	Retrieves information about a group, according to the group’s position within an index.
-!		
+!
 ! Inputs:
 !          loc_id - File or group identifier
 !      group_name - Name of group containing group for which information is to be retrieved
@@ -1277,17 +1277,17 @@ CONTAINS
 !                       H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
 !            nlinks - Number of links in group
 !     	 max_corder - Current maximum creation order value for group
-!            hdferr - error code		
+!            hdferr - error code
 !		          Success:  0
-!		          Failure: -1   
+!		          Failure: -1
 ! Optional parameters:
 !         lapl_id - Link access property list
-!	  mounted - Whether group has a file mounted on it		
+!	  mounted - Whether group has a file mounted on it
 !
 ! Programmer:	M. S. Breitenfeld
-!		February 18, 2008	
+!		February 18, 2008
 !
-! Modifications:    
+! Modifications:
 !          - Added 'mounted' paramater
 !            M.S. Breitenfeld
 !            July 16, 2008
@@ -1295,7 +1295,7 @@ CONTAINS
 !----------------------------------------------------------------------
 
   SUBROUTINE h5gget_info_by_idx_f(loc_id, group_name, index_type, order, n, &
-       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted) 
+       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gget_info_by_idx_f
@@ -1338,7 +1338,7 @@ CONTAINS
          INTEGER(HSIZE_T), INTENT(IN) :: n
          INTEGER(HID_T) :: lapl_id_default
          INTEGER, INTENT(OUT) :: storage_type
-         INTEGER, INTENT(OUT) :: nlinks 
+         INTEGER, INTENT(OUT) :: nlinks
          INTEGER, INTENT(OUT) :: max_corder
 
          INTEGER(SIZE_T) :: group_name_len
@@ -1357,20 +1357,20 @@ CONTAINS
          storage_type, nlinks, max_corder, mounted_c)
 
     IF(PRESENT(mounted))THEN
-       IF(mounted_c.EQ.0) THEN 
+       IF(mounted_c.EQ.0) THEN
           mounted = .FALSE.
-       ELSE 
+       ELSE
           mounted = .TRUE.
        ENDIF
     ENDIF
-    
+
   END SUBROUTINE h5gget_info_by_idx_f
-  
+
 !----------------------------------------------------------------------
 ! Name:		h5gget_info_by_name_f
 !
-! Purpose:  	Retrieves information about a group. 
-!		
+! Purpose:  	Retrieves information about a group.
+!
 ! Inputs:
 !          loc_id - File or group identifier
 !      group_name - Name of group containing group for which information is to be retrieved
@@ -1383,24 +1383,24 @@ CONTAINS
 !                       H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
 !            nlinks - Number of links in group
 !     	 max_corder - Current maximum creation order value for group
-!            hdferr - error code		
+!            hdferr - error code
 !		          Success:  0
-!		          Failure: -1   
+!		          Failure: -1
 ! Optional parameters:
 !         lapl_id - Link access property list
-!	  mounted - Whether group has a file mounted on it		
+!	  mounted - Whether group has a file mounted on it
 !
 ! Programmer:	M. S. Breitenfeld
-!		February 18, 2008	
+!		February 18, 2008
 !
-! Modifications:  
+! Modifications:
 !          - Added 'mounted' paramater
 !            M.S. Breitenfeld
 !            July 16, 2008
 !----------------------------------------------------------------------
 
   SUBROUTINE h5gget_info_by_name_f(loc_id, group_name, &
-       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted) 
+       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gget_info_by_name_f
@@ -1421,7 +1421,7 @@ CONTAINS
     LOGICAL, INTENT(OUT), OPTIONAL :: mounted      ! Whether group has a file mounted on it
 
     INTEGER :: mounted_c
-    INTEGER(HID_T) :: lapl_id_default 
+    INTEGER(HID_T) :: lapl_id_default
     INTEGER(SIZE_T) :: group_name_len ! length of group name
 
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1437,7 +1437,7 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: group_name
          INTEGER(HID_T), INTENT(IN) :: lapl_id_default
          INTEGER, INTENT(OUT) :: storage_type
-         INTEGER, INTENT(OUT) :: nlinks 
+         INTEGER, INTENT(OUT) :: nlinks
          INTEGER, INTENT(OUT) :: max_corder
 
          INTEGER(SIZE_T) :: group_name_len
@@ -1447,7 +1447,7 @@ CONTAINS
     END INTERFACE
 
     group_name_len = LEN(group_name)
-    
+
     lapl_id_default = H5P_DEFAULT_F
     IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
 
@@ -1455,13 +1455,13 @@ CONTAINS
          storage_type, nlinks, max_corder, mounted_c)
 
     IF(PRESENT(mounted))THEN
-       IF(mounted_c.EQ.0) THEN 
+       IF(mounted_c.EQ.0) THEN
           mounted = .FALSE.
-       ELSE 
+       ELSE
           mounted = .TRUE.
        ENDIF
     ENDIF
-    
+
   END SUBROUTINE h5gget_info_by_name_f
 
 END MODULE H5G
diff --git a/fortran/src/H5If.c b/fortran/src/H5If.c
index e5d4d29..5368861 100644
--- a/fortran/src/H5If.c
+++ b/fortran/src/H5If.c
@@ -54,9 +54,9 @@ nh5iget_type_c (hid_t_f *obj_id, int_f *type)
  * Returns:     length of the name on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, March 12, 2003
- * Modifications: 
+ * Modifications:
  *               Changed the size of c_buf_size to c_buf_size + 1, which
- *               fixes the problem of truncating the string by 1 if the 
+ *               fixes the problem of truncating the string by 1 if the
  *               exact size of the string (buf_size) is passed in.
  *               M.S. Breitenfeld, April 21, 2008
  *---------------------------------------------------------------------------*/
@@ -70,7 +70,7 @@ nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_siz
      char *c_buf =NULL;
 
      /*
-      * Allocate buffer to hold name of an object 
+      * Allocate buffer to hold name of an object
       */
      c_buf_size = (size_t)*buf_size +1;
      c_buf = (char *)HDmalloc(c_buf_size);
diff --git a/fortran/src/H5Iff.f90 b/fortran/src/H5Iff.f90
index dd670d6..d16cec4 100644
--- a/fortran/src/H5Iff.f90
+++ b/fortran/src/H5Iff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5I functions
@@ -19,17 +19,17 @@
       MODULE H5I
 
         USE H5GLOBAL
-      
+
       CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5iget_type_f 
+! Name:		h5iget_type_f
 !
-! Purpose:	Retrieves the type of an object.  	
+! Purpose:	Retrieves the type of an object.
 !
-! Inputs: 	obj_id		- object identifier 
-! Outputs:  
-!		type		- type of the object, possible values:   
+! Inputs: 	obj_id		- object identifier
+! Outputs:
+!		type		- type of the object, possible values:
 !				  H5I_FILE_F
 !				  H5I_GROUP_F
 !				  H5I_DATATYPE_F
@@ -37,22 +37,22 @@
 !				  H5I_DATASET_F
 !				  H5I_ATTR_F
 !				  H5I_BADID_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 5, 2001 
+!			port).  March 5, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5iget_type_f(obj_id, type, hdferr) 
+          SUBROUTINE h5iget_type_f(obj_id, type, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -60,8 +60,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier 
-            INTEGER, INTENT(OUT) :: type !type of an object. 
+            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier
+            INTEGER, INTENT(OUT) :: type !type of an object.
                                          !possible values are:
                                          !H5I_FILE_F
                                          !H5I_GROUP_F
@@ -81,7 +81,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_TYPE_C':: h5iget_type_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: obj_id 
+              INTEGER(HID_T), INTENT(IN) :: obj_id
               INTEGER, INTENT(OUT) :: type
               END FUNCTION h5iget_type_c
             END INTERFACE
@@ -89,39 +89,39 @@
           END SUBROUTINE h5iget_type_f
 
 !----------------------------------------------------------------------
-! Name:		h5iget_name_f 
+! Name:		h5iget_name_f
 !
-! Purpose: 	Gets a name of an object specified by its idetifier.  
+! Purpose: 	Gets a name of an object specified by its idetifier.
 !
-! Inputs:  
+! Inputs:
 !		obj_id		- attribute identifier
 !		buf_size	- size of a buffer to read name in
-! Outputs:  
+! Outputs:
 !		buf		- buffer to read name in, name will be truncated if
 !                                 buffer is not big enough
 !               name_size       - name size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
 !
-! Modifications: 	
+! Modifications:
 !
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5iget_name_f(obj_id, buf, buf_size, name_size, hdferr) 
+          SUBROUTINE h5iget_name_f(obj_id, buf, buf_size, name_size, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5iget_name_f
 !DEC$endif
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id     ! Object identifier 
-            INTEGER(SIZE_T), INTENT(IN) :: buf_size  ! Buffer size 
+            INTEGER(HID_T), INTENT(IN) :: obj_id     ! Object identifier
+            INTEGER(SIZE_T), INTENT(IN) :: buf_size  ! Buffer size
             CHARACTER(LEN=*), INTENT(OUT) :: buf   ! Buffer to hold object name
             INTEGER(SIZE_T), INTENT(OUT) :: name_size ! Actual name size
             INTEGER, INTENT(OUT) :: hdferr         ! Error code:
@@ -152,23 +152,23 @@
 !
 ! Purpose:	Increments the reference count of an ID
 !
-! Inputs: 	obj_id		- object identifier 
-! Outputs:  
+! Inputs: 	obj_id		- object identifier
+! Outputs:
 !		ref_count       - Current reference count of the ID
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Quincey Koziol
-!		December  9, 2003	
+!		December  9, 2003
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5iinc_ref_f(obj_id, ref_count, hdferr) 
+          SUBROUTINE h5iinc_ref_f(obj_id, ref_count, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -176,7 +176,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier 
+            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier
             INTEGER, INTENT(OUT) :: ref_count !Current reference count of ID
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -189,7 +189,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IINC_REF_C':: h5iinc_ref_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: obj_id 
+              INTEGER(HID_T), INTENT(IN) :: obj_id
               INTEGER, INTENT(OUT) :: ref_count
               END FUNCTION h5iinc_ref_c
             END INTERFACE
@@ -201,23 +201,23 @@
 !
 ! Purpose:	Decrements the reference count of an ID
 !
-! Inputs: 	obj_id		- object identifier 
-! Outputs:  
+! Inputs: 	obj_id		- object identifier
+! Outputs:
 !		ref_count       - Current reference count of the ID
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Quincey Koziol
-!		December  9, 2003	
+!		December  9, 2003
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5idec_ref_f(obj_id, ref_count, hdferr) 
+          SUBROUTINE h5idec_ref_f(obj_id, ref_count, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -225,7 +225,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier 
+            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier
             INTEGER, INTENT(OUT) :: ref_count !Current reference count of ID
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -238,7 +238,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IDEC_REF_C':: h5idec_ref_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: obj_id 
+              INTEGER(HID_T), INTENT(IN) :: obj_id
               INTEGER, INTENT(OUT) :: ref_count
               END FUNCTION h5idec_ref_c
             END INTERFACE
@@ -250,23 +250,23 @@
 !
 ! Purpose:	Retrieves the reference count of an ID
 !
-! Inputs: 	obj_id		- object identifier 
-! Outputs:  
+! Inputs: 	obj_id		- object identifier
+! Outputs:
 !		ref_count       - Current reference count of the ID
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Quincey Koziol
-!		December  9, 2003	
+!		December  9, 2003
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5iget_ref_f(obj_id, ref_count, hdferr) 
+          SUBROUTINE h5iget_ref_f(obj_id, ref_count, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -274,7 +274,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier 
+            INTEGER(HID_T), INTENT(IN) :: obj_id  !Object identifier
             INTEGER, INTENT(OUT) :: ref_count !Current reference count of ID
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -287,7 +287,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_REF_C':: h5iget_ref_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: obj_id 
+              INTEGER(HID_T), INTENT(IN) :: obj_id
               INTEGER, INTENT(OUT) :: ref_count
               END FUNCTION h5iget_ref_c
             END INTERFACE
@@ -299,12 +299,12 @@
 !
 ! Purpose:	Obtains file identifier from the object identifier
 !
-! Inputs: 	obj_id		- object identifier 
-! Outputs:       
+! Inputs: 	obj_id		- object identifier
+! Outputs:
 !		file_id         - file identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -313,9 +313,9 @@
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5iget_file_id_f(obj_id, file_id, hdferr) 
+          SUBROUTINE h5iget_file_id_f(obj_id, file_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -323,7 +323,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN)  :: obj_id   ! Object identifier 
+            INTEGER(HID_T), INTENT(IN)  :: obj_id   ! Object identifier
             INTEGER(HID_T), INTENT(OUT) :: file_id  ! File identifier
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -333,8 +333,8 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IGET_FILE_ID_C':: h5iget_file_id_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN)  :: obj_id 
-              INTEGER(HID_T), INTENT(OUT) :: file_id 
+              INTEGER(HID_T), INTENT(IN)  :: obj_id
+              INTEGER(HID_T), INTENT(OUT) :: file_id
               END FUNCTION h5iget_file_id_c
             END INTERFACE
             hdferr = h5iget_file_id_c(obj_id, file_id)
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
index ed6d2e1..4378f33 100644
--- a/fortran/src/H5Lf.c
+++ b/fortran/src/H5Lf.c
@@ -24,10 +24,10 @@
  * Inputs:
  *     src_loc_id - Location identifier of the source link
  *       src_name - Name of the link to be copied
- *    src_namelen - length of the name 
+ *    src_namelen - length of the name
  *    dest_loc_id - Location identifier specifying the destination of the copy
  *      dest_name - Name to be assigned to the NEW copy
- *   dest_namelen - Length of the name 
+ *   dest_namelen - Length of the name
  *         loc_id - Identifier of the file or group containing the object
  *           name - Name of the link to delete
  *        lcpl_id - Link creation property list identifier
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, 
+nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
 	     _fcd dest_name, size_t_f *dest_namelen,
 	     hid_t_f *lcpl_id, hid_t_f *lapl_id)
 {
@@ -59,7 +59,7 @@ nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *d
   /*
    * Call H5Lcopy function.
    */
-  if( H5Lcopy( (hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id, 
+  if( H5Lcopy( (hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id,
 	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id ) < 0)
     HGOTO_DONE(FAIL);
 
@@ -68,15 +68,15 @@ done:
     HDfree(c_src_name);
   if(c_dest_name)
     HDfree(c_dest_name);
-  
+
   return ret_value;
 }
 
 /*----------------------------------------------------------------------------
  * Name:        h5lcreate_external_c
- * Purpose:     Call H5Lcreate_external_c 
+ * Purpose:     Call H5Lcreate_external_c
  * Inputs:
- *    file_name - Name of the file containing the target object. Neither the file nor the target object is 
+ *    file_name - Name of the file containing the target object. Neither the file nor the target object is
  *                required to exist. May be the file the link is being created in.
  *     obj_name - Path within the target file to the target object.
  *  link_loc_id - The file or group identifier for the new link.
@@ -92,7 +92,7 @@ done:
 
 int_f
 nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
-		      hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, 
+		      hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
 		      hid_t_f *lcpl_id, hid_t_f *lapl_id)
 
 {
@@ -125,7 +125,7 @@ done:
     HDfree(c_obj_name);
   if(c_link_name)
     HDfree(c_link_name);
-  
+
   return ret_value;
 }
 
@@ -188,9 +188,9 @@ done:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, 
-		  hid_t_f *link_loc_id, 
-		  _fcd link_name, size_t_f *link_name_len, 
+nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
+		  hid_t_f *link_loc_id,
+		  _fcd link_name, size_t_f *link_name_len,
 		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
 {
   char *c_target_path = NULL;
@@ -240,9 +240,9 @@ nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-		  hid_t_f *link_loc_id, 
-		  _fcd link_name, size_t_f *link_namelen, 
+nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		  hid_t_f *link_loc_id,
+		  _fcd link_name, size_t_f *link_namelen,
 		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
 {
   char *c_obj_name = NULL;
@@ -273,8 +273,8 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5ldelete_by_idx_c 
- * Purpose:     Calls h5ldelete_by_idx 
+ * Name:        h5ldelete_by_idx_c
+ * Purpose:     Calls h5ldelete_by_idx
  * Inputs:
  *          loc_id - File or group identifier specifying location of subject group
  *      group_name - Name of subject group
@@ -283,16 +283,16 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
  *                    H5_INDEX_UNKNOWN_F = -1  - Unknown index type
  *                    H5_INDEX_NAME_F          - Index on names
  *                    H5_INDEX_CRT_ORDER_F     - Index on creation order
- *                    H5_INDEX_N_F	       - Number of indices defined                   
+ *                    H5_INDEX_N_F	       - Number of indices defined
  *           order - Order within field or index; Possible values are:
  *                    H5_ITER_UNKNOWN_F   - Unknown order
  *                    H5_ITER_INC_F       - Increasing order
  *                    H5_ITER_DEC_F       - Decreasing order
  *                    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
  *                    H5_ITER_N_F	  - Number of iteration orders
- *               n - Link for which to retrieve information  
- *         lapl_id - Link access property list     
- *              
+ *               n - Link for which to retrieve information
+ *         lapl_id - Link access property list
+ *
  * Outputs:     N/A
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -300,7 +300,7 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 		     int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
 {
     char *c_group_name = NULL;          /* Buffer to hold C string */
@@ -318,7 +318,7 @@ nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
     c_order = (H5_iter_order_t)*order;
 
      /*
-      * Call H5Ldelete_by_name function. 
+      * Call H5Ldelete_by_name function.
       */
     if(H5Ldelete_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
       HGOTO_DONE(FAIL);
@@ -331,7 +331,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5lexists_c
- * Purpose:     Calls H5Lexists 
+ * Purpose:     Calls H5Lexists
  * Inputs:
  *      loc_id - Identifier of the file or group to query.
  *        name - Link name to check
@@ -370,14 +370,14 @@ done:
 /*----------------------------------------------------------------------------
  * Name:        h5lget_info_c
  * Purpose:     Call  H5Lget_info
- * Inputs:  
+ * Inputs:
  *		link_loc_id - File or group identifier.
  *                link_name - Name of the link for which information is being sought
  *             link_namelen - Name length
  *                  lapl_id - Link access property list
  * Outputs:
  *
- *              cset - indicates the character set used for link’s name. 
+ *              cset - indicates the character set used for link’s name.
  *            corder - specifies the link’s creation order position.
  *      corder_valid - indicates whether the value in corder is valid.
  *         link_type -  specifies the link class:
@@ -395,7 +395,7 @@ done:
  *---------------------------------------------------------------------------*/
 int_f
 nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-		int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
+		int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type,
 		int_f *address, hsize_t_f *val_size,
 		hid_t_f *lapl_id)
 {
@@ -431,7 +431,7 @@ done:
 /*----------------------------------------------------------------------------
  * Name:        h5lget_info_by_idx_c
  * Purpose:     Call  H5Lget_info_by_idx
- * Inputs: 
+ * Inputs:
  *	loc_id  - File or group identifier specifying location of subject group
  *   group_name - Name of subject group
  *group_namelen - Name length
@@ -439,8 +439,8 @@ done:
  *        order - Order within field or index
  *            n - Link for which to retrieve information
  *      lapl_id - Link access property list
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -451,7 +451,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 		      int_f *index_field, int_f *order, hsize_t_f *n,
 		      int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id)
 {
@@ -508,16 +508,16 @@ nh5lis_registered_c(int_f *link_cls_id)
   int_f ret_value = 0;      /* Return value */
   H5L_type_t c_link_cls_id; /* User-defined link class identifier */
   htri_t registered; /* registration status */
-			
-		     
+
+
   c_link_cls_id = (H5L_type_t)*link_cls_id;
   /*
    * Call H5Lis_registered
    */
   registered = H5Lis_registered(c_link_cls_id);
-  
+
   ret_value = (int_f)registered;
-  
+
   return ret_value;
 }
 
@@ -608,7 +608,7 @@ nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
     if ((c_name = HDmalloc(c_size)) == NULL)
       HGOTO_DONE(FAIL);
 
-    if((*size = (size_t)H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field, 
+    if((*size = (size_t)H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field,
 						     (H5_iter_order_t)*order, (hsize_t)*n,c_name, c_size, (hid_t)*lapl_id)) < 0)
       HGOTO_DONE(FAIL);
 
@@ -626,7 +626,7 @@ done:
 /*----------------------------------------------------------------------------
  * Name:        h5lget_val_c
  * Purpose:     Call  H5Lget_val
- * Inputs:  
+ * Inputs:
  *		link_loc_id - File or group identifier.
  *                link_name - Name of the link for which valrmation is being sought
  *             link_namelen - Name length
@@ -674,23 +674,23 @@ done:
  * Name:        H5Lregistered_c
  * Purpose:     Call H5Lregistered
  * Inputs:
- *		
+ *
  * Inputs:
- *     version         - Version number of this struct 
- *     class_id        - Link class identifier          
- *     comment         - Comment for debugging            
- *     comment_len     - Comment for debugging          
- *     create_func     - Callback during link creation            
+ *     version         - Version number of this struct
+ *     class_id        - Link class identifier
+ *     comment         - Comment for debugging
+ *     comment_len     - Comment for debugging
+ *     create_func     - Callback during link creation
  *     create_func_len - length
- *    move_func        - Callback after moving link       
- *    move_func_len    - length    
- *     copy_func       - Callback after copying link      
+ *    move_func        - Callback after moving link
+ *    move_func_len    - length
+ *     copy_func       - Callback after copying link
  *     copy_func_len   - length
- *     trav_func       - The main traversal function      
+ *     trav_func       - The main traversal function
  *     trav_func_len   - length
- *     del_func        - Callback for link deletion       
+ *     del_func        - Callback for link deletion
  *     del_func_len    - length
- *     query_func      - Callback for queries    
+ *     query_func      - Callback for queries
  *     query_func_len  - length
  *
  * Returns:     0 on success, -1 on failure
@@ -717,7 +717,7 @@ done:
 /*   char *c_trav_func = NULL;  */
 /*   char *c_del_func = NULL;  */
 /*   char *c_query_func = NULL; */
-  
+
 /*   H5L_class_t class_t; */
 
 /*   int ret_value = 0; */
@@ -769,20 +769,20 @@ done:
 /*     HDfree(c_src_name); */
 /*   if(c_dest_name) */
 /*     HDfree(c_dest_name); */
-  
+
 /*   return ret_value; */
 /* } */
 
 /*----------------------------------------------------------------------------
  * Name:        h5lget_val_c
  * Purpose:     Call H5Lget_val_c
- * Inputs: 
+ * Inputs:
  *               link_loc_id - File or group identifier.
  *                 link_name - Link whose value is to be returned.
  *             link_name_len - length of link_name
  *                      size - Maximum number of characters of link value to be returned.
  *                  lapl_id  - List access property list identifier
- * Outputs:   
+ * Outputs:
  *             linkval_buff  - The buffer to hold the returned link value.
  *
  * Returns:      0 on success, -1 on failure
@@ -791,7 +791,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, 
+nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
 	      void *linkval_buff, hid_t_f *lapl_id)
 {
   int_f ret_value = 0;       /* Return value */
diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90
index 10c8e35..d75009f 100644
--- a/fortran/src/H5Lff.f90
+++ b/fortran/src/H5Lff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5L functions.
@@ -23,7 +23,7 @@ MODULE H5L
 CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5lcopy_f 
+! Name:		h5lcopy_f
 !
 ! Purpose: 	Copies a link from one location to another.
 !
@@ -34,11 +34,11 @@ CONTAINS
 !      dest_name - Name to be assigned to the NEW copy
 !         loc_id - Identifier of the file or group containing the object
 !           name - Name of the link to delete
-! 
-! Outputs: 
+!
+! Outputs:
 !         hdferr - error code:
 !			Success:  0
-!			Failure: -1   
+!			Failure: -1
 ! Optional parameters:
 !        lcpl_id - Link creation property list identifier
 !        lapl_id - Link access property list identifier
@@ -48,10 +48,10 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
   SUBROUTINE h5lcopy_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, &
-       lcpl_id, lapl_id) 
+       lcpl_id, lapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -64,17 +64,17 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: dest_loc_id ! Location identifier specifying the destination of the copy
     CHARACTER(LEN=*), INTENT(IN) :: dest_name ! Name to be assigned to the NEW copy
 
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
-    
+
     INTEGER(HID_T) :: lcpl_id_default
     INTEGER(HID_T) :: lapl_id_default
 
     INTEGER(SIZE_T) :: src_namelen
     INTEGER(SIZE_T) :: dest_namelen
-    
+
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -89,10 +89,10 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: src_name
          INTEGER(HID_T), INTENT(IN) :: dest_loc_id
          CHARACTER(LEN=*), INTENT(IN) :: dest_name
-         
+
          INTEGER(HID_T) :: lcpl_id_default
          INTEGER(HID_T) :: lapl_id_default
-         
+
          INTEGER(SIZE_T) :: src_namelen
          INTEGER(SIZE_T) :: dest_namelen
        END FUNCTION h5lcopy_c
@@ -112,18 +112,18 @@ CONTAINS
   END SUBROUTINE h5lcopy_f
 
 !----------------------------------------------------------------------
-! Name:		h5ldelete_f 
+! Name:		h5ldelete_f
 !
 ! Purpose: 	Removes a link from a group.
 !
-! Inputs:  
+! Inputs:
 !         loc_id   - Identifier of the file or group containing the object
 !         name     - Name of the link to delete
-! 
-! Outputs: 
-!		hdferr:		- error code		
+!
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !         lapl_id  - Link access property list identifier
 !
@@ -132,9 +132,9 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  SUBROUTINE h5ldelete_f(loc_id, name, hdferr, lapl_id) 
+  SUBROUTINE h5ldelete_f(loc_id, name, hdferr, lapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -144,12 +144,12 @@ CONTAINS
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id  ! Identifier of the file or group containing the object
     CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of the link to delete
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
     INTEGER(HID_T) :: lapl_id_default
     INTEGER(SIZE_T) :: namelen
-    
+
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -173,10 +173,10 @@ CONTAINS
 
     hdferr = h5ldelete_c(loc_id, name, namelen, lapl_id_default)
 
-  END SUBROUTINE h5ldelete_f 
+  END SUBROUTINE h5ldelete_f
 
 !----------------------------------------------------------------------
-! Name:		H5Lcreate_soft_f 
+! Name:		H5Lcreate_soft_f
 !
 ! Purpose: 	Creates a soft link to an object.
 !
@@ -184,11 +184,11 @@ CONTAINS
 !       target_path - Path to the target object, which is not required to exist.
 !       link_loc_id - The file or group identifier for the new link.
 !       link_name   - The name of the new link.
-! 
-! Outputs: 
-!		hdferr:		- error code		
+!
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !       lcpl_id     - Link creation property list identifier.
 !       lapl_id     - Link access property list identifier.
@@ -198,9 +198,9 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  SUBROUTINE h5lcreate_soft_f(target_path, link_loc_id, link_name, hdferr, lcpl_id, lapl_id) 
+  SUBROUTINE h5lcreate_soft_f(target_path, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -211,13 +211,13 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(IN) :: target_path     ! Path to the target object, which is not required to exist.
     INTEGER(HID_T), INTENT(IN) :: link_loc_id     ! The file or group identifier for the new link.
     CHARACTER(LEN=*), INTENT(IN) :: link_name       ! The name of the new link.
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier.
 
-    INTEGER(HID_T) :: lcpl_id_default 
-    INTEGER(HID_T) :: lapl_id_default     
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
     INTEGER(SIZE_T) :: target_path_len
     INTEGER(SIZE_T) :: link_name_len
 
@@ -258,7 +258,7 @@ CONTAINS
   END SUBROUTINE h5lcreate_soft_f
 
 !----------------------------------------------------------------------
-! Name:		H5Lcreate_hard_f 
+! Name:		H5Lcreate_hard_f
 !
 ! Purpose: 	Creates a hard link to an object.
 !
@@ -268,11 +268,11 @@ CONTAINS
 !      obj_name - Name of the target object, which must already exist.
 !   link_loc_id - The file or group identifier for the new link.
 !     link_name - The name of the new link.
-! 
-! Outputs: 
-!		hdferr:		- error code		
+!
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !       lcpl_id     - Link creation property list identifier.
 !       lapl_id     - Link access property list identifier.
@@ -282,9 +282,9 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  SUBROUTINE h5lcreate_hard_f(obj_loc_id, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id) 
+  SUBROUTINE h5lcreate_hard_f(obj_loc_id, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -297,23 +297,23 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: link_loc_id ! The file or group identifier for the new link.
     CHARACTER(LEN=*), INTENT(IN) :: link_name ! The name of the new link.
 
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
 
     INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lcpl_id         ! Link creation property list identifier.
     INTEGER(HID_T), OPTIONAL, INTENT(IN) ::   lapl_id         ! Link access property list identifier.
 
-    INTEGER(HID_T) :: lcpl_id_default 
+    INTEGER(HID_T) :: lcpl_id_default
     INTEGER(HID_T) :: lapl_id_default
-   
-    INTEGER(SIZE_T) :: obj_namelen 
+
+    INTEGER(SIZE_T) :: obj_namelen
     INTEGER(SIZE_T) :: link_namelen
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
        INTEGER FUNCTION h5lcreate_hard_c(obj_loc_id, obj_name, obj_namelen, &
-            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default) 
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
 
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
@@ -323,13 +323,13 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: obj_name
          INTEGER(HID_T), INTENT(IN) :: link_loc_id
          CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER(SIZE_T) :: obj_namelen 
+         INTEGER(SIZE_T) :: obj_namelen
          INTEGER(SIZE_T) :: link_namelen
          INTEGER(HID_T) :: lcpl_id_default
          INTEGER(HID_T) :: lapl_id_default
        END FUNCTION h5lcreate_hard_c
     END INTERFACE
-    obj_namelen = LEN(obj_name) 
+    obj_namelen = LEN(obj_name)
     link_namelen = LEN(link_name)
 
     lcpl_id_default = H5P_DEFAULT_F
@@ -343,22 +343,22 @@ CONTAINS
   END SUBROUTINE h5lcreate_hard_f
 
 !----------------------------------------------------------------------
-! Name:		H5Lcreate_external_f 
+! Name:		H5Lcreate_external_f
 !
 ! Purpose: 	Creates a soft link to an object in a different file.
 !
 ! Inputs:
 !
-!    file_name - Name of the file containing the target object. Neither the file nor the target object is 
+!    file_name - Name of the file containing the target object. Neither the file nor the target object is
 !                required to exist. May be the file the link is being created in.
 !     obj_name - Path within the target file to the target object.
 !  link_loc_id - The file or group identifier for the new link.
 !    link_name - The name of the new link.
-! 
-! Outputs: 
-!		hdferr:	- error code		
+!
+! Outputs:
+!		hdferr:	- error code
 !  		            Success:  0
-!		            Failure: -1   
+!		            Failure: -1
 ! Optional parameters:
 !       lcpl_id     - Link creation property list identifier.
 !       lapl_id     - Link access property list identifier.
@@ -368,9 +368,9 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  SUBROUTINE h5lcreate_external_f(file_name, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id) 
+  SUBROUTINE h5lcreate_external_f(file_name, obj_name, link_loc_id, link_name, hdferr, lcpl_id, lapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -378,31 +378,31 @@ CONTAINS
 !DEC$endif
 !
     IMPLICIT NONE
-    CHARACTER(LEN=*), INTENT(IN) :: file_name  ! Name of the file containing the target object. Neither 
-                                              ! the file nor the target object is required to exist. 
+    CHARACTER(LEN=*), INTENT(IN) :: file_name  ! Name of the file containing the target object. Neither
+                                              ! the file nor the target object is required to exist.
                                               ! May be the file the link is being created in.
     CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of the target object, which must already exist.
     INTEGER(HID_T), INTENT(IN) :: link_loc_id ! The file or group identifier for the new link.
     CHARACTER(LEN=*), INTENT(IN) :: link_name ! The name of the new link.
 
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code: 
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
 
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier.
 
-    INTEGER(HID_T) :: lcpl_id_default 
+    INTEGER(HID_T) :: lcpl_id_default
     INTEGER(HID_T) :: lapl_id_default
-   
+
     INTEGER(SIZE_T) :: file_namelen
-    INTEGER(SIZE_T) :: obj_namelen 
+    INTEGER(SIZE_T) :: obj_namelen
     INTEGER(SIZE_T) :: link_namelen
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
        INTEGER FUNCTION h5lcreate_external_c(file_name, file_namelen, obj_name, obj_namelen, &
-            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default) 
+            link_loc_id, link_name, link_namelen, lcpl_id_default, lapl_id_default)
 
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
@@ -412,15 +412,15 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: obj_name
          INTEGER(HID_T), INTENT(IN) :: link_loc_id
          CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER(SIZE_T) :: file_namelen 
-         INTEGER(SIZE_T) :: obj_namelen 
+         INTEGER(SIZE_T) :: file_namelen
+         INTEGER(SIZE_T) :: obj_namelen
          INTEGER(SIZE_T) :: link_namelen
          INTEGER(HID_T) :: lcpl_id_default
          INTEGER(HID_T) :: lapl_id_default
        END FUNCTION h5lcreate_external_c
     END INTERFACE
-    file_namelen = LEN(file_name) 
-    obj_namelen = LEN(obj_name) 
+    file_namelen = LEN(file_name)
+    obj_namelen = LEN(obj_name)
     link_namelen = LEN(link_name)
 
     lcpl_id_default = H5P_DEFAULT_F
@@ -434,10 +434,10 @@ CONTAINS
   END SUBROUTINE h5lcreate_external_f
 
 !----------------------------------------------------------------------
-! Name:		h5ldelete_by_idx_f 
+! Name:		h5ldelete_by_idx_f
 !
 ! Purpose:  	Removes the nth link in a group.
-! Inputs:  	
+! Inputs:
 !		loc_id     - File or group identifier specifying location of subject group
 !               group_name - Name of subject group
 !               index_field   - Type of index; Possible values are:
@@ -446,7 +446,7 @@ CONTAINS
 !                  H5_INDEX_NAME_F          - Index on names
 !                  H5_INDEX_CRT_ORDER_F     - Index on creation order
 !                  H5_INDEX_N_F	            - Number of indices defined
-!                             
+!
 !               order - Order within field or index; Possible values are:
 !
 !                  H5_ITER_UNKNOWN_F   - Unknown order
@@ -457,26 +457,26 @@ CONTAINS
 !
 !               n           - Link for which to retrieve information
 ! Outputs:
-!		hdferr:     - error code		
+!		hdferr:     - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !               lapl_id    - Link access property list
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 29, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
-  SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id) 
+  SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5ldelete_by_idx_f
 !DEC$endif
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: loc_id       ! Identifer for object to which attribute is attached
-    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of object, relative to location, 
+    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of object, relative to location,
                                                !  from which attribute is to be removed
     INTEGER, INTENT(IN) :: index_field         ! Type of index; Possible values are:
                                                !    H5_INDEX_UNKNOWN_F   - Unknown index type
@@ -489,14 +489,14 @@ CONTAINS
                                                !    H5_ITER_DEC_F      - Decreasing order
                                                !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
                                                !    H5_ITER_N_F	    - Number of iteration orders
-    INTEGER(HSIZE_T), INTENT(IN) :: n      ! Offset within index 
+    INTEGER(HSIZE_T), INTENT(IN) :: n      ! Offset within index
     INTEGER, INTENT(OUT) :: hdferr         ! Error code:
                                            ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id     ! Link access property list
 
     INTEGER(HID_T) :: lapl_id_default
     INTEGER(SIZE_T) :: group_namelen
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -510,7 +510,7 @@ CONTAINS
          CHARACTER(LEN=*), INTENT(IN) :: group_name
          INTEGER, INTENT(IN) :: index_field
          INTEGER, INTENT(IN) :: order
-         INTEGER(HSIZE_T), INTENT(IN) :: n 
+         INTEGER(HSIZE_T), INTENT(IN) :: n
          INTEGER(HID_T) :: lapl_id_default
          INTEGER(SIZE_T) :: group_namelen
        END FUNCTION h5ldelete_by_idx_c
@@ -518,31 +518,31 @@ CONTAINS
 
     lapl_id_default = H5P_DEFAULT_F
     IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
-    
+
     group_namelen = LEN(group_name)
     hdferr = h5ldelete_by_idx_c(loc_id, group_name, group_namelen, index_field, order, n, lapl_id_default)
-    
+
   END SUBROUTINE h5ldelete_by_idx_f
 
 !----------------------------------------------------------------------
-! Name:	        H5Lexists_f	
+! Name:	        H5Lexists_f
 !
 ! Purpose:  	Check if a link with a particular name exists in a group.
-!		
+!
 ! Inputs:
 !      loc_id - Identifier of the file or group to query.
 !        name - Link name to check
 !
 ! Outputs:
 !   link_exists  - link exists status (.TRUE.,.FALSE.)
-!        hdferr  - error code		
+!        hdferr  - error code
 !	              Success:  0
-!		      Failure: -1 
+!		      Failure: -1
 ! Optional parameters:
-!	 lapl_id - Link access property list identifier.		
+!	 lapl_id - Link access property list identifier.
 !
 ! Programmer:	M. S. Breitenfeld
-!		February 29, 2008	
+!		February 29, 2008
 !
 ! Modifications:  N/A
 !
@@ -560,7 +560,7 @@ CONTAINS
     LOGICAL, INTENT(OUT) :: link_exists   ! .TRUE. if exists, .FALSE. otherwise
     INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id 
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id
                                           ! Link access property list identifier.
     INTEGER :: link_exists_c
     INTEGER(HID_T) :: lapl_id_default
@@ -579,7 +579,7 @@ CONTAINS
          INTEGER(SIZE_T), INTENT(IN) :: namelen
          INTEGER, INTENT(OUT) :: link_exists_c
          INTEGER(HID_T) :: lapl_id_default
-         
+
        END FUNCTION h5lexists_c
     END INTERFACE
 
@@ -591,7 +591,7 @@ CONTAINS
     hdferr = h5lexists_c(loc_id, name, namelen, lapl_id_default, link_exists_c)
 
     link_exists = .FALSE.
-    IF(link_exists_c.GT.0) link_exists = .TRUE. 
+    IF(link_exists_c.GT.0) link_exists = .TRUE.
 
   END SUBROUTINE h5lexists_f
 
@@ -600,13 +600,13 @@ CONTAINS
 !
 ! Purpose:  	Returns information about a link.
 !
-! Inputs:  
+! Inputs:
 !		link_loc_id - File or group identifier.
-!               link_name - Name of the link for which information is being sought  
+!               link_name - Name of the link for which information is being sought
 !
 ! Outputs:  NOTE: In C these are contained in the structure H5L_info_t
 !
-!              cset - indicates the character set used for link’s name. 
+!              cset - indicates the character set used for link’s name.
 !      corder - specifies the link’s creation order position.
 !corder_valid - indicates whether the value in corder is valid.
 !         link_type -  specifies the link class:
@@ -616,14 +616,14 @@ CONTAINS
 !     	                H5L_LINK_ERROR_ F    - Error
 !           address - If the link is a hard link, address specifies the file address that the link points to
 !          val_size - If the link is a symbolic link, val_size will be the length of the link value
-!            hdferr - error code		
+!            hdferr - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!      lapl_id - Link access property list		
+!      lapl_id - Link access property list
 !
 ! Programmer:	M. S. Breitenfeld
-!		February 29, 2008	
+!		February 29, 2008
 !
 ! Modifications:  N/A
 !
@@ -631,7 +631,7 @@ CONTAINS
 
   SUBROUTINE h5lget_info_f(link_loc_id, link_name, &
        cset, corder, f_corder_valid, link_type, address, val_size, &
-       hdferr, lapl_id) 
+       hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5lget_info_f
@@ -640,9 +640,9 @@ CONTAINS
 
     INTEGER(HID_T), INTENT(IN) :: link_loc_id ! File or group identifier.
     CHARACTER(LEN=*), INTENT(IN) :: link_name ! Name of the link for which information is being sought
- 
+
 ! Outputs:  NOTE: In C these are contained in the structure H5L_info_t
-    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the link’s name. 
+    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the link’s name.
     INTEGER, INTENT(OUT) :: corder ! Specifies the link’s creation order position.
     LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the value in corder is valid.
     INTEGER, INTENT(OUT) :: link_type ! Specifies the link class:
@@ -672,7 +672,7 @@ CONTAINS
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: link_loc_id
          CHARACTER(LEN=*), INTENT(IN) :: link_name
-         INTEGER, INTENT(OUT) :: cset 
+         INTEGER, INTENT(OUT) :: cset
          INTEGER, INTENT(OUT) :: corder
          INTEGER, INTENT(OUT) :: link_type
          INTEGER, INTENT(OUT) :: address
@@ -692,7 +692,7 @@ CONTAINS
          cset, corder, corder_valid, link_type, &
          address, val_size, &
          lapl_id_default)
-    
+
     f_corder_valid =.FALSE.
     IF(corder_valid .EQ. 1) f_corder_valid =.TRUE.
 
@@ -702,7 +702,7 @@ CONTAINS
 ! Name:	   h5lget_info_by_idx_f
 !
 ! Purpose:  Retrieves metadata for a link in a group, according to the order within a field or index.
-!		
+!
 ! Inputs:
 !	loc_id - File or group identifier specifying location of subject group
 !   group_name - Name of subject group
@@ -712,29 +712,29 @@ CONTAINS
 !
 ! Outputs:  NOTE: In C these are defined as a structure: H5L_info_t
 !    corder_valid   - indicates whether the creation order data is valid for this attribute
-!    corder         - is a positive integer containing the creation order of the attribute        
-!    cset           - indicates the character set used for the attribute’s name          
-!    data_size      - indicates the size, in the number of characters, of the attribute	
-!    hdferr         - error code		
+!    corder         - is a positive integer containing the creation order of the attribute
+!    cset           - indicates the character set used for the attribute’s name
+!    data_size      - indicates the size, in the number of characters, of the attribute
+!    hdferr         - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!      lapl_id - Link access property list		
+!      lapl_id - Link access property list
 !
 ! Programmer: M.S. Breitenfeld
-!	      February 29, 2008	
+!	      February 29, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
   SUBROUTINE h5lget_info_by_idx_f(loc_id, group_name, index_field, order, n, &
-       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5lget_info_by_idx_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group  
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group
     CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
     INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
                                         !    H5_INDEX_UNKNOWN_F   - Unknown index type
@@ -747,7 +747,7 @@ CONTAINS
                                         !    H5_ITER_DEC_F      - Decreasing order
                                         !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
     INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
-    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
     INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
     INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
     INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -767,7 +767,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_INFO_BY_IDX_C'::h5lget_info_by_idx_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id 
+         INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: group_name
          INTEGER(SIZE_T)  :: group_namelen
          INTEGER, INTENT(IN) :: index_field
@@ -795,29 +795,29 @@ CONTAINS
   END SUBROUTINE h5lget_info_by_idx_f
 
 !----------------------------------------------------------------------
-! Name:	   h5lis_registered_f 
+! Name:	   h5lis_registered_f
 !
 ! Purpose:  Determines whether a class of user-defined links is registered.
-!		
+!
 ! Inputs:
 !      link_cls_id - User-defined link class identifier
 !
 ! Outputs:
 !       registered - .TRUE. - if the link class has been registered
 !                    .FALSE. - if it is unregistered
-!           hdferr - Error code		
+!           hdferr - Error code
 !		       Success:  0
-!	               Failure: -1   
+!	               Failure: -1
 ! Optional parameters:
-!                      None		
+!                      None
 !
 ! Programmer: M.S. Breitenfeld
-!	      February 29, 2008	
+!	      February 29, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
-  SUBROUTINE h5lis_registered_f(link_cls_id, registered, hdferr) 
+  SUBROUTINE h5lis_registered_f(link_cls_id, registered, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5lis_registered_f
@@ -848,35 +848,35 @@ CONTAINS
     ELSE IF(hdferr.EQ.0)THEN
        registered = .FALSE.
     ENDIF
-       
+
   END SUBROUTINE h5lis_registered_f
 
 !----------------------------------------------------------------------
 ! Name:	   h5lmove_f
 !
 ! Purpose:  Renames a link within an HDF5 file.
-!		
+!
 ! Inputs:
 !    src_loc_id  - Original file or group identifier.
 !    src_name    - Original link name.
 !    dest_loc_id - Destination file or group identifier.
 !    dest_name   - NEW link name.
 !
-! Outputs: 
-!         hdferr - Error code		
+! Outputs:
+!         hdferr - Error code
 !		     Success:  0
-!	             Failure: -1   
+!	             Failure: -1
 ! Optional parameters:
 !    lcpl_id  - Link creation property list identifier to be associated WITH the NEW link.
 !    lapl_id  - Link access property list identifier to be associated WITH the NEW link.
 !
 ! Programmer: M.S. Breitenfeld
-!	      March 3, 2008	
+!	      March 3, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
-  SUBROUTINE h5lmove_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, lcpl_id, lapl_id) 
+  SUBROUTINE h5lmove_f(src_loc_id, src_name, dest_loc_id, dest_name, hdferr, lcpl_id, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5lmove_f
@@ -888,37 +888,37 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(IN) :: dest_name ! NEW link name.
     INTEGER, INTENT(OUT) :: hdferr     ! Error code:
                                               ! 0 on success and -1 on failure
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier 
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier
                                                     ! to be associated WITH the NEW link.
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier 
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list identifier
                                                     ! to be associated WITH the NEW link.
 
     INTEGER(SIZE_T) :: src_namelen
     INTEGER(SIZE_T) :: dest_namelen
 
-    INTEGER(HID_T) :: lcpl_id_default 
-    INTEGER(HID_T) :: lapl_id_default 
-    
+    INTEGER(HID_T) :: lcpl_id_default
+    INTEGER(HID_T) :: lapl_id_default
+
 !
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
        INTEGER FUNCTION h5lmove_c(src_loc_id, src_name, src_namelen, dest_loc_id, &
-            dest_name, dest_namelen, lcpl_id_default, lapl_id_default) 
+            dest_name, dest_namelen, lcpl_id_default, lapl_id_default)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LMOVE_C'::h5lmove_c
          !DEC$ ENDIF
 
-         INTEGER(HID_T), INTENT(IN) :: src_loc_id 
+         INTEGER(HID_T), INTENT(IN) :: src_loc_id
          CHARACTER(LEN=*), INTENT(IN) :: src_name
          INTEGER(SIZE_T) :: src_namelen
          INTEGER(HID_T), INTENT(IN) :: dest_loc_id
          CHARACTER(LEN=*), INTENT(IN) :: dest_name
          INTEGER(SIZE_T) :: dest_namelen
-         
-         INTEGER(HID_T) :: lcpl_id_default 
-         INTEGER(HID_T) :: lapl_id_default 
+
+         INTEGER(HID_T) :: lcpl_id_default
+         INTEGER(HID_T) :: lapl_id_default
 
        END FUNCTION h5lmove_c
     END INTERFACE
@@ -941,16 +941,16 @@ CONTAINS
 !
 ! Purpose:      Retrieves name of the nth link in a group, according to the order within a specified field or index.
 !
-! Inputs:  
+! Inputs:
 !   loc_id      - File or group identifier specifying location of subject group
 !   group_name  - Name of subject group
 !   index_field - Index or field which determines the order
 !   order       - Order within field or index
 !   n           - Link for which to retrieve information
 !
-! Outputs:  
+! Outputs:
 !   name        - Buffer in which link value is returned
-!   hdferr      - error code		
+!   hdferr      - error code
 !		      Success:  0
 !		      Failure: -1
 !
@@ -959,19 +959,19 @@ CONTAINS
 !    size       - Maximum number of characters of link value to be returned.
 !
 ! Programmer:	M. S. Breitenfeld
-!		March 10, 2008	
+!		March 10, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
   SUBROUTINE h5lget_name_by_idx_f(loc_id, group_name, index_field, order, n, &
-        name, hdferr, size, lapl_id) 
+        name, hdferr, size, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5lget_name_by_idx_f
 !DEC$endif
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier specifying location of subject group  
+    INTEGER(HID_T), INTENT(IN) :: loc_id       ! File or group identifier specifying location of subject group
     CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
     INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
                                         !    H5_INDEX_UNKNOWN_F   - Unknown index type
@@ -987,12 +987,12 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(OUT) :: name ! Buffer in which link value is returned
     INTEGER, INTENT(OUT) :: hdferr        ! Error code:
                                           ! 0 on success and -1 on failure
-                     
+
     INTEGER(SIZE_T)  :: group_namelen
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
     INTEGER(HID_T) :: lapl_id_default
     INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! Indicates the size, in the number of characters, of the link
-    INTEGER(SIZE_T) :: size_default 
+    INTEGER(SIZE_T) :: size_default
 
 
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1004,7 +1004,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_NAME_BY_IDX_C'::h5lget_name_by_idx_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: loc_id 
+         INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: group_name
          INTEGER(SIZE_T)  :: group_namelen
          INTEGER, INTENT(IN) :: index_field
@@ -1041,7 +1041,7 @@ CONTAINS
 !!$!               an index.  For symbolic links, this is the path to which the
 !!$!               link points, including the null terminator.  For user-defined
 !!$!               links, it is the link buffer.
-!!$! Inputs:  
+!!$! Inputs:
 !!$!   loc_id      - File or group identifier specifying location of subject group
 !!$!   group_name  - Name of subject group
 !!$!   index_field - Index or field which determines the order
@@ -1051,29 +1051,29 @@ CONTAINS
 !!$!
 !!$! Outputs:  NOTE: In C these are defined as a structure: H5L_info_t
 !!$!    corder_valid   - indicates whether the creation order data is valid for this attribute
-!!$!    corder         - is a positive integer containing the creation order of the attribute        
-!!$!    cset           - indicates the character set used for the attribute’s name          
-!!$!    data_size      - indicates the size, in the number of characters, of the attribute	
-!!$!    hdferr         - error code		
+!!$!    corder         - is a positive integer containing the creation order of the attribute
+!!$!    cset           - indicates the character set used for the attribute’s name
+!!$!    data_size      - indicates the size, in the number of characters, of the attribute
+!!$!    hdferr         - error code
 !!$!				 Success:  0
-!!$!				 Failure: -1   
+!!$!				 Failure: -1
 !!$! Optional parameters:
 !!$!    lapl_id      - List access property list identifier.
 !!$!
 !!$! Programmer:	M. S. Breitenfeld
-!!$!		March 3, 2008	
+!!$!		March 3, 2008
 !!$!
 !!$! Modifications:  N/A
 !!$!
 !!$!----------------------------------------------------------------------
 !!$  SUBROUTINE h5lget_val_by_idx_f(loc_id, group_name, index_field, order, n, &
-!!$       f_corder_valid, corder, cset, data_size, hdferr, lapl_id) 
+!!$       f_corder_valid, corder, cset, data_size, hdferr, lapl_id)
 !!$!This definition is needed for Windows DLLs
 !!$!DEC$if defined(BUILD_HDF5_DLL)
 !!$!DEC$attributes dllexport :: h5lget_val_by_idx_f
 !!$!DEC$endif
 !!$    IMPLICIT NONE
-!!$    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group  
+!!$    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier specifying location of subject group
 !!$    CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of subject group
 !!$    INTEGER, INTENT(IN) :: index_field  ! Index or field which determines the order
 !!$                                        !    H5_INDEX_UNKNOWN_F   - Unknown index type
@@ -1086,7 +1086,7 @@ CONTAINS
 !!$                                        !    H5_ITER_DEC_F      - Decreasing order
 !!$                                        !    H5_ITER_NATIVE_F   - No particular order, whatever is fastest
 !!$    INTEGER(HSIZE_T), INTENT(IN) :: n   ! Attribute’s position in index
-!!$    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+!!$    LOGICAL, INTENT(OUT) :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
 !!$    INTEGER, INTENT(OUT) :: corder ! Is a positive integer containing the creation order of the attribute
 !!$    INTEGER, INTENT(OUT) :: cset ! Indicates the character set used for the attribute’s name
 !!$    INTEGER(HSIZE_T), INTENT(OUT) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -1106,7 +1106,7 @@ CONTAINS
 !!$         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
 !!$         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LGET_VAL_BY_IDX_C'::h5lget_val_by_idx_c
 !!$         !DEC$ ENDIF
-!!$         INTEGER(HID_T), INTENT(IN) :: loc_id 
+!!$         INTEGER(HID_T), INTENT(IN) :: loc_id
 !!$         CHARACTER(LEN=*), INTENT(IN) :: group_name
 !!$         INTEGER(SIZE_T)  :: group_namelen
 !!$         INTEGER, INTENT(IN) :: index_field
@@ -1130,7 +1130,7 @@ CONTAINS
 !!$
 !!$    f_corder_valid =.FALSE.
 !!$    IF (corder_valid .EQ. 1) f_corder_valid =.TRUE.
-!!$    
+!!$
 !!$  END SUBROUTINE h5lget_val_by_idx_f
 
 
@@ -1140,28 +1140,28 @@ CONTAINS
 !
 ! Purpose:  	Returns the value of a symbolic link.
 !
-! Inputs:  
+! Inputs:
 !   link_loc_id  - File or group identifier.
 !   link_name    - Link whose value is to be returned.
 !   size         - Maximum number of characters of link value to be returned.
 !
-! Outputs:  
+! Outputs:
 !   linkval_buff - The buffer to hold the returned link value.
-!         hdferr - error code		
+!         hdferr - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !    lapl_id      - List access property list identifier.
 !
 ! Programmer:	M. S. Breitenfeld
-!		March 3, 2008	
+!		March 3, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
 !!$  SUBROUTINE h5lget_val_f(link_loc_id, link_name, size, linkval_buff,   &
-!!$       hdferr, lapl_id) 
+!!$       hdferr, lapl_id)
 !!$!This definition is needed for Windows DLLs
 !!$!DEC$if defined(BUILD_HDF5_DLL)
 !!$!DEC$attributes dllexport :: h5lget_val_f
@@ -1170,18 +1170,18 @@ CONTAINS
 !!$    INTEGER(HID_T), INTENT(IN) :: link_loc_id  ! File or group identifier.
 !!$    CHARACTER(LEN=*), INTENT(IN) :: link_name  ! Link whose value is to be returned.
 !!$    INTEGER(SIZE_T), INTENT(IN) :: size        !  Maximum number of characters of link value to be returned.
-!!$    
+!!$
 !!$    CHARACTER(LEN=size), INTENT(OUT) :: linkval_buff ! The buffer to hold the returned link value.
 !!$    INTEGER, INTENT(OUT) :: hdferr       ! Error code:
 !!$    ! 0 on success and -1 on failure
 !!$    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Link access property list
-!!$    
+!!$
 !!$    INTEGER :: link_namelen
 !!$    INTEGER(HID_T) :: lapl_id_default
 !!$    INTEGER :: corder_valid
 !!$
-!!$    INTEGER :: link_namelen 
-!!$    INTEGER(HID_T) :: lapl_id_default 
+!!$    INTEGER :: link_namelen
+!!$    INTEGER(HID_T) :: lapl_id_default
 !!$
 !!$!  MS FORTRAN needs explicit interface for C functions called here.
 !!$!
@@ -1194,9 +1194,9 @@ CONTAINS
 !!$         !DEC$ ENDIF
 !!$         INTEGER(HID_T), INTENT(IN) :: link_loc_id  ! File or group identifier.
 !!$         CHARACTER(LEN=*), INTENT(IN) :: link_name  ! Link whose value is to be returned.
-!!$         INTEGER :: link_namelen 
+!!$         INTEGER :: link_namelen
 !!$         INTEGER(SIZE_T), INTENT(IN) :: size        !  Maximum number of characters of link value to be returned.
-!!$         
+!!$
 !!$         CHARACTER(LEN=size), INTENT(OUT) :: linkval_buff ! The buffer to hold the returned link value.
 !!$
 !!$         INTEGER :: link_namelen
@@ -1218,60 +1218,60 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:	    H5Lregistered_f 
+! Name:	    H5Lregistered_f
 !
 ! Purpose:  Registers user-defined link class or changes behavior of existing class.
-!		
+!
 ! Inputs: NOTE: In C the following represents struct H5L_class_t:
-!     version      - Version number of this struct 
-!     class_id     - Link class identifier          
-!     comment      - Comment for debugging          
-!     create_func  - Callback during link creation  
-!     move_func    - Callback after moving link     
-!     copy_func    - Callback after copying link    
-!     trav_func    - The main traversal function    
-!     del_func     - Callback for link deletion     
-!     query_func   - Callback for queries           
+!     version      - Version number of this struct
+!     class_id     - Link class identifier
+!     comment      - Comment for debugging
+!     create_func  - Callback during link creation
+!     move_func    - Callback after moving link
+!     copy_func    - Callback after copying link
+!     trav_func    - The main traversal function
+!     del_func     - Callback for link deletion
+!     query_func   - Callback for queries
 !
 ! Outputs:
-!           hdferr - Error code		
+!           hdferr - Error code
 !		       Success:  0
-!	               Failure: -1   
+!	               Failure: -1
 ! Optional parameters:
-!                      None		
+!                      None
 !
 ! Programmer: M.S. Breitenfeld
-!	      February 29, 2008	
+!	      February 29, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 !!$  SUBROUTINE H5Lregistered_f(version, class_id, comment, create_func, &
-!!$       move_func, copy_func, trav_func, del_func, query_func, hdferr) 
+!!$       move_func, copy_func, trav_func, del_func, query_func, hdferr)
 !!$!This definition is needed for Windows DLLs
 !!$!DEC$if defined(BUILD_HDF5_DLL)
 !!$!DEC$attributes dllexport :: H5Lregistered_f
 !!$!DEC$endif
 !!$    IMPLICIT NONE
-!!$    INTEGER, INTENT(IN) :: version      ! Version number of this struct 
-!!$    INTEGER, INTENT(IN) :: class_id     ! Link class identifier          
-!!$    CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging          
-!!$    CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation  
-!!$    CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link     
-!!$    CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link    
-!!$    CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function    
-!!$    CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion     
+!!$    INTEGER, INTENT(IN) :: version      ! Version number of this struct
+!!$    INTEGER, INTENT(IN) :: class_id     ! Link class identifier
+!!$    CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging
+!!$    CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation
+!!$    CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link
+!!$    CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link
+!!$    CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function
+!!$    CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion
 !!$    CHARACTER(LEN=*), INTENT(IN) :: query_func   ! Callback for queries
 !!$    INTEGER, INTENT(OUT) :: hdferr      ! Error code:
 !!$                                        ! 0 on success and -1 on failure
-!!$    INTEGER :: comment_len 
+!!$    INTEGER :: comment_len
 !!$    INTEGER :: create_func_len
-!!$    INTEGER :: move_func_len 
-!!$    INTEGER :: copy_func_len   
-!!$    INTEGER :: trav_func_len  
+!!$    INTEGER :: move_func_len
+!!$    INTEGER :: copy_func_len
+!!$    INTEGER :: trav_func_len
 !!$    INTEGER :: del_func_len
 !!$    INTEGER :: query_func_len
-!!$    
+!!$
 !!$!
 !!$!  MS FORTRAN needs explicit interface for C functions called here.
 !!$!
@@ -1287,33 +1287,33 @@ CONTAINS
 !!$         !DEC$ IF DEFINED(HDF5F90_WINDOWS)
 !!$         !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5LREGISTERED_C'::H5Lregistered_c
 !!$         !DEC$ ENDIF
-!!$         INTEGER, INTENT(IN) :: version      ! Version number of this struct 
-!!$         INTEGER, INTENT(IN) :: class_id     ! Link class identifier          
-!!$         CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging          
-!!$         CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation  
-!!$         CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link     
-!!$         CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link    
-!!$         CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function    
-!!$         CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion     
+!!$         INTEGER, INTENT(IN) :: version      ! Version number of this struct
+!!$         INTEGER, INTENT(IN) :: class_id     ! Link class identifier
+!!$         CHARACTER(LEN=*), INTENT(IN) :: comment      ! Comment for debugging
+!!$         CHARACTER(LEN=*), INTENT(IN) :: create_func  ! Callback during link creation
+!!$         CHARACTER(LEN=*), INTENT(IN) :: move_func    ! Callback after moving link
+!!$         CHARACTER(LEN=*), INTENT(IN) :: copy_func    ! Callback after copying link
+!!$         CHARACTER(LEN=*), INTENT(IN) :: trav_func    ! The main traversal function
+!!$         CHARACTER(LEN=*), INTENT(IN) :: del_func     ! Callback for link deletion
 !!$         CHARACTER(LEN=*), INTENT(IN) :: query_func   ! Callback for queries
 !!$         INTEGER, INTENT(OUT) :: hdferr   ! Error code:
 !!$                                          ! 0 on success and -1 on failure
-!!$         INTEGER :: comment_len 
+!!$         INTEGER :: comment_len
 !!$         INTEGER :: create_func_len
-!!$         INTEGER :: move_func_len 
-!!$         INTEGER :: copy_func_len   
-!!$         INTEGER :: trav_func_len  
+!!$         INTEGER :: move_func_len
+!!$         INTEGER :: copy_func_len
+!!$         INTEGER :: trav_func_len
 !!$         INTEGER :: del_func_len
 !!$         INTEGER :: query_func_len
-!!$         
+!!$
 !!$       END FUNCTION H5Lregistered_c
 !!$    END INTERFACE
 !!$
 !!$    comment_len     = LEN(comment)
 !!$    create_func_len = LEN(create_func)
 !!$    move_func_len   = LEN(move_func)
-!!$    copy_func_len   = LEN(copy_func)  
-!!$    trav_func_len   = LEN(trav_func)  
+!!$    copy_func_len   = LEN(copy_func)
+!!$    trav_func_len   = LEN(trav_func)
 !!$    del_func_len    = LEN(del_func)
 !!$    query_func_len  = LEN(query_func)
 !!$
@@ -1324,7 +1324,7 @@ CONTAINS
 !!$         trav_func, trav_func_len, &
 !!$         del_func, del_func_len, &
 !!$         query_func, query_func_len)
-!!$    
+!!$
 !!$  END SUBROUTINE H5Lregistered_f
 
 END MODULE H5L
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index 9a708da..5282dd6 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -21,7 +21,7 @@
 /*----------------------------------------------------------------------------
  * Name:        h5olink_c
  * Purpose:     Calls H5Olink
- * Inputs:   
+ * Inputs:
  *      object_id        - Object to be linked.
  *      new_loc_id       - File or group identifier specifying location at which object is to be linked.
  *      name             - Name of link to be created, relative to new_loc_id.
@@ -50,7 +50,7 @@ nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namele
   /*
    * Call H5Olink function.
    */
-  if((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name, 
+  if((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name,
 		       (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
     HGOTO_DONE(FAIL);
 
diff --git a/fortran/src/H5Off.f90 b/fortran/src/H5Off.f90
index c64b82d..381b307 100644
--- a/fortran/src/H5Off.f90
+++ b/fortran/src/H5Off.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,30 +11,30 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5O functions.
 !
 MODULE H5O
-       
+
   USE H5GLOBAL
-     
+
 CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5olink_f 
+! Name:		h5olink_f
 !
 ! Purpose:  	Creates a hard link to an object in an HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !      object_id     - Object to be linked.
 !      new_loc_id    - File or group identifier specifying location at which object is to be linked.
 !      new_link_name - Name of link to be created, relative to new_loc_id.
-! Outputs: 
-!      hdferr:       - error code		
+! Outputs:
+!      hdferr:       - error code
 !	                Success:  0
-!			Failure: -1   
+!			Failure: -1
 ! Optional parameters:
 !      lcpl_id       - Link creation property list identifier.
 !      lapl_id       - Link access property list identifier.
@@ -42,24 +42,24 @@ CONTAINS
 ! Programmer:	M.S. Breitenfeld
 !		April 21, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5olink_f(object_id, new_loc_id, new_link_name, hdferr, lcpl_id, lapl_id) 
+  SUBROUTINE h5olink_f(object_id, new_loc_id, new_link_name, hdferr, lcpl_id, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5olink_f
 !DEC$endif
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: object_id  ! Object to be linked
-    INTEGER(HID_T), INTENT(IN) :: new_loc_id ! File or group identifier specifying 
+    INTEGER(HID_T), INTENT(IN) :: new_loc_id ! File or group identifier specifying
                                              ! location at which object is to be linked.
     CHARACTER(LEN=*), INTENT(IN) :: new_link_name ! Name of link to be created, relative to new_loc_id.
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code 		
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
                                           !   Success:  0
-                                          !   Failure: -1  
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.  
+                                          !   Failure: -1
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier.
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link creation property list identifier.
     INTEGER(HID_T) :: lapl_id_default
     INTEGER(HID_T) :: lcpl_id_default
@@ -95,29 +95,29 @@ CONTAINS
   END SUBROUTINE h5olink_f
 
 !----------------------------------------------------------------------
-! Name:		h5oopen_f 
+! Name:		h5oopen_f
 !
 ! Purpose:  	Opens an object in an HDF5 file by location identifier and path name.O
 !
-! Inputs:  
+! Inputs:
 !           loc_id - File or group identifier
 !             name - Path to the object, relative to loc_id.
-! Outputs: 
-!           obj_id - Object identifier for the opened object 
-!      hdferr:     - error code		
+! Outputs:
+!           obj_id - Object identifier for the opened object
+!      hdferr:     - error code
 !	                Success:  0
-!			Failure: -1   
+!			Failure: -1
 ! Optional parameters:
 !          lapl_id - Access property list identifier for the link pointing to the object
 !
 ! Programmer:	M.S. Breitenfeld
 !		April 18, 2008
 !
-! Modifications: N/A 
+! Modifications: N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5oopen_f(loc_id, name, obj_id, hdferr, lapl_id) 
+  SUBROUTINE h5oopen_f(loc_id, name, obj_id, hdferr, lapl_id)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5oopen_f
@@ -126,9 +126,9 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
     CHARACTER(LEN=*), INTENT(IN) :: name  ! Path to the object, relative to loc_id
     INTEGER(HID_T), INTENT(OUT) :: obj_id ! Object identifier for the opened object
-    INTEGER, INTENT(OUT) :: hdferr        ! Error code 		
+    INTEGER, INTENT(OUT) :: hdferr        ! Error code
                                           !   Success:  0
-                                          !   Failure: -1  
+                                          !   Failure: -1
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id  ! Attribute access property list
     INTEGER(HID_T) :: lapl_id_default
 
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 02da4f2..7de67fe 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -3448,7 +3448,7 @@ nh5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_den
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_attr_creation_order_c 
+ * Name:        h5pset_attr_creation_order_c
  * Purpose:     Calls H5Ppset_attr_creation_order
  *
  * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier
@@ -3482,10 +3482,10 @@ nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags )
  *
  * Inputs:
  *       plist_id - file creation property list
- *       nindexes - Number of shared object header message indexes 
- *                   available in files created WITH this property list 
- * 
- * Outputs:     
+ *       nindexes - Number of shared object header message indexes
+ *                   available in files created WITH this property list
+ *
+ * Outputs:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              January, 2008
@@ -3519,8 +3519,8 @@ nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes )
  *          index_num - Index being configured.
  *    mesg_type_flags - Types of messages that should be stored in this index.
  *      min_mesg_size - Minimum message size.
- * 
- * Outputs:     
+ *
+ * Outputs:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              January, 2008
@@ -3733,10 +3733,10 @@ nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
  * Name:        h5pset_create_inter_group_c
  * Purpose:     Calls H5Pset_create_intermediate_group
  *
- * Inputs:   
+ * Inputs:
  *		lcpl_id - Link creation property list identifier
- *   crt_intermed_group - crt_intermed_group specifying whether 
- *                        to create intermediate groups upon the 
+ *   crt_intermed_group - crt_intermed_group specifying whether
+ *                        to create intermediate groups upon the
  *                        creation of an object
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -3854,9 +3854,9 @@ nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
    */
   ret = H5Pget_char_encoding((hid_t)*plist_id, &c_encoding);
   if (ret < 0) return ret_value;
-  
+
   *encoding = (int_f)c_encoding;
-  
+
   ret_value = 0;
   return ret_value;
 }
@@ -3887,7 +3887,7 @@ nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
    */
   ret = H5Pset_copy_object((hid_t)*ocp_plist_id, (unsigned)*copy_options);
   if (ret < 0) return ret_value;
-  
+
   ret_value = 0;
   return ret_value;
 }
@@ -3920,7 +3920,7 @@ nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
   if (ret < 0) return ret_value;
 
   *copy_options = (int_f)c_copy_options;
-  
+
   ret_value = 0;
   return ret_value;
 }
@@ -3928,14 +3928,14 @@ nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
 /*----------------------------------------------------------------------------
  * Name:        h5pget_data_transform_c
  * Purpose:     Calls H5Pget_data_transform
- * Inputs:      
+ * Inputs:
  *              prp_id - property list identifier to query
  *      expression_len - buffer size transorm expression
  *
- * Output:      
+ * Output:
  *          expression - buffer to hold transform expression
  *
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -3968,7 +3968,7 @@ nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
      if(ret < 0) return ret_value;
      /* or strlen ? */
      HD5packFstring(c_expression, _fcdtocp(expression), c_expression_len-1);
-     
+
      *size = (size_t_f)ret;
 
      ret_value = 0;
@@ -3978,14 +3978,14 @@ nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
 /*----------------------------------------------------------------------------
  * Name:        h5pset_data_transform_c
  * Purpose:     Calls H5Pset_data_transform
- * Inputs:      
- *              prp_id - property list identifier to query      
+ * Inputs:
+ *              prp_id - property list identifier to query
  *          expression - buffer to hold transform expression
  *      expression_len - buffer size transorm expression
  *
  * Output:
  *
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4020,12 +4020,12 @@ nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
 /*----------------------------------------------------------------------------
  * Name:        h5pget_local_heap_size_hint_c
  * Purpose:     Calls H5Pget_local_heap_size_hint
- * Inputs: 
+ * Inputs:
  *         gcpl_id - Group creation property list identifier
  *
  * Output:
  *       size_hint - Hint for size of local heap
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4053,13 +4053,13 @@ nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
 /*----------------------------------------------------------------------------
  * Name:        h5pget_est_link_info_c
  * Purpose:     Calls H5Pget_est_link_info
- * Inputs: 
+ * Inputs:
  *              gcpl_id - Group creation property list identifier
  *
- * Output: 
+ * Output:
  *      est_num_entries - Estimated number of links to be inserted into group
  *         est_name_len - Estimated average length of link names
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4090,13 +4090,13 @@ nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_nam
 /*----------------------------------------------------------------------------
  * Name:        h5pset_local_heap_size_hint_c
  * Purpose:     Calls H5Pset_local_heap_size_hint
- * Inputs: 
+ * Inputs:
  *         gcpl_id - Group creation property list identifier
  *       size_hint - Hint for size of local heap
  *
  * Output:
  *
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4122,13 +4122,13 @@ nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
 /*----------------------------------------------------------------------------
  * Name:        h5pset_est_link_info_c
  * Purpose:     Calls H5Pset_est_link_info
- * Inputs: 
- *              gcpl_id - Group creation property list identifier 
+ * Inputs:
+ *              gcpl_id - Group creation property list identifier
  *      est_num_entries - Estimated number of links to be inserted into group
  *         est_name_len - Estimated average length of link names
  *
  * Output:
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4155,7 +4155,7 @@ nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_nam
  * Name:        h5pset_link_phase_change_c
  * Purpose:     Calls H5Pset_link_phase_change
  *
- * Inputs:      gcpl_id     - Group creation property list identifier   
+ * Inputs:      gcpl_id     - Group creation property list identifier
  *              max_compact - Maximum number of attributes to be stored in compact storage
  *              min_dense   - Minimum number of attributes to be stored in dense storage
  * Outputs
@@ -4184,7 +4184,7 @@ nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_den
  * Name:        h5pset_fapl_direct_c
  * Purpose:     Calls H5Pset_fapl_direct
  *
- * Inputs:   
+ * Inputs:
  *    fapl_id 	 - File access property list identifier
  *    alignment  - Required memory alignment boundary
  *    block_size - File system block size
@@ -4218,7 +4218,7 @@ nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_siz
  * Name:        h5pget_fapl_direct_c
  * Purpose:     Calls H5Pget_fapl_direct
  *
- * Inputs:   
+ * Inputs:
  *    fapl_id 	 - File access property list identifier
  * Outputs:
  *    alignment  - Required memory alignment boundary
@@ -4244,7 +4244,7 @@ nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_siz
 #ifdef H5_HAVE_DIRECT
   ret = H5Pget_fapl_direct((hid_t)*fapl_id, &c_alignment, &c_block_size, &c_cbuf_size );
   if (ret < 0) return ret_value;
-  
+
   *alignment  = (size_t_f)c_alignment;
   *block_size = (size_t_f)c_block_size;
   *cbuf_size  = (size_t_f)c_cbuf_size;
@@ -4258,7 +4258,7 @@ nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_siz
  * Name:        h5pset_attr_phase_change_c
  * Purpose:     Calls H5Pset_attr_phase_change
  *
- * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier  
+ * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier
  *              max_compact     - Maximum number of attributes to be stored in compact storage
  *              min_dense       - Minimum number of attributes to be stored in dense storage
  * Outputs:
@@ -4283,7 +4283,7 @@ nh5pset_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_den
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_nbit_c 
+ * Name:        h5pset_nbit_c
  * Purpose:     Calls H5Pset_nbit
  *
  * Inputs:      plist_id - Dataset creation property list identifier
@@ -4308,10 +4308,10 @@ nh5pset_nbit_c(hid_t_f *plist_id )
   return ret_value;
 }
 /*----------------------------------------------------------------------------
- * Name:        h5pset_scaleoffset_c 
+ * Name:        h5pset_scaleoffset_c
  * Purpose:     Calls H5Pset_scaleoffset
  *
- * Inputs:    
+ * Inputs:
  *      plist_id - Dataset creation property list identifier
  *    scale_type - Flag indicating compression method.
  *  scale_factor - Parameter related to scale.
@@ -4341,9 +4341,9 @@ nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor
 
 /*----------------------------------------------------------------------------
  * Name:        h5pset_nlinks
- * Purpose:     Calls H5Pset_nlinks 
+ * Purpose:     Calls H5Pset_nlinks
  *
- * Inputs:   
+ * Inputs:
  *            lapl_id - File access property list identifier
  *             nlinks - Maximum number of links to traverse
  * Outputs:
@@ -4369,9 +4369,9 @@ nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
 
 /*----------------------------------------------------------------------------
  * Name:        h5pget_nlinks
- * Purpose:     Calls H5Pget_nlinks 
+ * Purpose:     Calls H5Pget_nlinks
  *
- * Inputs:   
+ * Inputs:
  *            lapl_id - File access property list identifier
  *
  * Outputs:
@@ -4403,9 +4403,9 @@ nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
  * Name:        h5pget_create_inter_group_c
  * Purpose:     Calls H5Pget_create_intermediate_group
  *
- * Inputs:   
+ * Inputs:
  *		lcpl_id - Link creation property list identifier
- *   crt_intermed_group - Specifying whether to create intermediate groups upon 
+ *   crt_intermed_group - Specifying whether to create intermediate groups upon
  *                        the creation of an object
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90
index 98fdc81..91157e7 100644
--- a/fortran/src/H5Pff.f90
+++ b/fortran/src/H5Pff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5P functions.
@@ -28,7 +28,7 @@
 ! End comment if on Crays
          MODULE PROCEDURE h5pset_fill_value_char
        END INTERFACE
-     
+
        INTERFACE h5pget_fill_value_f
          MODULE PROCEDURE h5pget_fill_value_integer
          MODULE PROCEDURE h5pget_fill_value_real
@@ -46,7 +46,7 @@
 ! End comment if on Crays
          MODULE PROCEDURE h5pset_char
        END INTERFACE
-     
+
        INTERFACE h5pget_f
          MODULE PROCEDURE h5pget_integer
          MODULE PROCEDURE h5pget_real
@@ -64,7 +64,7 @@
 ! End comment if on Crays
          MODULE PROCEDURE h5pregister_char
        END INTERFACE
-     
+
        INTERFACE h5pinsert_f
          MODULE PROCEDURE h5pinsert_integer
          MODULE PROCEDURE h5pinsert_real
@@ -73,22 +73,22 @@
 ! End comment if on Crays
          MODULE PROCEDURE h5pinsert_char
        END INTERFACE
-       
+
        INTERFACE h5pset_fapl_multi_f
          MODULE PROCEDURE h5pset_fapl_multi_l
          MODULE PROCEDURE h5pset_fapl_multi_s
-       END INTERFACE        
+       END INTERFACE
+
 
-     
      CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5pcreate_f 
+! Name:		h5pcreate_f
 !
-! Purpose: 	Creates a new property as an instance of a property 
+! Purpose: 	Creates a new property as an instance of a property
 !		list class.
 !
-! Inputs:  
+! Inputs:
 !		class		- type of the property class to be created.
 !				  Possible values are:
 !				  H5P_FILE_CREATE_F
@@ -96,24 +96,24 @@
 !				  H5P_DATASET_CREATE_F
 !				  H5P_DATASET_XFER_F
 !				  H5P_FILE_MOUNT_F
-! Outputs:  
+! Outputs:
 !		prp_id		- property list identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5pcreate_f(class, prp_id, hdferr) 
+          SUBROUTINE h5pcreate_f(class, prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -121,15 +121,15 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: class      ! The type of the property list 
+            INTEGER(HID_T), INTENT(IN) :: class      ! The type of the property list
                                               ! to be created. Possible values
-                                              ! are: 
+                                              ! are:
                                               !  H5P_FILE_CREATE_F
                                               !  H5P_FILE_ACCESS_F
                                               !  H5P_DATASET_CREATE_F
                                               !  H5P_DATASET_XFER_F
                                               !  H5P_FILE_MOUNT_F
-            INTEGER(HID_T), INTENT(OUT) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(OUT) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5pcreate_c
@@ -146,41 +146,41 @@
               END FUNCTION h5pcreate_c
             END INTERFACE
 
-            hdferr = h5pcreate_c(class, prp_id) 
+            hdferr = h5pcreate_c(class, prp_id)
           END SUBROUTINE h5pcreate_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_preserve_f 
+! Name:		h5pset_preserve_f
 !
-! Purpose: 	Sets the dataset transfer property list status to 
+! Purpose: 	Sets the dataset transfer property list status to
 !		TRUE or FALSE for initializing compound datatype
 !		members during write/read operations.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier
 !		flag		- status flag
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
-!                       Datatype of the flag parameter is changed from 
-!                       INTEGER to LOGICAL 
-!                               June 4, 2003 
+!			port).  March 14, 2001
+!                       Datatype of the flag parameter is changed from
+!                       INTEGER to LOGICAL
+!                               June 4, 2003
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_preserve_f(prp_id, flag, hdferr) 
+          SUBROUTINE h5pset_preserve_f(prp_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -188,10 +188,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             LOGICAL, INTENT(IN) ::  flag ! TRUE/FALSE flag to set the dataset
                                          ! transfer property for partila writing/reading
-                                         ! compound datatype 
+                                         ! compound datatype
             INTEGER, INTENT(OUT) :: hdferr    ! Error code
             INTEGER :: flag_c
 
@@ -210,38 +210,38 @@
             END INTERFACE
             flag_c = 0
             if(flag) flag_c = 1
-            hdferr = h5pset_preserve_c(prp_id, flag_c) 
+            hdferr = h5pset_preserve_c(prp_id, flag_c)
           END SUBROUTINE h5pset_preserve_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_preserve_f 
+! Name:		h5pget_preserve_f
 !
 ! Purpose: 	Checks status of the dataset transfer property list.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier
-! Outputs:  
+! Outputs:
 !		flag		- status flag
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
-!                       Datatype of the flag parameter is changed from 
-!                       INTEGER to LOGICAL 
-!                               June 4, 2003 
+!			port).  March 14, 2001
+!                       Datatype of the flag parameter is changed from
+!                       INTEGER to LOGICAL
+!                               June 4, 2003
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_preserve_f(prp_id, flag, hdferr) 
+          SUBROUTINE h5pget_preserve_f(prp_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -249,10 +249,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             LOGICAL, INTENT(OUT) ::  flag ! TRUE/FALSE flag. Shows status of the dataset's
                                          ! transfer property for partial writing/reading
-                                         ! compound datatype 
+                                         ! compound datatype
             INTEGER, INTENT(OUT) :: hdferr    ! Error code
             INTEGER :: flag_c
 
@@ -270,19 +270,19 @@
               END FUNCTION h5pget_preserve_c
             END INTERFACE
 
-            hdferr = h5pget_preserve_c(prp_id, flag_c) 
+            hdferr = h5pget_preserve_c(prp_id, flag_c)
             flag = .FALSE.
             if(flag_c .eq. 1) flag = .TRUE.
           END SUBROUTINE h5pget_preserve_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_class_f 
+! Name:		h5pget_class_f
 !
 ! Purpose: 	Returns the property list class for a property list.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier
-! Outputs:  
+! Outputs:
 !		classtype	- property list class
 !				  Possible values are:
 !				  H5P_ROOT_F
@@ -291,23 +291,23 @@
 !				  H5PE_DATASET_CREATE_F
 !				  H5P_DATASET_XFER_F
 !				  H5P_FILE_MOUNT_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_class_f(prp_id, classtype, hdferr) 
+          SUBROUTINE h5pget_class_f(prp_id, classtype, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -315,14 +315,14 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER, INTENT(OUT) :: classtype  ! The type of the property list 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER, INTENT(OUT) :: classtype  ! The type of the property list
                                               ! to be created. Possible values
-                                              ! are: 
+                                              ! are:
                                               !  H5P_ROOT_F
                                               !  H5P_FILE_CREATE_F
                                               !  H5P_FILE_ACCESS_F
-                                              !  H5PE_DATASET_CREATE_F 
+                                              !  H5PE_DATASET_CREATE_F
                                               !  H5P_DATASET_XFER_F
                                               !  H5P_FILE_MOUNT_F
             INTEGER, INTENT(OUT) :: hdferr    ! Error code
@@ -337,41 +337,41 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_CLASS_C'::h5pget_class_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(OUT) :: classtype 
+              INTEGER, INTENT(OUT) :: classtype
               END FUNCTION h5pget_class_c
             END INTERFACE
 
-            hdferr = h5pget_class_c(prp_id, classtype) 
+            hdferr = h5pget_class_c(prp_id, classtype)
           END SUBROUTINE h5pget_class_f
 
 !----------------------------------------------------------------------
-! Name:		h5pcopy_f 
+! Name:		h5pcopy_f
 !
-! Purpose: 	Copies an existing property list to create a new 
+! Purpose: 	Copies an existing property list to create a new
 !		property list
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier
-! Outputs:  
+! Outputs:
 !		new_prp_id	- new property list identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pcopy_f(prp_id, new_prp_id, hdferr) 
+          SUBROUTINE h5pcopy_f(prp_id, new_prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -379,10 +379,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(OUT) :: new_prp_id 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(OUT) :: new_prp_id
                                                 ! Identifier  of property list
-                                                ! copy  
+                                                ! copy
             INTEGER, INTENT(OUT) :: hdferr      ! Error code
 
 !            INTEGER, EXTERNAL :: h5pcopy_c
@@ -403,32 +403,32 @@
           END SUBROUTINE h5pcopy_f
 
 !----------------------------------------------------------------------
-! Name:		h5pclose_f 
+! Name:		h5pclose_f
 !
-! Purpose: 	Terminates access to a property list. 
+! Purpose: 	Terminates access to a property list.
 !
-! Inputs:  
-!		prp_id		- identifier of the property list to 
-!				  terminate access to. 
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+!		prp_id		- identifier of the property list to
+!				  terminate access to.
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pclose_f(prp_id, hdferr) 
+          SUBROUTINE h5pclose_f(prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -436,7 +436,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5pclose_c
@@ -448,7 +448,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PCLOSE_C'::h5pclose_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
               END FUNCTION h5pclose_c
             END INTERFACE
 
@@ -456,34 +456,34 @@
           END SUBROUTINE h5pclose_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_chunk_f 
+! Name:		h5pset_chunk_f
 !
-! Purpose: 	Sets the size of the chunks used to store 
-!		a chunked layout dataset. 
+! Purpose: 	Sets the size of the chunks used to store
+!		a chunked layout dataset.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- datatset creation property list identifier
 !		ndims		- number of dimensions for each chunk
 !		dims		- array with dimension sizes for each chunk
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_chunk_f(prp_id, ndims, dims, hdferr) 
+          SUBROUTINE h5pset_chunk_f(prp_id, ndims, dims, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -491,9 +491,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: ndims    ! Number of chunk dimensions
-            INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(IN) :: dims    
+            INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(IN) :: dims
                                             ! Array containing sizes of
                                             ! chunk dimensions
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -517,34 +517,34 @@
           END SUBROUTINE h5pset_chunk_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_chunk_f 
+! Name:		h5pget_chunk_f
 !
-! Purpose: 	Retrieves the size of chunks for the raw data of a 
+! Purpose: 	Retrieves the size of chunks for the raw data of a
 !		chunked layout dataset
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier
 !		ndims		- size of dims array
-! Outputs:  
+! Outputs:
 !		dims		- array with dimension sizes for each chunk
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  number of chunk dimensions
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_chunk_f(prp_id, ndims, dims, hdferr) 
+          SUBROUTINE h5pget_chunk_f(prp_id, ndims, dims, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -552,10 +552,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: ndims    ! Number of chunk dimensions to
                                             ! to return
-            INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(OUT) :: dims    
+            INTEGER(HSIZE_T), DIMENSION(ndims), INTENT(OUT) :: dims
                                             ! Array containing sizes of
                                             ! chunk dimensions
             INTEGER, INTENT(OUT) :: hdferr  ! Error code; number of
@@ -581,32 +581,32 @@
           END SUBROUTINE h5pget_chunk_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_deflate_f 
+! Name:		h5pset_deflate_f
 !
-! Purpose: 	Sets compression method and compression level. 
+! Purpose: 	Sets compression method and compression level.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier
 !		level		- compression level
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_deflate_f(prp_id, level, hdferr) 
+          SUBROUTINE h5pset_deflate_f(prp_id, level, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -614,8 +614,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER, INTENT(IN) :: level        ! Compression level 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER, INTENT(IN) :: level        ! Compression level
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_deflate_c
@@ -636,37 +636,37 @@
           END SUBROUTINE h5pset_deflate_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset(get)fill_value_f 
+! Name:		h5pset(get)fill_value_f
 !
 ! Purpose: 	Sets(gets) fill value for a dataset creation property list
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
 !		type_id		- datatype identifier for fill value
 !		fillvalue	- fill value
-! Outputs:  
+! Outputs:
 !	(	type_id		- datatype identifier for fill value )
 !	(		fillvalue	- fill value )
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
 ! Comment:	h5pset(get)fill_value_f function is overloaded to support
-!		INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.		
+!		INTEGER, REAL, DOUBLE PRECISION and CHARACTER dtatypes.
 !----------------------------------------------------------------------
 
 
           SUBROUTINE h5pset_fill_value_integer(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -674,9 +674,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
-                                                  ! of fillvalue datatype 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
+                                                  ! of fillvalue datatype
                                                   ! (in memory)
             INTEGER, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -701,7 +701,7 @@
 
 
           SUBROUTINE h5pget_fill_value_integer(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -709,10 +709,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                                   ! of fillvalue datatype
-                                                  ! (in memory) 
+                                                  ! (in memory)
             INTEGER, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -736,7 +736,7 @@
 
 
           SUBROUTINE h5pset_fill_value_real(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -744,9 +744,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
-                                                  ! of fillvalue datatype 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
+                                                  ! of fillvalue datatype
                                                   ! (in memory)
             REAL, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -771,7 +771,7 @@
 
 
           SUBROUTINE h5pget_fill_value_real(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -779,10 +779,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                                   ! of fillvalue datatype
-                                                  ! (in memory) 
+                                                  ! (in memory)
             REAL, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -806,7 +806,7 @@
 
 
           SUBROUTINE h5pset_fill_value_double(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -814,9 +814,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
-                                                  ! of fillvalue datatype 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
+                                                  ! of fillvalue datatype
                                                   ! (in memory)
             DOUBLE PRECISION, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -841,7 +841,7 @@
 
 
           SUBROUTINE h5pget_fill_value_double(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -849,10 +849,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                                   ! of fillvalue datatype
-                                                  ! (in memory) 
+                                                  ! (in memory)
             DOUBLE PRECISION, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -875,7 +875,7 @@
           END SUBROUTINE h5pget_fill_value_double
 
           SUBROUTINE h5pset_fill_value_char(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -883,9 +883,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
-                                                  ! of fillvalue datatype 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
+                                                  ! of fillvalue datatype
                                                   ! (in memory)
             CHARACTER, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -899,7 +899,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILL_VALUEC_C'::h5pset_fill_valuec_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: fillvalue 
+              !DEC$ATTRIBUTES reference :: fillvalue
               INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER, INTENT(IN) :: fillvalue
@@ -910,7 +910,7 @@
           END SUBROUTINE h5pset_fill_value_char
 
           SUBROUTINE h5pget_fill_value_char(prp_id, type_id, fillvalue, &
-                                               hdferr) 
+                                               hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -918,10 +918,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier of
                                                   ! of fillvalue datatype
-                                                  ! (in memory) 
+                                                  ! (in memory)
             CHARACTER, INTENT(IN) :: fillvalue   ! Fillvalue
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -934,7 +934,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_FILL_VALUEC_C'::h5pget_fill_valuec_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: fillvalue 
+              !DEC$ATTRIBUTES reference :: fillvalue
               INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER :: fillvalue
@@ -945,32 +945,32 @@
           END SUBROUTINE h5pget_fill_value_char
 
 !----------------------------------------------------------------------
-! Name:		h5pget_version_f 
+! Name:		h5pget_version_f
 !
-! Purpose: 	Retrieves the version information of various objects 
+! Purpose: 	Retrieves the version information of various objects
 !		for a file creation property list
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file createion property list identifier
-! Outputs:  
+! Outputs:
 !		boot		- super block version number
 !		freelist	- global freelist version number
 !		stab		- symbol table version number
 !		shhdr		- shared object header version number
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5pget_version_f(prp_id, boot, freelist, &
@@ -983,12 +983,12 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, DIMENSION(:), INTENT(OUT) :: boot  !array to put boot
                                                         !block version number
             INTEGER, DIMENSION(:), INTENT(OUT) :: freelist  !array to put global
                                                         !freelist version number
-     
+
             INTEGER, DIMENSION(:), INTENT(OUT) :: stab  !array to put symbol
                                                         !table version number
             INTEGER, DIMENSION(:), INTENT(OUT) :: shhdr !array to put shared
@@ -1005,8 +1005,8 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_VERSION_C'::h5pget_version_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, DIMENSION(:), INTENT(OUT) :: boot 
-              INTEGER, DIMENSION(:), INTENT(OUT) :: freelist 
+              INTEGER, DIMENSION(:), INTENT(OUT) :: boot
+              INTEGER, DIMENSION(:), INTENT(OUT) :: freelist
               INTEGER, DIMENSION(:), INTENT(OUT) :: stab
               INTEGER, DIMENSION(:), INTENT(OUT) :: shhdr
               END FUNCTION h5pget_version_c
@@ -1016,31 +1016,31 @@
           END SUBROUTINE h5pget_version_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_userblock_f 
+! Name:		h5pset_userblock_f
 !
 ! Purpose: 	Sets user block size
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list to modify
 !		size		- size of the user-block in bytes
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
- 
-          SUBROUTINE h5pset_userblock_f (prp_id, size, hdferr) 
+
+          SUBROUTINE h5pset_userblock_f (prp_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1048,8 +1048,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HSIZE_T), INTENT(IN) :: size !Size of the user-block in bytes 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HSIZE_T), INTENT(IN) :: size !Size of the user-block in bytes
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_userblock_c
@@ -1070,32 +1070,32 @@
           END SUBROUTINE h5pset_userblock_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_userblock_f 
+! Name:		h5pget_userblock_f
 !
 ! Purpose: 	Gets user block size.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-! Outputs:  
+! Outputs:
 !		block_size	- size of the user block in bytes
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_userblock_f(prp_id, block_size, hdferr) 
+          SUBROUTINE h5pget_userblock_f(prp_id, block_size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1103,9 +1103,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(HSIZE_T), INTENT(OUT) ::  block_size !Size of the 
-                                                               !user-block in bytes 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(HSIZE_T), INTENT(OUT) ::  block_size !Size of the
+                                                               !user-block in bytes
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pget_userblock_c
@@ -1125,33 +1125,33 @@
           END SUBROUTINE h5pget_userblock_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_sizes_f 
+! Name:		h5pset_sizes_f
 !
-! Purpose: 	Sets the byte size of the offsets and lengths used 
+! Purpose: 	Sets the byte size of the offsets and lengths used
 !		to address objects in an HDF5 file.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-!		sizeof_addr	- size of an object offset in bytes 
+!		sizeof_addr	- size of an object offset in bytes
 !		sizeof_size	- size of an object length in bytes
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_sizes_f (prp_id, sizeof_addr, sizeof_size, hdferr) 
+          SUBROUTINE h5pset_sizes_f (prp_id, sizeof_addr, sizeof_size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1159,11 +1159,11 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr !Size of an object 
-                                                       !offset in bytes 
-            INTEGER(SIZE_T), INTENT(IN) :: sizeof_size !Size of an object 
-                                                       !length in bytes 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr !Size of an object
+                                                       !offset in bytes
+            INTEGER(SIZE_T), INTENT(IN) :: sizeof_size !Size of an object
+                                                       !length in bytes
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_sizes_c
@@ -1175,7 +1175,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SIZES_C'::h5pset_sizes_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER(SIZE_T), INTENT(IN) :: sizeof_addr
               INTEGER(SIZE_T), INTENT(IN) :: sizeof_size
               END FUNCTION h5pset_sizes_c
@@ -1185,34 +1185,34 @@
           END SUBROUTINE h5pset_sizes_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_sizes_f 
+! Name:		h5pget_sizes_f
 !
-! Purpose: 	Retrieves the size of the offsets and lengths used 
+! Purpose: 	Retrieves the size of the offsets and lengths used
 !		in an HDF5 file
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-! Outputs:  
-!		sizeof_addr	- size of an object offset in bytes 
+! Outputs:
+!		sizeof_addr	- size of an object offset in bytes
 !		sizeof_size	- size of an object length in bytes
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr) 
+          SUBROUTINE h5pget_sizes_f(prp_id, sizeof_addr, sizeof_size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1220,12 +1220,12 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(SIZE_T), INTENT(OUT) :: sizeof_addr !Size of an object
-                                                                      !offset in bytes 
+                                                                      !offset in bytes
             INTEGER(SIZE_T), INTENT(OUT) :: sizeof_size !Size of an object
-                                                                      !length in bytes 
-  
+                                                                      !length in bytes
+
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pget_sizes_c
@@ -1237,7 +1237,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_SIZES_C'::h5pget_sizes_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER(SIZE_T), INTENT(OUT) :: sizeof_addr
               INTEGER(SIZE_T), INTENT(OUT) :: sizeof_size
               END FUNCTION h5pget_sizes_c
@@ -1247,33 +1247,33 @@
           END SUBROUTINE h5pget_sizes_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_sym_k_f 
+! Name:		h5pset_sym_k_f
 !
-! Purpose: 	Sets the size of parameters used to control the 
+! Purpose: 	Sets the size of parameters used to control the
 !		symbol table nodes
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
 !		ik		- symbol table tree rank
 !		lk		- symbol table node size
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_sym_k_f (prp_id, ik, lk, hdferr) 
+          SUBROUTINE h5pset_sym_k_f (prp_id, ik, lk, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1281,10 +1281,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER, INTENT(IN) :: ik ! Symbol table tree rank 
-            INTEGER, INTENT(IN) :: lk ! Symbol table node size 
-                                                       
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER, INTENT(IN) :: ik ! Symbol table tree rank
+            INTEGER, INTENT(IN) :: lk ! Symbol table node size
+
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_sym_k_c
@@ -1296,7 +1296,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SYM_K_C'::h5pset_sym_k_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER, INTENT(IN) :: ik
               INTEGER, INTENT(IN) :: lk
               END FUNCTION h5pset_sym_k_c
@@ -1306,34 +1306,34 @@
           END SUBROUTINE h5pset_sym_k_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_sym_k_f 
+! Name:		h5pget_sym_k_f
 !
 ! Purpose: 	Retrieves the size of the symbol table B-tree 1/2 rank
-!		 and the symbol table leaf node 1/2 size. 
+!		 and the symbol table leaf node 1/2 size.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-! Outputs:  
+! Outputs:
 !		ik		- symbol table tree 1/2 rank
 !		lk		- symbol table node 1/2 size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_sym_k_f(prp_id, ik, lk, hdferr) 
+          SUBROUTINE h5pget_sym_k_f(prp_id, ik, lk, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1341,7 +1341,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: ik !Symbol table tree rank
             INTEGER, INTENT(OUT) :: lk !Symbol table node size
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -1355,7 +1355,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_SYM_K_C'::h5pget_sym_k_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER, INTENT(OUT) :: ik
               INTEGER, INTENT(OUT) :: lk
               END FUNCTION h5pget_sym_k_c
@@ -1365,32 +1365,32 @@
           END SUBROUTINE h5pget_sym_k_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_istore_k_f 
+! Name:		h5pset_istore_k_f
 !
-! Purpose: 	Sets the size of the parameter used to control the 
+! Purpose: 	Sets the size of the parameter used to control the
 !		B-trees for indexing chunked datasets
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
 !		ik		- 1/2 rank of chunked storage B-tree
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_istore_k_f (prp_id, ik, hdferr) 
+          SUBROUTINE h5pset_istore_k_f (prp_id, ik, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1398,9 +1398,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: ik ! 1/2 rank of chunked storage B-tree
-                                                       
+
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_istore_k_c
@@ -1421,32 +1421,32 @@
           END SUBROUTINE h5pset_istore_k_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_istore_k_f 
+! Name:		h5pget_istore_k_f
 !
-! Purpose: 	Queries the 1/2 rank of an indexed storage B-tree. 
+! Purpose: 	Queries the 1/2 rank of an indexed storage B-tree.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-! Outputs:  
+! Outputs:
 !		ik		- 1/2 rank of chunked storage B-tree
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_istore_k_f(prp_id, ik, hdferr) 
+          SUBROUTINE h5pget_istore_k_f(prp_id, ik, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1454,7 +1454,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: ik !1/2 rank of chunked storage B-tree
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -1476,32 +1476,32 @@
           END SUBROUTINE h5pget_istore_k_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_driver_f 
+! Name:		h5pget_driver_f
 !
-! Purpose: 	Returns low-lever driver identifier. 
+! Purpose: 	Returns low-lever driver identifier.
 !
-! Inputs:  
-!		prp_id		- file access or data transfer property 
-!				  list identifier. 
-! Outputs:  
+! Inputs:
+!		prp_id		- file access or data transfer property
+!				  list identifier.
+! Outputs:
 !		driver		- low-level driver identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_driver_f(prp_id, driver, hdferr) 
+          SUBROUTINE h5pget_driver_f(prp_id, driver, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1509,7 +1509,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(HID_T), INTENT(OUT) :: driver !low-level file driver identifier
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -1531,30 +1531,30 @@
           END SUBROUTINE h5pget_driver_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_stdio_f 
+! Name:		h5pset_fapl_stdio_f
 !
-! Purpose: 	Sets the standard I/O driver. 
+! Purpose: 	Sets the standard I/O driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fapl_stdio_f (prp_id, hdferr) 
+          SUBROUTINE h5pset_fapl_stdio_f (prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1562,7 +1562,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_fapl_stdio_c
@@ -1582,29 +1582,29 @@
           END SUBROUTINE h5pset_fapl_stdio_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_stdio_f 
+! Name:		h5pget_stdio_f
 !
 ! Purpose:  	NOT AVAILABLE
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-!          SUBROUTINE h5pget_stdio_f (prp_id, io, hdferr) 
+!          SUBROUTINE h5pget_stdio_f (prp_id, io, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1612,9 +1612,9 @@
 !DEC$endif
 !
 !            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-!            INTEGER, INTENT(OUT) :: io   ! value indicates that the file 
-                                         !access property list is set to 
+!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+!            INTEGER, INTENT(OUT) :: io   ! value indicates that the file
+                                         !access property list is set to
                                          !the stdio driver
 !            INTEGER, INTENT(OUT) :: hdferr  ! Error code
 !            INTEGER, EXTERNAL :: h5pget_stdio_c
@@ -1622,30 +1622,30 @@
 !          END SUBROUTINE h5pget_stdio_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_sec2_f 
+! Name:		h5pset_fapl_sec2_f
 !
-! Purpose: 	Sets the sec2 driver. 
+! Purpose: 	Sets the sec2 driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fapl_sec2_f (prp_id, hdferr) 
+          SUBROUTINE h5pset_fapl_sec2_f (prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1653,7 +1653,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_fapl_sec2_c
@@ -1665,7 +1665,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_SEC2_C'::h5pset_fapl_sec2_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+              INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
               END FUNCTION h5pset_fapl_sec2_c
             END INTERFACE
 
@@ -1673,32 +1673,32 @@
           END SUBROUTINE h5pset_fapl_sec2_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_sec2_f 
+! Name:		h5pget_sec2_f
 !
 ! Purpose: 	NOT AVAILABLE
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-!          SUBROUTINE h5pget_sec2_f (prp_id, sec2, hdferr) 
+!          SUBROUTINE h5pget_sec2_f (prp_id, sec2, hdferr)
 !            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-!            INTEGER, INTENT(OUT) :: sec2   ! value indicates whether the file 
+!            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+!            INTEGER, INTENT(OUT) :: sec2   ! value indicates whether the file
                                            !driver uses the functions declared
                                            !in the unistd.h file
 !            INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -1707,32 +1707,32 @@
 !          END SUBROUTINE h5pget_sec2_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_alignment_f 
+! Name:		h5pset_alignment_f
 !
-! Purpose: 	Sets alignment properties of a file access property list. 
+! Purpose: 	Sets alignment properties of a file access property list.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-!		threshold	- threshold value	
+!		threshold	- threshold value
 !		alignment	- alignment value
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_alignment_f(prp_id, threshold,  alignment, hdferr) 
+          SUBROUTINE h5pset_alignment_f(prp_id, threshold,  alignment, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1740,7 +1740,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(HSIZE_T), INTENT(IN) :: threshold ! Threshold value
             INTEGER(HSIZE_T), INTENT(IN) :: alignment ! alignment value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -1764,33 +1764,33 @@
           END SUBROUTINE h5pset_alignment_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_alignment_f 
+! Name:		h5pget_alignment_f
 !
-! Purpose: 	Retrieves the current settings for alignment 
-!		properties from a file access property list. 
+! Purpose: 	Retrieves the current settings for alignment
+!		properties from a file access property list.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		threshold	- threshold value	
+! Outputs:
+!		threshold	- threshold value
 !		alignment	- alignment value
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_alignment_f(prp_id, threshold,  alignment, hdferr) 
+          SUBROUTINE h5pget_alignment_f(prp_id, threshold,  alignment, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1798,7 +1798,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(HSIZE_T), INTENT(OUT) :: threshold ! Threshold value
             INTEGER(HSIZE_T), INTENT(OUT) :: alignment ! alignment value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -1822,33 +1822,33 @@
           END SUBROUTINE h5pget_alignment_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_core_f 
+! Name:		h5pset_fapl_core_f
 !
-! Purpose: 	Modifies the file access property list to use the 
-!		H5FD_CORE driver. 
+! Purpose: 	Modifies the file access property list to use the
+!		H5FD_CORE driver.
 !
 ! Inputs:  	prp_id		- file access property list identifier
-!		increment	- size, in bytes, of memory increments 
-!		backing_store	- boolean flag indicating whether to write 
-!				  the file contents to disk when the file is closed. 
-! Outputs:  
-!		hdferr:		- error code		
+!		increment	- size, in bytes, of memory increments
+!		backing_store	- boolean flag indicating whether to write
+!				  the file contents to disk when the file is closed.
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fapl_core_f(prp_id, increment, backing_store, hdferr) 
+          SUBROUTINE h5pset_fapl_core_f(prp_id, increment, backing_store, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1856,13 +1856,13 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(SIZE_T), INTENT(IN) :: increment ! File block size in bytes.
             LOGICAL, INTENT(IN) :: backing_store ! flag to indicate that
-                                    ! entire file contents are flushed to a file 
+                                    ! entire file contents are flushed to a file
                                     ! with the same name as this core file.
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
-            INTEGER :: backing_store_flag 
+            INTEGER :: backing_store_flag
 
 !            INTEGER, EXTERNAL :: h5pset_fapl_core_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1873,9 +1873,9 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_CORE_C'::h5pset_fapl_core_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
-              INTEGER(SIZE_T), INTENT(IN) :: increment 
-              INTEGER :: backing_store_flag 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
+              INTEGER(SIZE_T), INTENT(IN) :: increment
+              INTEGER :: backing_store_flag
               END FUNCTION h5pset_fapl_core_c
             END INTERFACE
             backing_store_flag = 0
@@ -1884,33 +1884,33 @@
           END SUBROUTINE h5pset_fapl_core_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_fapl_core_f 
+! Name:		h5pget_fapl_core_f
 !
-! Purpose: 	Queries core file driver properties. 
+! Purpose: 	Queries core file driver properties.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		increment	- size, in bytes, of memory increments 
-!		backing_store	- boolean flag indicating whether to write 
-!				  the file contents to disk when the file is closed. 
-!		hdferr:		- error code		
+! Outputs:
+!		increment	- size, in bytes, of memory increments
+!		backing_store	- boolean flag indicating whether to write
+!				  the file contents to disk when the file is closed.
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_fapl_core_f(prp_id, increment, backing_store, hdferr) 
+          SUBROUTINE h5pget_fapl_core_f(prp_id, increment, backing_store, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1918,13 +1918,13 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(SIZE_T), INTENT(OUT) :: increment ! File block size in bytes.
             LOGICAL, INTENT(OUT) :: backing_store ! flag to indicate that
-                                    ! entire file contents are flushed to a file 
+                                    ! entire file contents are flushed to a file
                                     ! with the same name as this core file.
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
-            INTEGER :: backing_store_flag 
+            INTEGER :: backing_store_flag
 
 !            INTEGER, EXTERNAL :: h5pget_fapl_core_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1935,9 +1935,9 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_CORE_C'::h5pget_fapl_core_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
-              INTEGER(SIZE_T), INTENT(OUT) :: increment 
-              INTEGER :: backing_store_flag 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
+              INTEGER(SIZE_T), INTENT(OUT) :: increment
+              INTEGER :: backing_store_flag
               END FUNCTION h5pget_fapl_core_c
             END INTERFACE
 
@@ -1947,33 +1947,33 @@
           END SUBROUTINE h5pget_fapl_core_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_family_f 
+! Name:		h5pset_fapl_family_f
 !
-! Purpose: 	Sets the file access property list to use the family driver. 
+! Purpose: 	Sets the file access property list to use the family driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-!		memb_size	- size in bytes of each file member 
-!		memb_plist	- identifier of the file access property 
+!		memb_size	- size in bytes of each file member
+!		memb_plist	- identifier of the file access property
 !				  list to be used for each family member
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fapl_family_f(prp_id, memb_size, memb_plist , hdferr) 
+          SUBROUTINE h5pset_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1981,11 +1981,11 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(HSIZE_T), INTENT(IN) :: memb_size ! Logical size, in bytes,
                                                       !of each family member
-            INTEGER(HID_T), INTENT(IN) :: memb_plist !Identifier of the file 
-                                                     !access property list for 
+            INTEGER(HID_T), INTENT(IN) :: memb_plist !Identifier of the file
+                                                     !access property list for
                                                      !each member of the family
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2008,34 +2008,34 @@
           END SUBROUTINE h5pset_fapl_family_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_fapl_family_f 
+! Name:		h5pget_fapl_family_f
 !
-! Purpose:	Returns file access property list information.  	
+! Purpose:	Returns file access property list information.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		memb_size	- size in bytes of each file member 
-!		memb_plist	- identifier of the file access property 
+! Outputs:
+!		memb_size	- size in bytes of each file member
+!		memb_plist	- identifier of the file access property
 !				  list to be used for each family member
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_fapl_family_f(prp_id, memb_size, memb_plist , hdferr) 
+          SUBROUTINE h5pget_fapl_family_f(prp_id, memb_size, memb_plist , hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2043,11 +2043,11 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(HSIZE_T), INTENT(OUT) :: memb_size ! Logical size, in bytes,
                                                       !of each family member
-            INTEGER(HID_T), INTENT(OUT) :: memb_plist !Identifier of the file 
-                                                     !access property list for 
+            INTEGER(HID_T), INTENT(OUT) :: memb_plist !Identifier of the file
+                                                     !access property list for
                                                      !each member of the family
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2070,37 +2070,37 @@
           END SUBROUTINE h5pget_fapl_family_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_cache_f 
+! Name:		h5pset_cache_f
 !
-! Purpose: 	Sets the meta data cache and raw data chunk 
+! Purpose: 	Sets the meta data cache and raw data chunk
 !		cache parameters
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-!		mdc_nelmts	- number of elements (objects) in the meta 
-!				  data cache 
-!		rdcc_nelmts	- number of elements (objects) in the raw 
-!			          data chunk cache 
-!		rdcc_nbytes	- total size of the raw data chunk cache, in bytes 
+!		mdc_nelmts	- number of elements (objects) in the meta
+!				  data cache
+!		rdcc_nelmts	- number of elements (objects) in the raw
+!			          data chunk cache
+!		rdcc_nbytes	- total size of the raw data chunk cache, in bytes
 !		rdcc_w0		- preemption policy (0 or 1)
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_cache_f(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr) 
+          SUBROUTINE h5pset_cache_f(prp_id, mdc_nelmts,rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2108,13 +2108,13 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: mdc_nelmts  !Number of elements (objects)
                                                         ! in the meta data cache
             INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts  !Number of elements (objects)
                                                         ! in the meta data cache
-            INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes !Total size of the raw data 
-                                                      !chunk cache, in bytes 
+            INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes !Total size of the raw data
+                                                      !chunk cache, in bytes
             REAL, INTENT(IN) :: rdcc_w0 !Preemption policy
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2128,8 +2128,8 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_CACHE_C'::h5pset_cache_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(IN) :: mdc_nelmts 
-              INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts 
+              INTEGER, INTENT(IN) :: mdc_nelmts
+              INTEGER(SIZE_T), INTENT(IN) :: rdcc_nelmts
               INTEGER(SIZE_T), INTENT(IN) :: rdcc_nbytes
               REAL, INTENT(IN) :: rdcc_w0
               END FUNCTION h5pset_cache_c
@@ -2139,40 +2139,40 @@
           END SUBROUTINE h5pset_cache_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_cache_f 
+! Name:		h5pget_cache_f
 !
-! Purpose: 	Queries the meta data cache and raw data chunk cache 
-!		parameters.  
+! Purpose: 	Queries the meta data cache and raw data chunk cache
+!		parameters.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		mdc_nelmts	- number of elements (objects) in the meta 
-!				  data cache 
-!		rdcc_nelmts	- number of elements (objects) in the raw 
-!			          data chunk cache 
-!		rdcc_nbytes	- total size of the raw data chunk cache, in bytes 
+! Outputs:
+!		mdc_nelmts	- number of elements (objects) in the meta
+!				  data cache
+!		rdcc_nelmts	- number of elements (objects) in the raw
+!			          data chunk cache
+!		rdcc_nbytes	- total size of the raw data chunk cache, in bytes
 !		rdcc_w0		- preemption policy (0 or 1)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
 !                       Bug fix: type of the rdcc_nelmts parameter should be INTEGER
-!                                instead of INTEGER(SIZE_T) October 10, 2003 
+!                                instead of INTEGER(SIZE_T) October 10, 2003
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_cache_f(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr) 
+          SUBROUTINE h5pget_cache_f(prp_id, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, rdcc_w0, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2180,13 +2180,13 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: mdc_nelmts  !Number of elements (objects)
                                                         ! in the meta data cache
             INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts  !Number of elements (objects)
                                                         ! in the meta data cache
-            INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes !Total size of the raw data 
-                                                      !chunk cache, in bytes 
+            INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes !Total size of the raw data
+                                                      !chunk cache, in bytes
             REAL, INTENT(OUT) :: rdcc_w0 !Preemption policy
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2201,8 +2201,8 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_CACHE_C'::h5pget_cache_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(OUT) :: mdc_nelmts 
-              INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts 
+              INTEGER, INTENT(OUT) :: mdc_nelmts
+              INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nelmts
               INTEGER(SIZE_T), INTENT(OUT) :: rdcc_nbytes
               REAL, INTENT(OUT) :: rdcc_w0
               END FUNCTION h5pget_cache_c
@@ -2212,36 +2212,36 @@
           END SUBROUTINE h5pget_cache_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_split_f 
+! Name:		h5pset_fapl_split_f
 !
-! Purpose: 	Emulates the old split file driver. 
+! Purpose: 	Emulates the old split file driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-!		meta_ext	- name of the extension for the metafile 
+!		meta_ext	- name of the extension for the metafile
 !				  filename
-!		meta_plist	- identifier of the meta file access property 
+!		meta_plist	- identifier of the meta file access property
 !				  list
 !		raw_ext 	- name extension for the raw file filename
 !		raw_plist	- identifier of the raw file access property list
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fapl_split_f(prp_id, meta_ext, meta_plist, raw_ext, raw_plist, hdferr) 
+          SUBROUTINE h5pset_fapl_split_f(prp_id, meta_ext, meta_plist, raw_ext, raw_plist, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2249,13 +2249,13 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: meta_ext  !Name of the extension for
                                                       !the metafile filename
             INTEGER(HID_T), INTENT(IN) :: meta_plist  ! Identifier of the meta file
                                                       ! access property list
             CHARACTER(LEN=*), INTENT(IN) :: raw_ext  !Name extension for the raw file filename
-            INTEGER(HID_T), INTENT(IN) :: raw_plist  !Identifier of the raw file 
+            INTEGER(HID_T), INTENT(IN) :: raw_plist  !Identifier of the raw file
                                                      !access property list
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: meta_len, raw_len
@@ -2272,10 +2272,10 @@
               !DEC$ATTRIBUTES reference :: meta_ext
               !DEC$ATTRIBUTES reference :: raw_ext
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              CHARACTER(LEN=*), INTENT(IN) :: meta_ext 
+              CHARACTER(LEN=*), INTENT(IN) :: meta_ext
               INTEGER(HID_T), INTENT(IN) :: meta_plist
               CHARACTER(LEN=*), INTENT(IN) :: raw_ext
-              INTEGER(HID_T), INTENT(IN) :: raw_plist 
+              INTEGER(HID_T), INTENT(IN) :: raw_plist
               INTEGER :: meta_len, raw_len
               END FUNCTION h5pset_fapl_split_c
             END INTERFACE
@@ -2286,36 +2286,36 @@
           END SUBROUTINE h5pset_fapl_split_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_split_f 
+! Name:		h5pget_split_f
 !
 ! Purpose: 	NOT AVAILABLE
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 !          SUBROUTINE h5pget_split_f(prp_id, meta_ext_size, meta_ext, meta_plist,raw_ext_size,&
-!                                     raw_ext, raw_plist, hdferr) 
+!                                     raw_ext, raw_plist, hdferr)
 !            IMPLICIT NONE
 !            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
 !            INTEGER(SIZE_T), INTENT(IN) :: meta_ext_size ! Number of characters of the meta
                                                          ! file extension to be copied to the
                                                          ! meta_ext buffer
-      
+
 !            CHARACTER(LEN=*), INTENT(OUT) :: meta_ext  !Name of the extension for
                                                       !the metafile filename
 !            INTEGER(HID_T), INTENT(OUT) :: meta_plist  ! Identifier of the meta file
@@ -2324,7 +2324,7 @@
                                                          ! file extension to be copied to the
                                                          ! raw_ext buffer
 !            CHARACTER(LEN=*), INTENT(OUT) :: raw_ext  !Name extension for the raw file filename
-!            INTEGER(HID_T), INTENT(OUT) :: raw_plist  !Identifier of the raw file 
+!            INTEGER(HID_T), INTENT(OUT) :: raw_plist  !Identifier of the raw file
                                                      !access property list
 !            INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2334,33 +2334,33 @@
 !          END SUBROUTINE h5pget_split_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_gc_references_f 
+! Name:		h5pset_gc_references_f
 !
-! Purpose: 	Sets garbage collecting references flag. 
+! Purpose: 	Sets garbage collecting references flag.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-!		gc_reference	- flag for stting garbage collection on 
+!		gc_reference	- flag for stting garbage collection on
 !				  and off (1 or 0)
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
- 
-          SUBROUTINE h5pset_gc_references_f (prp_id, gc_reference, hdferr) 
+
+          SUBROUTINE h5pset_gc_references_f (prp_id, gc_reference, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2368,7 +2368,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: gc_reference !the flag for garbage collecting
                                                 ! references for the file
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -2391,32 +2391,32 @@
           END SUBROUTINE h5pset_gc_references_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_gc_references_f 
+! Name:		h5pget_gc_references_f
 !
-! Purpose: 	Returns garbage collecting references setting. 	
+! Purpose: 	Returns garbage collecting references setting.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file access property list identifier
-! Outputs:  
-!		gc_reference	- flag for stting garbage collection on 
+! Outputs:
+!		gc_reference	- flag for stting garbage collection on
 !				  and off (1 or 0)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_gc_references_f (prp_id, gc_reference, hdferr) 
+          SUBROUTINE h5pget_gc_references_f (prp_id, gc_reference, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2424,7 +2424,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: gc_reference !the flag for garbage collecting
                                                 ! references for the file
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -2447,36 +2447,36 @@
           END SUBROUTINE h5pget_gc_references_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_layout_f 
+! Name:		h5pset_layout_f
 !
-! Purpose: 	Sets the type of storage used store the raw data 
-!		for a dataset. 
+! Purpose: 	Sets the type of storage used store the raw data
+!		for a dataset.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- data creation property list identifier
 !		layout		- type of storage layout for raw data
 !				  possible values are:
 !				  H5D_COMPACT_F
 !				  H5D_CONTIGUOUS_F
 !				  H5D_CHUNKED_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_layout_f (prp_id, layout, hdferr) 
+          SUBROUTINE h5pset_layout_f (prp_id, layout, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2484,7 +2484,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: layout !Type of storage layout for raw data
                                           !possible values are:
                                           !H5D_COMPACT_F
@@ -2510,35 +2510,35 @@
           END SUBROUTINE h5pset_layout_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_layout_f 
+! Name:		h5pget_layout_f
 !
-! Purpose: 	Returns the layout of the raw data for a dataset. 
+! Purpose: 	Returns the layout of the raw data for a dataset.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- data creation property list identifier
-! Outputs:  
+! Outputs:
 !		layout		- type of storage layout for raw data
 !				  possible values are:
 !				  H5D_COMPACT_F
 !				  H5D_CONTIGUOUS_F
 !				  H5D_CHUNKED_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_layout_f (prp_id, layout, hdferr) 
+          SUBROUTINE h5pget_layout_f (prp_id, layout, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2546,7 +2546,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: layout !Type of storage layout for raw data
                                           !possible values are:
                                           !H5D_COMPACT_F(0)
@@ -2572,34 +2572,34 @@
           END SUBROUTINE h5pget_layout_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_filter_f 
+! Name:		h5pset_filter_f
 !
-! Purpose: 	Adds a filter to the filter pipeline. 
+! Purpose: 	Adds a filter to the filter pipeline.
 !
-! Inputs:  
-!		prp_id		- data creation or transfer property list 
+! Inputs:
+!		prp_id		- data creation or transfer property list
 !				  identifier
-!		filter		- filter to be added to the pipeline 
+!		filter		- filter to be added to the pipeline
 !		flags		- bit vector specifying certain general
 !				  properties of the filter
 !		cd_nelmts	- number of elements in cd_values
 !		cd_values	- auxiliary data for the filter
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		February, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr) 
+          SUBROUTINE h5pset_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2607,7 +2607,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: filter  !Filter to be added to the pipeline.
             INTEGER, INTENT(IN) :: flags  !Bit vector specifying certain general
                                           !properties of the filter.
@@ -2625,11 +2625,11 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FILTER_C'::h5pset_filter_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
-              INTEGER, INTENT(IN) :: filter 
-              INTEGER, INTENT(IN) :: flags 
-              INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts 
-              INTEGER, DIMENSION(*), INTENT(IN) :: cd_values 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
+              INTEGER, INTENT(IN) :: filter
+              INTEGER, INTENT(IN) :: flags
+              INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts
+              INTEGER, DIMENSION(*), INTENT(IN) :: cd_values
               END FUNCTION h5pset_filter_c
             END INTERFACE
 
@@ -2637,32 +2637,32 @@
           END SUBROUTINE h5pset_filter_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_nfilters_f 
+! Name:		h5pget_nfilters_f
 !
-! Purpose: 	Returns the number of filters in the pipeline. 
+! Purpose: 	Returns the number of filters in the pipeline.
 !
-! Inputs:  
-!		prp_id		- data creation or transfer property list 
+! Inputs:
+!		prp_id		- data creation or transfer property list
 !				  identifier
-! Outputs:  
+! Outputs:
 !		nfilters	- number of filters in the pipeline
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_nfilters_f (prp_id, nfilters, hdferr) 
+          SUBROUTINE h5pget_nfilters_f (prp_id, nfilters, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2670,7 +2670,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: nfilters !the number of filters in the pipeline
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2692,39 +2692,39 @@
           END SUBROUTINE h5pget_nfilters_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_filter_f 
+! Name:		h5pget_filter_f
 !
 ! Purpose: 	Returns information about a filter in a pipeline
 !
-! Inputs:  
-!		prp_id		- data creation or transfer property list 
+! Inputs:
+!		prp_id		- data creation or transfer property list
 !				  identifier
-! Outputs:  
+! Outputs:
 !				  identifier
-!		filter		- filter to be added to the pipeline 
+!		filter		- filter to be added to the pipeline
 !		flags		- bit vector specifying certain general
 !				  properties of the filter
 !		cd_nelmts	- number of elements in cd_values
 !		cd_values	- auxiliary data for the filter
 !		namelen		- number of characters in the name buffer
 !		name		- buffer to retrieve filter name
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_filter_f(prp_id, filter_number, flags, cd_nelmts, cd_values, namelen, name, filter_id, hdferr) 
+          SUBROUTINE h5pget_filter_f(prp_id, filter_number, flags, cd_nelmts, cd_values, namelen, name, filter_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2732,9 +2732,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: filter_number  !Sequence number within the filter
-                                                  !pipeline of the filter for which 
+                                                  !pipeline of the filter for which
                                                   !information is sought
             INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values  !Auxiliary data for the filter.
             INTEGER, INTENT(OUT) :: flags  !Bit vector specifying certain general
@@ -2742,7 +2742,7 @@
             INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts  !Number of elements in cd_values.
             INTEGER(SIZE_T), INTENT(IN) :: namelen !Anticipated number of characters in name.
             CHARACTER(LEN=*), INTENT(OUT) :: name !Name of the filter
-            INTEGER, INTENT(OUT) :: filter_id ! filter identification number  
+            INTEGER, INTENT(OUT) :: filter_id ! filter identification number
 
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2759,9 +2759,9 @@
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(IN) :: filter_number 
+              INTEGER, INTENT(IN) :: filter_number
               INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
-              INTEGER, INTENT(OUT) :: flags 
+              INTEGER, INTENT(OUT) :: flags
               INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
               INTEGER(SIZE_T), INTENT(IN) :: namelen
               CHARACTER(LEN=*), INTENT(OUT) :: name
@@ -2769,40 +2769,40 @@
               END FUNCTION h5pget_filter_c
             END INTERFACE
 
-            hdferr = h5pget_filter_c(prp_id, filter_number, flags, cd_nelmts,  & 
+            hdferr = h5pget_filter_c(prp_id, filter_number, flags, cd_nelmts,  &
                                      cd_values, namelen, name, filter_id )
           END SUBROUTINE h5pget_filter_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_external_f 
+! Name:		h5pset_external_f
 !
-! Purpose: 	Adds an external file to the list of external files. 
+! Purpose: 	Adds an external file to the list of external files.
 !
-! Inputs:   
+! Inputs:
 !		prp_id		- dataset creation property list identifier
 !		name		- name of external file
-!		offset		- offset in bytes from the beginning of the 
+!		offset		- offset in bytes from the beginning of the
 !				  file to the location in the file
 !				  where the data starts
-!		bytes		- size of the external file data. 
-! Outputs:  
-!		hdferr:		- error code		
+!		bytes		- size of the external file data.
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_external_f(prp_id, name, offset,bytes, hdferr) 
+          SUBROUTINE h5pset_external_f(prp_id, name, offset,bytes, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2812,10 +2812,10 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name !Name of an external file
-            INTEGER, INTENT(IN) :: offset !Offset, in bytes, from the beginning 
-                                          !of the file to the location in the file 
+            INTEGER, INTENT(IN) :: offset !Offset, in bytes, from the beginning
+                                          !of the file to the location in the file
                                           !where the data starts.
-            INTEGER(HSIZE_T), INTENT(IN) :: bytes ! Number of bytes reserved in the 
+            INTEGER(HSIZE_T), INTENT(IN) :: bytes ! Number of bytes reserved in the
                                                  !file for the data
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2844,32 +2844,32 @@
           END SUBROUTINE h5pset_external_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_external_count_f 
+! Name:		h5pget_external_count_f
 !
-! Purpose: 	Returns the number of external files for a dataset. 
+! Purpose: 	Returns the number of external files for a dataset.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
-! Outputs:  
-!		count		- number of external files for the 
+! Outputs:
+!		count		- number of external files for the
 !				  specified dataset
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_external_count_f (prp_id, count, hdferr) 
+          SUBROUTINE h5pget_external_count_f (prp_id, count, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2877,8 +2877,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
-            INTEGER, INTENT(OUT) :: count !number of external files for the 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
+            INTEGER, INTENT(OUT) :: count !number of external files for the
                                           !specified dataset
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 !            INTEGER, EXTERNAL :: h5pget_external_count_c
@@ -2890,7 +2890,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_EXTERNAL_COUNT_C'::h5pget_external_count_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
               INTEGER, INTENT(OUT) :: count
               END FUNCTION h5pget_external_count_c
             END INTERFACE
@@ -2899,39 +2899,39 @@
           END SUBROUTINE h5pget_external_count_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_external_f 
+! Name:		h5pget_external_f
 !
-! Purpose: 	Returns information about an external file. 
+! Purpose: 	Returns information about an external file.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
-! Outputs:  
-!		idx		- external file index 
+! Outputs:
+!		idx		- external file index
 !		name_size	- maximum size of name array
-!		name		- name of the external file	
+!		name		- name of the external file
 !		name		- name of external file
-!	 	offset		- offset in bytes from the beginning of the 
+!	 	offset		- offset in bytes from the beginning of the
 !				  file to the location in the file
 !				  where the data starts
 !		bytes		- size of the external file data
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_external_f(prp_id, idx, name_size, name, offset,bytes, hdferr) 
+          SUBROUTINE h5pget_external_f(prp_id, idx, name_size, name, offset,bytes, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2941,12 +2941,12 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: idx !External file index.
-            INTEGER(SIZE_T), INTENT(IN) :: name_size !Maximum length of name array 
+            INTEGER(SIZE_T), INTENT(IN) :: name_size !Maximum length of name array
             CHARACTER(LEN=*), INTENT(OUT) :: name !Name of an external file
-            INTEGER, INTENT(OUT) :: offset !Offset, in bytes, from the beginning 
-                                          !of the file to the location in the file 
+            INTEGER, INTENT(OUT) :: offset !Offset, in bytes, from the beginning
+                                          !of the file to the location in the file
                                           !where the data starts.
-            INTEGER(HSIZE_T), INTENT(OUT) :: bytes ! Number of bytes reserved in the 
+            INTEGER(HSIZE_T), INTENT(OUT) :: bytes ! Number of bytes reserved in the
                                                  !file for the data
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -2961,7 +2961,7 @@
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(IN) :: idx 
+              INTEGER, INTENT(IN) :: idx
               INTEGER(SIZE_T), INTENT(IN) :: name_size
               CHARACTER(LEN=*), INTENT(OUT) :: name
               INTEGER, INTENT(OUT) :: offset
@@ -2973,35 +2973,35 @@
           END SUBROUTINE h5pget_external_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_btree_ratios_f 
+! Name:		h5pset_btree_ratios_f
 !
-! Purpose: 	Sets B-tree split ratios for a dataset transfer 
-!		property list. 
+! Purpose: 	Sets B-tree split ratios for a dataset transfer
+!		property list.
 !
-! Inputs:  	
-!		prp_id		- the dataset transfer property list 
-!				  identifier 
-!		left		- the B-tree split ratio for left-most nodes 
+! Inputs:
+!		prp_id		- the dataset transfer property list
+!				  identifier
+!		left		- the B-tree split ratio for left-most nodes
 !		middle		- the B-tree split ratio for all other nodes
 !		right		- the B-tree split ratio for right-most nodes
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_btree_ratios_f(prp_id, left, middle, right, hdferr) 
+          SUBROUTINE h5pset_btree_ratios_f(prp_id, left, middle, right, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3011,9 +3011,9 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             REAL, INTENT(IN) :: left !The B-tree split ratio for left-most nodes.
-            REAL, INTENT(IN) :: middle !The B-tree split ratio for all other nodes 
-            REAL, INTENT(IN) :: right !The B-tree split ratio for right-most 
-                                      !nodes and lone nodes. 
+            REAL, INTENT(IN) :: middle !The B-tree split ratio for all other nodes
+            REAL, INTENT(IN) :: right !The B-tree split ratio for right-most
+                                      !nodes and lone nodes.
 
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -3037,34 +3037,34 @@
           END SUBROUTINE h5pset_btree_ratios_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_btree_ratios_f 
+! Name:		h5pget_btree_ratios_f
 !
 ! Purpose: 	Gets B-tree split ratios for a dataset transfer property list
 !
-! Inputs:  
-!		prp_id		- the dataset transfer property list 
-!				  identifier 
-! Outputs:  
-!		left		- the B-tree split ratio for left-most nodes 
+! Inputs:
+!		prp_id		- the dataset transfer property list
+!				  identifier
+! Outputs:
+!		left		- the B-tree split ratio for left-most nodes
 !		middle		- the B-tree split ratio for all other nodes
 !		right		- the B-tree split ratio for right-most nodes
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 14, 2001 
+!			port).  March 14, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_btree_ratios_f(prp_id, left, middle, right, hdferr) 
+          SUBROUTINE h5pget_btree_ratios_f(prp_id, left, middle, right, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3074,9 +3074,9 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             REAL, INTENT(OUT) :: left !The B-tree split ratio for left-most nodes.
-            REAL, INTENT(OUT) :: middle !The B-tree split ratio for all other nodes 
-            REAL, INTENT(OUT) :: right !The B-tree split ratio for right-most 
-                                      !nodes and lone nodes. 
+            REAL, INTENT(OUT) :: middle !The B-tree split ratio for all other nodes
+            REAL, INTENT(OUT) :: right !The B-tree split ratio for right-most
+                                      !nodes and lone nodes.
 
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
@@ -3101,34 +3101,34 @@
           END SUBROUTINE h5pget_btree_ratios_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_fclose_degree_f 
+! Name:		h5pget_fclose_degree_f
 !
 ! Purpose: 	Returns the degree for the file close behavior.
 !
-! Inputs:  
+! Inputs:
 !		fapl_id		- file access property list identifier
-! Outputs:  
+! Outputs:
 !		degree  	- one of the following:
 !				  Possible values are:
 !				  H5F_CLOSE_DEFAULT_F
 !				  H5F_CLOSE_WEAK_F
 !				  H5F_CLOSE_SEMI_F
 !				  H5F_CLOSE_STRONG_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        September 26, 2002	
+!	        September 26, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_fclose_degree_f(fapl_id, degree, hdferr) 
+          SUBROUTINE h5pget_fclose_degree_f(fapl_id, degree, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3136,9 +3136,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: fapl_id ! File Access Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: fapl_id ! File Access Property list identifier
             INTEGER, INTENT(OUT) :: degree     ! Possible values
-                                              ! are: 
+                                              ! are:
 						!  H5F_CLOSE_DEFAULT_F
 						!  H5F_CLOSE_WEAK_F
 						!  H5F_CLOSE_SEMI_F
@@ -3160,15 +3160,15 @@
               END FUNCTION h5pget_fclose_degree_c
             END INTERFACE
 
-            hdferr = h5pget_fclose_degree_c(fapl_id, degree) 
+            hdferr = h5pget_fclose_degree_c(fapl_id, degree)
           END SUBROUTINE h5pget_fclose_degree_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fclose_degree_f 
+! Name:		h5pset_fclose_degree_f
 !
 ! Purpose: 	Sets the degree for the file close behavior.
 !
-! Inputs:  
+! Inputs:
 !		fapl_id		- file access property list identifier
 !		degree  	- one of the following:
 !				  Possible values are:
@@ -3176,22 +3176,22 @@
 !				  H5F_CLOSE_WEAK_F
 !				  H5F_CLOSE_SEMI_F
 !				  H5F_CLOSE_STRONG_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        September 26, 2002	
+!	        September 26, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fclose_degree_f(fapl_id, degree, hdferr) 
+          SUBROUTINE h5pset_fclose_degree_f(fapl_id, degree, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3199,9 +3199,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: fapl_id ! File Access Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: fapl_id ! File Access Property list identifier
             INTEGER, INTENT(IN) :: degree     ! Possible values
-                                              ! are: 
+                                              ! are:
 						!  H5F_CLOSE_DEFAULT_F
 						!  H5F_CLOSE_WEAK_F
 						!  H5F_CLOSE_SEMI_F
@@ -3220,35 +3220,35 @@
               END FUNCTION h5pset_fclose_degree_c
             END INTERFACE
 
-            hdferr = h5pset_fclose_degree_c(fapl_id, degree) 
+            hdferr = h5pset_fclose_degree_c(fapl_id, degree)
           END SUBROUTINE h5pset_fclose_degree_f
 
 !----------------------------------------------------------------------
-! Name:		h5pequal_f 
+! Name:		h5pequal_f
 !
 ! Purpose: 	Checks if two property lists are eqaul
 !
-! Inputs:  
+! Inputs:
 !		plist1_id	- property list identifier
 !		plist2_id	- property list identifier
-! Outputs:  
+! Outputs:
 !               flag		- flag, possible values
 !				  .TRUE. or .FALSE.
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1, flag is set to .FALSE.   
+!				 	Failure: -1, flag is set to .FALSE.
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        September 30, 2002	
+!	        September 30, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pequal_f(plist1_id, plist2_id, flag, hdferr) 
+          SUBROUTINE h5pequal_f(plist1_id, plist2_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3256,8 +3256,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist1_id ! Property list identifier 
-            INTEGER(HID_T), INTENT(IN) :: plist2_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: plist1_id ! Property list identifier
+            INTEGER(HID_T), INTENT(IN) :: plist2_id ! Property list identifier
             LOGICAL, INTENT(OUT)       :: flag      ! Flag
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
             INTEGER                    :: c_flag
@@ -3275,34 +3275,34 @@
             END INTERFACE
 
             flag = .FALSE.
-            hdferr = h5pequal_c(plist1_id, plist2_id, c_flag) 
+            hdferr = h5pequal_c(plist1_id, plist2_id, c_flag)
             if (c_flag .GT. 0) flag = .TRUE.
           END SUBROUTINE h5pequal_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_buffer_f 
+! Name:		h5pset_buffer_f
 !
 ! Purpose: 	Sets sixe for conversion buffer
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- data transfer property list identifier
-!               size		- buffer size 
-! Outputs:  
-!		hdferr:		- error code		
+!               size		- buffer size
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 2, 2002	
+!	        October 2, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_buffer_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pset_buffer_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3310,9 +3310,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! Data transfer property list identifier 
-            INTEGER(HSIZE_T), INTENT(IN) :: size  ! Buffer size in bytes; 
-                                                   ! buffer is allocated and freed by 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! Data transfer property list identifier
+            INTEGER(HSIZE_T), INTENT(IN) :: size  ! Buffer size in bytes;
+                                                   ! buffer is allocated and freed by
                                                    ! the library.
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
@@ -3327,33 +3327,33 @@
               END FUNCTION h5pset_buffer_c
             END INTERFACE
 
-            hdferr = h5pset_buffer_c(plist_id, size) 
+            hdferr = h5pset_buffer_c(plist_id, size)
           END SUBROUTINE h5pset_buffer_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_buffer_f 
+! Name:		h5pget_buffer_f
 !
 ! Purpose: 	Gets size for conversion buffer
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- data transfer property list identifier
-! Outputs:  
-!               size		- buffer size 
-!		hdferr:		- error code		
+! Outputs:
+!               size		- buffer size
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 2, 2002	
+!	        October 2, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_buffer_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pget_buffer_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3361,9 +3361,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! Data transfer property list identifier 
-            INTEGER(HSIZE_T), INTENT(OUT) :: size ! Buffer size in bytes; 
-                                                   ! buffer is allocated and freed by 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! Data transfer property list identifier
+            INTEGER(HSIZE_T), INTENT(OUT) :: size ! Buffer size in bytes;
+                                                   ! buffer is allocated and freed by
                                                    ! the library.
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
@@ -3378,7 +3378,7 @@
               END FUNCTION h5pget_buffer_c
             END INTERFACE
 
-            hdferr = h5pget_buffer_c(plist_id, size) 
+            hdferr = h5pget_buffer_c(plist_id, size)
           END SUBROUTINE h5pget_buffer_f
 
 !----------------------------------------------------------------------
@@ -3386,30 +3386,30 @@
 !
 ! Purpose: 	Check if fill value is defined.
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset creation property list identifier
-! Outputs:  
+! Outputs:
 !               flag            - fill value status flag
 !                                 Possible values are:
 !				    H5D_FILL_VALUE_ERROR_F
 !				    H5D_FILL_VALUE_UNDEFINED_F
 !				    H5D_FILL_VALUE_DEFAULT_F
 !				    H5D_FILL_VALUE_USER_DEFINED_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 4, 2002	
+!	        October 4, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pfill_value_defined_f(plist_id, flag, hdferr) 
+          SUBROUTINE h5pfill_value_defined_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3417,9 +3417,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id 
+            INTEGER(HID_T), INTENT(IN) :: plist_id
             INTEGER, INTENT(OUT) :: flag
-            INTEGER, INTENT(OUT)       :: hdferr    
+            INTEGER, INTENT(OUT)       :: hdferr
 
             INTERFACE
               INTEGER FUNCTION h5pfill_value_defined_c(plist_id, flag)
@@ -3432,7 +3432,7 @@
               END FUNCTION h5pfill_value_defined_c
             END INTERFACE
 
-            hdferr = h5pfill_value_defined_c(plist_id, flag) 
+            hdferr = h5pfill_value_defined_c(plist_id, flag)
           END SUBROUTINE h5pfill_value_defined_f
 
 !----------------------------------------------------------------------
@@ -3440,7 +3440,7 @@
 !
 ! Purpose: 	Set space allocation time for dataset during creation.
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset creation property list identifier
 !               flag            - allocation time flag
 !                                 Possible values are:
@@ -3449,22 +3449,22 @@
 !				    H5D_ALLOC_TIME_EARLY_F
 !				    H5D_ALLOC_TIME_LATE_F
 !				    H5D_ALLOC_TIME_INCR_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 4, 2002	
+!	        October 4, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_alloc_time_f(plist_id, flag, hdferr) 
+          SUBROUTINE h5pset_alloc_time_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3472,9 +3472,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id 
+            INTEGER(HID_T), INTENT(IN) :: plist_id
             INTEGER, INTENT(IN) :: flag
-            INTEGER, INTENT(OUT)       :: hdferr    
+            INTEGER, INTENT(OUT)       :: hdferr
 
             INTERFACE
               INTEGER FUNCTION h5pset_alloc_time_c(plist_id, flag)
@@ -3487,7 +3487,7 @@
               END FUNCTION h5pset_alloc_time_c
             END INTERFACE
 
-            hdferr = h5pset_alloc_time_c(plist_id, flag) 
+            hdferr = h5pset_alloc_time_c(plist_id, flag)
           END SUBROUTINE h5pset_alloc_time_f
 
 !----------------------------------------------------------------------
@@ -3495,9 +3495,9 @@
 !
 ! Purpose: 	Get space allocation time for dataset during creation.
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset creation property list identifier
-! Outputs:  
+! Outputs:
 !               flag            - allocation time flag
 !                                 Possible values are:
 !				    H5D_ALLOC_TIME_ERROR_F
@@ -3505,21 +3505,21 @@
 !				    H5D_ALLOC_TIME_EARLY_F
 !				    H5D_ALLOC_TIME_LATE_F
 !				    H5D_ALLOC_TIME_INCR_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 4, 2002	
+!	        October 4, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_alloc_time_f(plist_id, flag, hdferr) 
+          SUBROUTINE h5pget_alloc_time_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3527,9 +3527,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id 
+            INTEGER(HID_T), INTENT(IN) :: plist_id
             INTEGER, INTENT(OUT) :: flag
-            INTEGER, INTENT(OUT)       :: hdferr    
+            INTEGER, INTENT(OUT)       :: hdferr
 
             INTERFACE
               INTEGER FUNCTION h5pget_alloc_time_c(plist_id, flag)
@@ -3542,7 +3542,7 @@
               END FUNCTION h5pget_alloc_time_c
             END INTERFACE
 
-            hdferr = h5pget_alloc_time_c(plist_id, flag) 
+            hdferr = h5pget_alloc_time_c(plist_id, flag)
           END SUBROUTINE h5pget_alloc_time_f
 
 !----------------------------------------------------------------------
@@ -3550,29 +3550,29 @@
 !
 ! Purpose: 	Set fill value writing time for dataset
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset creation property list identifier
 !               flag            - fill time flag
 !                                 Possible values are:
 !				    H5D_FILL_TIME_ERROR_F
 !				    H5D_FILL_TIME_ALLOC_F
 !				    H5D_FILL_TIME_NEVER_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 4, 2002	
+!	        October 4, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_fill_time_f(plist_id, flag, hdferr) 
+          SUBROUTINE h5pset_fill_time_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3580,9 +3580,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id 
+            INTEGER(HID_T), INTENT(IN) :: plist_id
             INTEGER, INTENT(IN) :: flag
-            INTEGER, INTENT(OUT)       :: hdferr    
+            INTEGER, INTENT(OUT)       :: hdferr
 
             INTERFACE
               INTEGER FUNCTION h5pset_fill_time_c(plist_id, flag)
@@ -3595,7 +3595,7 @@
               END FUNCTION h5pset_fill_time_c
             END INTERFACE
 
-            hdferr = h5pset_fill_time_c(plist_id, flag) 
+            hdferr = h5pset_fill_time_c(plist_id, flag)
           END SUBROUTINE h5pset_fill_time_f
 
 !----------------------------------------------------------------------
@@ -3603,10 +3603,10 @@
 !
 ! Purpose: 	Get fill value writing time for dataset
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset creation property list identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
@@ -3618,14 +3618,14 @@
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 4, 2002	
+!	        October 4, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_fill_time_f(plist_id, flag, hdferr) 
+          SUBROUTINE h5pget_fill_time_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3633,9 +3633,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id 
+            INTEGER(HID_T), INTENT(IN) :: plist_id
             INTEGER, INTENT(OUT) :: flag
-            INTEGER, INTENT(OUT)       :: hdferr    
+            INTEGER, INTENT(OUT)       :: hdferr
 
             INTERFACE
               INTEGER FUNCTION h5pget_fill_time_c(plist_id, flag)
@@ -3648,33 +3648,33 @@
               END FUNCTION h5pget_fill_time_c
             END INTERFACE
 
-            hdferr = h5pget_fill_time_c(plist_id, flag) 
+            hdferr = h5pget_fill_time_c(plist_id, flag)
           END SUBROUTINE h5pget_fill_time_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_meta_block_size_f 
+! Name:		h5pset_meta_block_size_f
 !
-! Purpose: 	Sets the minimum size of metadata block allocations 
+! Purpose: 	Sets the minimum size of metadata block allocations
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- file access property list identifier
 !               size		- metatdata block size
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_meta_block_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pset_meta_block_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3682,8 +3682,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-            INTEGER(HSIZE_T), INTENT(IN) :: size  ! Block size in bytes; 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier
+            INTEGER(HSIZE_T), INTENT(IN) :: size  ! Block size in bytes;
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
             INTERFACE
@@ -3697,33 +3697,33 @@
               END FUNCTION h5pset_meta_block_size_c
             END INTERFACE
 
-            hdferr = h5pset_meta_block_size_c(plist_id, size) 
+            hdferr = h5pset_meta_block_size_c(plist_id, size)
           END SUBROUTINE h5pset_meta_block_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_meta_block_size_f 
+! Name:		h5pget_meta_block_size_f
 !
-! Purpose: 	Gets the minimum size of metadata block allocations 
+! Purpose: 	Gets the minimum size of metadata block allocations
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- file access property list identifier
-! Outputs:  
+! Outputs:
 !               size		- metatdata block size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_meta_block_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pget_meta_block_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3731,8 +3731,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-            INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Block size in bytes; 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier
+            INTEGER(HSIZE_T), INTENT(OUT) :: size  ! Block size in bytes;
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
             INTERFACE
@@ -3746,33 +3746,33 @@
               END FUNCTION h5pget_meta_block_size_c
             END INTERFACE
 
-            hdferr = h5pget_meta_block_size_c(plist_id, size) 
+            hdferr = h5pget_meta_block_size_c(plist_id, size)
           END SUBROUTINE h5pget_meta_block_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_sieve_buf_size_f 
+! Name:		h5pset_sieve_buf_size_f
 !
 ! Purpose: 	Sets the maximum size of the data sieve buffer
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- file access property list identifier
 !               size		- sieve buffer size
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_sieve_buf_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pset_sieve_buf_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3780,8 +3780,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-            INTEGER(SIZE_T), INTENT(IN) :: size  ! Buffer size in bytes; 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier
+            INTEGER(SIZE_T), INTENT(IN) :: size  ! Buffer size in bytes;
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
             INTERFACE
@@ -3795,33 +3795,33 @@
               END FUNCTION h5pset_sieve_buf_size_c
             END INTERFACE
 
-            hdferr = h5pset_sieve_buf_size_c(plist_id, size) 
+            hdferr = h5pset_sieve_buf_size_c(plist_id, size)
           END SUBROUTINE h5pset_sieve_buf_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_sieve_buf_size_f 
+! Name:		h5pget_sieve_buf_size_f
 !
 ! Purpose: 	Gets the maximum size of the data sieve buffer
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- file access property list identifier
-! Outputs:  
+! Outputs:
 !               size		- sieve buffer size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_sieve_buf_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pget_sieve_buf_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3829,8 +3829,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
-            INTEGER(SIZE_T), INTENT(OUT) :: size   ! Buffer size in bytes 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier
+            INTEGER(SIZE_T), INTENT(OUT) :: size   ! Buffer size in bytes
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
             INTERFACE
@@ -3844,33 +3844,33 @@
               END FUNCTION h5pget_sieve_buf_size_c
             END INTERFACE
 
-            hdferr = h5pget_sieve_buf_size_c(plist_id, size) 
+            hdferr = h5pget_sieve_buf_size_c(plist_id, size)
           END SUBROUTINE h5pget_sieve_buf_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_small_data_block_size_f 
+! Name:		h5pset_small_data_block_size_f
 !
 ! Purpose: 	Sets the minimum size of "small" raw data block
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- file access property list identifier
 !               size		- small raw data block size
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_small_data_block_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pset_small_data_block_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3878,7 +3878,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier
             INTEGER(HSIZE_T), INTENT(IN) :: size    ! Small raw data block size
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
@@ -3893,33 +3893,33 @@
               END FUNCTION h5pset_small_data_block_size_c
             END INTERFACE
 
-            hdferr = h5pset_small_data_block_size_c(plist_id, size) 
+            hdferr = h5pset_small_data_block_size_c(plist_id, size)
           END SUBROUTINE h5pset_small_data_block_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_small_data_block_size_f 
+! Name:		h5pget_small_data_block_size_f
 !
 ! Purpose: 	Gets the minimum size of "small" raw data block
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- file access property list identifier
-! Outputs:  
+! Outputs:
 !               size		- small raw data block size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_small_data_block_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pget_small_data_block_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3927,7 +3927,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! File access property list identifier
             INTEGER(HSIZE_T), INTENT(OUT) :: size    ! Small raw data block size
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
@@ -3942,33 +3942,33 @@
               END FUNCTION h5pget_small_data_block_size_c
             END INTERFACE
 
-            hdferr = h5pget_small_data_block_size_c(plist_id, size) 
+            hdferr = h5pget_small_data_block_size_c(plist_id, size)
           END SUBROUTINE h5pget_small_data_block_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_hyper_vector_size_f 
+! Name:		h5pset_hyper_vector_size_f
 !
 ! Purpose: 	Set the number of "I/O" vectors (vector size)
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset transfer property list identifier
 !               size		- vector size
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_hyper_vector_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pset_hyper_vector_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3976,7 +3976,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset transfer property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset transfer property list identifier
             INTEGER(SIZE_T), INTENT(IN) :: size     ! Vector size
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
@@ -3991,33 +3991,33 @@
               END FUNCTION h5pset_hyper_vector_size_c
             END INTERFACE
 
-            hdferr = h5pset_hyper_vector_size_c(plist_id, size) 
+            hdferr = h5pset_hyper_vector_size_c(plist_id, size)
           END SUBROUTINE h5pset_hyper_vector_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_hyper_vector_size_f 
+! Name:		h5pget_hyper_vector_size_f
 !
 ! Purpose: 	Get the number of "I/O" vectors (vector size)
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- dataset transfer property list identifier
-! Outputs:  
+! Outputs:
 !               size		- vector size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
 !				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 7, 2002	
+!	        October 7, 2002
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_hyper_vector_size_f(plist_id, size, hdferr) 
+          SUBROUTINE h5pget_hyper_vector_size_f(plist_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4025,7 +4025,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset transfer property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset transfer property list identifier
             INTEGER(SIZE_T), INTENT(OUT) :: size     ! Vector size
             INTEGER, INTENT(OUT)       :: hdferr    ! Error code
 
@@ -4040,34 +4040,34 @@
               END FUNCTION h5pget_hyper_vector_size_c
             END INTERFACE
 
-            hdferr = h5pget_hyper_vector_size_c(plist_id, size) 
+            hdferr = h5pget_hyper_vector_size_c(plist_id, size)
           END SUBROUTINE h5pget_hyper_vector_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_integer 
+! Name:		h5pset_integer
 !
 ! Purpose: 	Sets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
 !		value		- value to set property to
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_integer(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pset_integer(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4075,7 +4075,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             INTEGER,   INTENT(IN) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4104,26 +4104,26 @@
 !
 ! Purpose: 	Sets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
 !		value		- value to set property to
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_real(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pset_real(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4131,7 +4131,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             REAL,   INTENT(IN) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4160,26 +4160,26 @@
 !
 ! Purpose: 	Sets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
 !		value		- value to set property to
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_double(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pset_double(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4187,7 +4187,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             DOUBLE PRECISION,   INTENT(IN) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4216,26 +4216,26 @@
 !
 ! Purpose: 	Sets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
 !		value		- value to set property to
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pset_char(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pset_char(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4243,7 +4243,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             CHARACTER(LEN=*),   INTENT(IN) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4272,30 +4272,30 @@
           END SUBROUTINE h5pset_char
 
 !----------------------------------------------------------------------
-! Name:		h5pget_integer 
+! Name:		h5pget_integer
 !
 ! Purpose: 	Gets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
-! Outputs:  
+! Outputs:
 !		value		- value of property
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_integer(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pget_integer(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4303,7 +4303,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             INTEGER,   INTENT(OUT) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4332,26 +4332,26 @@
 !
 ! Purpose: 	Gets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
-! Outputs:  
+! Outputs:
 !		value		- value of property
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_real(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pget_real(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4359,7 +4359,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             REAL,   INTENT(OUT) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4388,26 +4388,26 @@
 !
 ! Purpose: 	Gets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
-! Outputs:  
+! Outputs:
 !		value		- value of property
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_double(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pget_double(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4415,7 +4415,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             DOUBLE PRECISION,   INTENT(OUT) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4444,26 +4444,26 @@
 !
 ! Purpose: 	Gets a property list value
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to modify
 !		name 		- name of property to modify
-! Outputs:  
+! Outputs:
 !		value		- value of property
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_char(prp_id, name, value, hdferr) 
+          SUBROUTINE h5pget_char(prp_id, name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4471,7 +4471,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             CHARACTER(LEN=*),   INTENT(OUT) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4500,30 +4500,30 @@
           END SUBROUTINE h5pget_char
 
 !----------------------------------------------------------------------
-! Name:		h5pexist_f 
+! Name:		h5pexist_f
 !
-! Purpose: 	Queries whether a property name exists in a property list or class. 
+! Purpose: 	Queries whether a property name exists in a property list or class.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to query
 !		name 		- name of property to check for
-! Outputs:  
+! Outputs:
 !               flag            - logical flag
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pexist_f(prp_id, name, flag, hdferr) 
+          SUBROUTINE h5pexist_f(prp_id, name, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4531,7 +4531,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to modify
             LOGICAL, INTENT(OUT) :: flag          ! .TRUE. if exists, .FALSE.
                                                   ! otherwise
@@ -4560,30 +4560,30 @@
           END SUBROUTINE h5pexist_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_size_f 
+! Name:		h5pget_size_f
 !
 ! Purpose: 	Queries the size of a property value in bytes.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier to query
 !		name 		- name of property to query
-! Outputs:  
+! Outputs:
 !               size            - size of property in bytes
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_size_f(prp_id, name, size, hdferr) 
+          SUBROUTINE h5pget_size_f(prp_id, name, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4591,7 +4591,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to query
             INTEGER(SIZE_T), INTENT(OUT) :: size  ! Size in bytes
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4615,29 +4615,29 @@
           END SUBROUTINE h5pget_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_npros_f 
+! Name:		h5pget_npros_f
 !
 ! Purpose: 	Queries number of properties in property list or class
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- iproperty list identifier to query
-! Outputs:  
+! Outputs:
 !               nprops          - number of properties in property object
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_nprops_f(prp_id, nprops, hdferr) 
+          SUBROUTINE h5pget_nprops_f(prp_id, nprops, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4645,7 +4645,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id    ! Property list identifier
             INTEGER(SIZE_T), INTENT(OUT) :: nprops  ! iNumber of properties
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
@@ -4663,13 +4663,13 @@
           END SUBROUTINE h5pget_nprops_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_class_name_f 
+! Name:		h5pget_class_name_f
 !
 ! Purpose: 	Queries the name of a class.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier to query
-! Outputs:  
+! Outputs:
 !		name 		- name of a class
 !               size            - Actual length of the class name
 !                                 If provided buffer "name" is smaller,
@@ -4677,19 +4677,19 @@
 !                                 provided user buffer
 !		hdferr:		- error code
 !				 	Success: 0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: Returned the size of name as an argument	
+! Modifications: Returned the size of name as an argument
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr) 
+          SUBROUTINE h5pget_class_name_f(prp_id, name, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4697,9 +4697,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id  ! Property list identifier
             CHARACTER(LEN=*), INTENT(OUT) :: name  ! Buffer to retireve class name
-            
+
             INTEGER, INTENT(OUT) :: size ! Actual length of the class name
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
@@ -4726,30 +4726,30 @@
           END SUBROUTINE h5pget_class_name_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_class_parent_f 
+! Name:		h5pget_class_parent_f
 !
-! Purpose: 	Retrieves the parent class of a genric property class. 
+! Purpose: 	Retrieves the parent class of a genric property class.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- property list identifier to query
-! Outputs:  
+! Outputs:
 !		parent_id 	- identifier of the parent class
-!		hdferr:		- error code		
-!                                       
+!		hdferr:		- error code
+!
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_class_parent_f(prp_id, parent_id, hdferr) 
+          SUBROUTINE h5pget_class_parent_f(prp_id, parent_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4757,9 +4757,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier 
-            INTEGER(HID_T), INTENT(OUT) :: parent_id ! Parent class property list 
-                                                     ! identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id     ! Property list identifier
+            INTEGER(HID_T), INTENT(OUT) :: parent_id ! Parent class property list
+                                                     ! identifier
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
 
             INTERFACE
@@ -4776,31 +4776,31 @@
           END SUBROUTINE h5pget_class_parent_f
 
 !----------------------------------------------------------------------
-! Name:		h5pisa_class_f 
+! Name:		h5pisa_class_f
 !
-! Purpose: 	Determines whether a property list is a member of a class. 
+! Purpose: 	Determines whether a property list is a member of a class.
 !
-! Inputs:  
-!		plist		- property list identifier 
+! Inputs:
+!		plist		- property list identifier
 !		pclass		- identifier of the property class
-! Outputs:  
+! Outputs:
 !               flag            - .TRUE. if a member, .FALSE. otherwise
-!		hdferr:		- error code		
-!                                       
+!		hdferr:		- error code
+!
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pisa_class_f(plist, pclass, flag, hdferr) 
+          SUBROUTINE h5pisa_class_f(plist, pclass, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4808,7 +4808,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist     ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: plist     ! Property list identifier
             INTEGER(HID_T), INTENT(IN) :: pclass    ! Class identifier
             LOGICAL, INTENT(OUT) :: flag            ! logical flag
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
@@ -4832,31 +4832,31 @@
           END SUBROUTINE h5pisa_class_f
 
 !----------------------------------------------------------------------
-! Name:		h5pcopy_prop_f 
+! Name:		h5pcopy_prop_f
 !
 ! Purpose: 	Copies a property from one list or class to another.
 !
-! Inputs:  
+! Inputs:
 !		dst_id		- Identifier of the destination property list
-!		src_id		- Identifier of the source property list 
+!		src_id		- Identifier of the source property list
 !		name 		- name of the property to copy
-! Outputs:  
-!		hdferr:		- error code		
-!                                       
-!				 	Success: 0 
-!				 	Failure: -1   
+! Outputs:
+!		hdferr:		- error code
+!
+!				 	Success: 0
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pcopy_prop_f(dst_id, src_id, name, hdferr) 
+          SUBROUTINE h5pcopy_prop_f(dst_id, src_id, name, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4864,9 +4864,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dst_id  ! Destination property list 
-                                                  ! identifier 
-            INTEGER(HID_T), INTENT(IN) :: src_id  ! Source property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: dst_id  ! Destination property list
+                                                  ! identifier
+            INTEGER(HID_T), INTENT(IN) :: src_id  ! Source property list identifier
             CHARACTER(LEN=*), INTENT(IN) :: name ! Property name
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
@@ -4889,31 +4889,31 @@
           END SUBROUTINE h5pcopy_prop_f
 
 !----------------------------------------------------------------------
-! Name:		h5premove_f 
+! Name:		h5premove_f
 !
-! Purpose: 	Removes a property from a property list. 
+! Purpose: 	Removes a property from a property list.
 
 !
-! Inputs:  
+! Inputs:
 !		plid		- Property list identofoer
 !		name 		- name of the property to remove
-! Outputs:  
-!		hdferr:		- error code		
-!                                       
-!				 	Success: 0 
-!				 	Failure: -1   
+! Outputs:
+!		hdferr:		- error code
+!
+!				 	Success: 0
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5premove_f(plid, name, hdferr) 
+          SUBROUTINE h5premove_f(plid, name, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4933,7 +4933,7 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PREMOVE_C'::h5premove_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: plid 
+              INTEGER(HID_T), INTENT(IN) :: plid
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
               END FUNCTION h5premove_c
@@ -4943,31 +4943,31 @@
           END SUBROUTINE h5premove_f
 
 !----------------------------------------------------------------------
-! Name:		h5punregister_f 
+! Name:		h5punregister_f
 !
-! Purpose: 	Removes a property from a property list class. 
+! Purpose: 	Removes a property from a property list class.
 
 !
-! Inputs:  
+! Inputs:
 !		class		- Property list class identifier
 !		name 		- name of the property to remove
-! Outputs:  
-!		hdferr:		- error code		
-!                                       
-!				 	Success: 0 
-!				 	Failure: -1   
+! Outputs:
+!		hdferr:		- error code
+!
+!				 	Success: 0
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5punregister_f(class, name, hdferr) 
+          SUBROUTINE h5punregister_f(class, name, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -4997,30 +4997,30 @@
           END SUBROUTINE h5punregister_f
 
 !----------------------------------------------------------------------
-! Name:		h5pclose_class_f 
+! Name:		h5pclose_class_f
 !
-! Purpose: 	Closes an existing property list class. 
+! Purpose: 	Closes an existing property list class.
 
 !
-! Inputs:  
+! Inputs:
 !		class		- Property list class identifier
-! Outputs:  
-!		hdferr:		- error code		
-!                                       
-!				 	Success: 0 
-!				 	Failure: -1   
+! Outputs:
+!		hdferr:		- error code
+!
+!				 	Success: 0
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pclose_class_f(class, hdferr) 
+          SUBROUTINE h5pclose_class_f(class, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5044,12 +5044,12 @@
           END SUBROUTINE h5pclose_class_f
 
 !----------------------------------------------------------------------
-! Name:		h5pcreate_class_f 
+! Name:		h5pcreate_class_f
 !
 ! Purpose: 	Create a new property list class
 
 !
-! Inputs:  
+! Inputs:
 !		parent		- Property list identifier of the parent class
 !                                 Possible values include:
 !                                 H5P_ROOT_F
@@ -5059,24 +5059,24 @@
 !                                 H5P_DATASET_XFER_F
 !                                 H5P_FILE_MOUNT_F
 !		name 		- name of the class we are creating
-! Outputs:  
+! Outputs:
 !               class           - porperty list class identifier
-!		hdferr:		- error code		
-!                                       
-!				 	Success: 0 
-!				 	Failure: -1   
+!		hdferr:		- error code
+!
+!				 	Success: 0
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 9, 2002	
+!	        October 9, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pcreate_class_f(parent, name, class, hdferr) 
+          SUBROUTINE h5pcreate_class_f(parent, name, class, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5084,16 +5084,16 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: parent  ! parent property list class 
+            INTEGER(HID_T), INTENT(IN) :: parent  ! parent property list class
                                                   ! identifier
-            CHARACTER(LEN=*), INTENT(IN) :: name  ! name of property tocreate 
+            CHARACTER(LEN=*), INTENT(IN) :: name  ! name of property tocreate
             INTEGER(HID_T), INTENT(OUT) :: class  ! property list class identifier
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
 
             INTERFACE
               INTEGER FUNCTION h5pcreate_class_c(parent, name, name_len,&
-                                                 class) 
+                                                 class)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PCREATE_CLASS_C'::h5pcreate_class_c
@@ -5115,29 +5115,29 @@
 !
 ! Purpose: 	Registers a permanent property with a property list class.
 !
-! Inputs:  
-!		class		- property list class to register 
+! Inputs:
+!		class		- property list class to register
 !                                 permanent property within
 !		name 		- name of property to register
 !               size            - size of property in bytes
-!		value		- default value for property in newly 
+!		value		- default value for property in newly
 !                                 created property lists
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pregister_integer(class, name, size, value, hdferr) 
+          SUBROUTINE h5pregister_integer(class, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5145,9 +5145,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier 
+            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value	
+            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
             INTEGER,   INTENT(IN) :: value        ! Property value
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
             INTEGER :: name_len
@@ -5162,7 +5162,7 @@
               INTEGER(HID_T), INTENT(IN) :: class
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               INTEGER, INTENT(IN) :: value
               END FUNCTION h5pregister_integer_c
             END INTERFACE
@@ -5176,29 +5176,29 @@
 !
 ! Purpose: 	Registers a permanent property with a property list class.
 !
-! Inputs:  
-!		class		- property list class to register 
+! Inputs:
+!		class		- property list class to register
 !                                 permanent property within
 !		name 		- name of property to register
 !               size            - size of property in bytes
-!		value		- default value for property in newly 
+!		value		- default value for property in newly
 !                                 created property lists
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pregister_real(class, name, size, value, hdferr) 
+          SUBROUTINE h5pregister_real(class, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5206,9 +5206,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier 
+            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-            INTEGER(SIZE_T), INTENT(IN) :: size   ! size of the property value	
+            INTEGER(SIZE_T), INTENT(IN) :: size   ! size of the property value
             REAL,   INTENT(IN) :: value           ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
@@ -5223,7 +5223,7 @@
               INTEGER(HID_T), INTENT(IN) :: class
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               REAL, INTENT(IN) :: value
               END FUNCTION h5pregister_real_c
             END INTERFACE
@@ -5237,29 +5237,29 @@
 !
 ! Purpose: 	Registers a permanent property with a property list class.
 !
-! Inputs:  
-!		class		- property list class to register 
+! Inputs:
+!		class		- property list class to register
 !                                 permanent property within
 !		name 		- name of property to register
 !               size            - size of property in bytes
-!		value		- default value for property in newly 
+!		value		- default value for property in newly
 !                                 created property lists
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pregister_double(class, name, size, value, hdferr) 
+          SUBROUTINE h5pregister_double(class, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5267,9 +5267,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier 
+            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-            INTEGER(SIZE_T), INTENT(IN) :: size  ! size of the property value	
+            INTEGER(SIZE_T), INTENT(IN) :: size  ! size of the property value
             DOUBLE PRECISION,   INTENT(IN) :: value        ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
@@ -5284,7 +5284,7 @@
               INTEGER(HID_T), INTENT(IN) :: class
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               DOUBLE PRECISION, INTENT(IN) :: value
               END FUNCTION h5pregister_double_c
             END INTERFACE
@@ -5298,29 +5298,29 @@
 !
 ! Purpose: 	Registers a permanent property with a property list class.
 !
-! Inputs:  
-!		class		- property list class to register 
+! Inputs:
+!		class		- property list class to register
 !                                 permanent property within
 !		name 		- name of property to register
 !               size            - size of property in bytes
-!		value		- default value for property in newly 
+!		value		- default value for property in newly
 !                                 created property lists
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pregister_char(class, name, size, value, hdferr) 
+          SUBROUTINE h5pregister_char(class, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5328,9 +5328,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier 
+            INTEGER(HID_T), INTENT(IN) :: class   ! Property list class identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to register
-            INTEGER(SIZE_T), INTENT(IN) :: size  ! size of the property value	
+            INTEGER(SIZE_T), INTENT(IN) :: size  ! size of the property value
             CHARACTER(LEN=*),   INTENT(IN) :: value        ! Property value
             INTEGER, INTENT(OUT) :: hdferr  ! Error code
             INTEGER :: name_len
@@ -5348,7 +5348,7 @@
               INTEGER(HID_T), INTENT(IN) :: class
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               CHARACTER(LEN=*), INTENT(IN) :: value
               INTEGER, INTENT(IN)          :: value_len
               END FUNCTION h5pregisterc_c
@@ -5364,27 +5364,27 @@
 !
 ! Purpose: 	Registers a temporary property with a property list class.
 !
-! Inputs:  
+! Inputs:
 !		plist		- property list identifier
 !		name 		- name of property to insert
 !               size            - size of property in bytes
-!		value		- initial value for the property 
-! Outputs:  
-!		hdferr:		- error code		
+!		value		- initial value for the property
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pinsert_integer(plist, name, size, value, hdferr) 
+          SUBROUTINE h5pinsert_integer(plist, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5392,9 +5392,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert 
-            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value	
+            INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
+            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
             INTEGER,   INTENT(IN) :: value        ! Property value
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
             INTEGER :: name_len
@@ -5409,7 +5409,7 @@
               INTEGER(HID_T), INTENT(IN) :: plist
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               INTEGER, INTENT(IN) :: value
               END FUNCTION h5pinsert_integer_c
             END INTERFACE
@@ -5423,28 +5423,28 @@
 !
 ! Purpose: 	Registers a temporary property with a property list class.
 !
-! Inputs:  
+! Inputs:
 !		plist		- property list identifier
 !                                 permanent property within
 !		name 		- name of property to insert
 !               size            - size of property in bytes
-!		value		- initial value for the property 
-! Outputs:  
-!		hdferr:		- error code		
+!		value		- initial value for the property
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pinsert_real(plist, name, size, value, hdferr) 
+          SUBROUTINE h5pinsert_real(plist, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5452,9 +5452,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert 
-            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value	
+            INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
+            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
             REAL,   INTENT(IN) :: value           ! Property value
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
             INTEGER :: name_len
@@ -5469,7 +5469,7 @@
               INTEGER(HID_T), INTENT(IN) :: plist
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               REAL, INTENT(IN) :: value
               END FUNCTION h5pinsert_real_c
             END INTERFACE
@@ -5483,28 +5483,28 @@
 !
 ! Purpose: 	Registers a temporary property with a property list class.
 !
-! Inputs:  
+! Inputs:
 !		plist		- property list identifier
 !                                 permanent property within
 !		name 		- name of property to insert
 !               size            - size of property in bytes
-!		value		- initial value for the property 
-! Outputs:  
-!		hdferr:		- error code		
+!		value		- initial value for the property
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pinsert_double(plist, name, size, value, hdferr) 
+          SUBROUTINE h5pinsert_double(plist, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5512,9 +5512,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert 
-            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value	
+            INTEGER(HID_T), INTENT(IN) :: plist   ! Property list identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name  ! Name of property to insert
+            INTEGER(SIZE_T), INTENT(IN) :: size   ! Size of the property value
             DOUBLE PRECISION, INTENT(IN) :: value ! Property value
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
             INTEGER :: name_len
@@ -5529,7 +5529,7 @@
               INTEGER(HID_T), INTENT(IN) :: plist
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               DOUBLE PRECISION, INTENT(IN) :: value
               END FUNCTION h5pinsert_double_c
             END INTERFACE
@@ -5543,28 +5543,28 @@
 !
 ! Purpose: 	Registers a temporary property with a property list class.
 !
-! Inputs:  
+! Inputs:
 !		plist		- property list identifier
 !                                 permanent property within
 !		name 		- name of property to insert
 !               size            - size of property in bytes
-!		value		- initial value for the property 
-! Outputs:  
-!		hdferr:		- error code		
+!		value		- initial value for the property
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!	        October 10, 2002	
+!	        October 10, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr) 
+          SUBROUTINE h5pinsert_char(plist, name, size, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5572,9 +5572,9 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: plist      ! Property list identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to insert 
-            INTEGER(SIZE_T), INTENT(IN) :: size      ! Size of property value	
+            INTEGER(HID_T), INTENT(IN) :: plist      ! Property list identifier
+            CHARACTER(LEN=*), INTENT(IN) :: name     ! Name of property to insert
+            INTEGER(SIZE_T), INTENT(IN) :: size      ! Size of property value
             CHARACTER(LEN=*),   INTENT(IN) :: value  ! Property value
             INTEGER, INTENT(OUT) :: hdferr           ! Error code
             INTEGER :: name_len
@@ -5591,7 +5591,7 @@
               INTEGER(HID_T), INTENT(IN) :: plist
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)         :: name_len
-              INTEGER(SIZE_T), INTENT(IN) :: size 
+              INTEGER(SIZE_T), INTENT(IN) :: size
               CHARACTER(LEN=*), INTENT(IN) :: value
               INTEGER, INTENT(IN)         :: value_len
               END FUNCTION h5pinsertc_c
@@ -5603,29 +5603,29 @@
           END SUBROUTINE h5pinsert_char
 
 !----------------------------------------------------------------------
-! Name:		h5pset_shuffle_f 
+! Name:		h5pset_shuffle_f
 !
 ! Purpose: 	Sets shuffling filter
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_shuffle_f(prp_id, hdferr) 
+          SUBROUTINE h5pset_shuffle_f(prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5633,7 +5633,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_shuffle_c
@@ -5653,32 +5653,32 @@
           END SUBROUTINE h5pset_shuffle_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_edc_check_f 
+! Name:		h5pset_edc_check_f
 !
-! Purpose: 	Enables/disables error detecting  
+! Purpose: 	Enables/disables error detecting
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
 !               flag            - EDC flag; possible values:
 !                                   H5Z_DISABLE_EDC_F
 !                                   H5Z_ENABLE_EDC_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 13, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_edc_check_f(prp_id, flag, hdferr) 
+          SUBROUTINE h5pset_edc_check_f(prp_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5686,7 +5686,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: flag          ! Checksum filter flag
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
 
@@ -5700,7 +5700,7 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_EDC_CHECK_C'::h5pset_edc_check_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(IN) :: flag 
+              INTEGER, INTENT(IN) :: flag
               END FUNCTION h5pset_edc_check_c
             END INTERFACE
             hdferr = h5pset_edc_check_c(prp_id, flag)
@@ -5708,29 +5708,29 @@
           END SUBROUTINE h5pset_edc_check_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_edc_check_f 
+! Name:		h5pget_edc_check_f
 !
-! Purpose: 	Queries error detecting  
+! Purpose: 	Queries error detecting
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 13, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_edc_check_f(prp_id, flag, hdferr) 
+          SUBROUTINE h5pget_edc_check_f(prp_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5738,7 +5738,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset transfer property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset transfer property list identifier
             INTEGER, INTENT(OUT) :: flag        ! Checksum filter flag
                                                  ! May have one of the following values:
                                                  ! H5Z_ERROR_EDC_F
@@ -5764,30 +5764,30 @@
 
           END SUBROUTINE h5pget_edc_check_f
 !----------------------------------------------------------------------
-! Name:		h5pset_fletcher32_f 
+! Name:		h5pset_fletcher32_f
 !
-! Purpose: 	Sets Fletcher32 checksum of EDC for a dataset creation 
+! Purpose: 	Sets Fletcher32 checksum of EDC for a dataset creation
 !               property list.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 13, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_fletcher32_f(prp_id, hdferr) 
+          SUBROUTINE h5pset_fletcher32_f(prp_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5795,7 +5795,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
 
 !            INTEGER, EXTERNAL :: h5pset_fletcher32_c
@@ -5815,30 +5815,30 @@
           END SUBROUTINE h5pset_fletcher32_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_family_offset_f 
+! Name:		h5pset_family_offset_f
 !
 ! Purpose: 	Sets offset for family file driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
 !               offset		- file offset
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		19 March 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_family_offset_f(prp_id, offset, hdferr) 
+          SUBROUTINE h5pset_family_offset_f(prp_id, offset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5846,7 +5846,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER(HSIZE_T), INTENT(IN) :: offset ! Offset in bytes
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
 
@@ -5860,7 +5860,7 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAMILY_OFFSET_C'::h5pset_family_offset_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER(HSIZE_T), INTENT(IN) :: offset 
+              INTEGER(HSIZE_T), INTENT(IN) :: offset
               END FUNCTION h5pset_family_offset_c
             END INTERFACE
             hdferr = h5pset_family_offset_c(prp_id, offset)
@@ -5868,33 +5868,33 @@
           END SUBROUTINE h5pset_family_offset_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_multi_l 
+! Name:		h5pset_fapl_multi_l
 !
-! Purpose: 	Sets up use of the multi-file driver. 
+! Purpose: 	Sets up use of the multi-file driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
 !               mem_map         - mapping array
 !               memb_fapl       - property list for each memory usage type
 !               memb_name       - names of member file
-!               relax           - flag 
-! Outputs:  
-!		hdferr:		- error code		
+!               relax           - flag
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		20 March 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_fapl_multi_l(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr) 
+          SUBROUTINE h5pset_fapl_multi_l(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5902,7 +5902,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
             INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(IN) :: memb_map
             INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(IN) :: memb_fapl
             CHARACTER(LEN=*), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(IN) :: memb_name
@@ -5926,7 +5926,7 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_MULTI_C'::h5pset_fapl_multi_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: memb_name
-              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
               INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(IN) :: memb_map
               INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(IN) :: memb_fapl
               CHARACTER(LEN=*), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(IN) :: memb_name
@@ -5943,34 +5943,34 @@
             enddo
             flag = 0
             if (relax) flag = 1
-            hdferr = h5pset_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag) 
+            hdferr = h5pset_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag)
 
           END SUBROUTINE h5pset_fapl_multi_l
 !----------------------------------------------------------------------
-! Name:		h5pset_fapl_multi_s 
+! Name:		h5pset_fapl_multi_s
 !
-! Purpose: 	Sets up use of the multi-file driver. 
+! Purpose: 	Sets up use of the multi-file driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-!               relax           - flag 
-! Outputs:  
-!		hdferr:		- error code		
+!               relax           - flag
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		31 March 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_fapl_multi_s(prp_id, relax, hdferr) 
+          SUBROUTINE h5pset_fapl_multi_s(prp_id, relax, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -5978,7 +5978,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
             LOGICAL, INTENT(IN) :: relax
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
             INTEGER :: flag
@@ -5987,48 +5987,48 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5pset_fapl_multi_sc(prp_id,flag) 
+              INTEGER FUNCTION h5pset_fapl_multi_sc(prp_id,flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_MULTI_SC'::h5pset_fapl_multi_sc
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
               INTEGER, INTENT(IN) :: flag
               END FUNCTION h5pset_fapl_multi_sc
             END INTERFACE
             flag = 0
             if (relax) flag = 1
-            hdferr = h5pset_fapl_multi_sc(prp_id, flag) 
+            hdferr = h5pset_fapl_multi_sc(prp_id, flag)
 
           END SUBROUTINE h5pset_fapl_multi_s
 !----------------------------------------------------------------------
-! Name:		h5pget_fapl_multi_f 
+! Name:		h5pget_fapl_multi_f
 !
-! Purpose: 	Sets up use of the multi-file driver. 
+! Purpose: 	Sets up use of the multi-file driver.
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- file creation property list identifier
-! Outputs:  
+! Outputs:
 !               mem_map         - mapping array
 !               memb_fapl       - property list for each memory usage type
 !               memb_name       - names of member file
-!               relax           - flag 
-!		hdferr:		- error code		
+!               relax           - flag
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				maxlen_out - maximum length for memb_name array element 
+!				maxlen_out - maximum length for memb_name array element
 !
 ! Programmer:	Elena Pourmal
 !		24 March 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pget_fapl_multi_f(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr, maxlen_out) 
+          SUBROUTINE h5pget_fapl_multi_f(prp_id, memb_map, memb_fapl, memb_name, memb_addr, relax, hdferr, maxlen_out)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6036,18 +6036,18 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
             INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(OUT) :: memb_map
             INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(OUT) :: memb_fapl
             CHARACTER(LEN=*), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(OUT) :: memb_name
             !INTEGER(HADDR_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(OUT) :: memb_addr
             REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1), INTENT(OUT) :: memb_addr
-            INTEGER, OPTIONAL, INTENT(OUT) :: maxlen_out 
+            INTEGER, OPTIONAL, INTENT(OUT) :: maxlen_out
             LOGICAL, INTENT(OUT) :: relax
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
             INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: lenm
             INTEGER :: maxlen
-            INTEGER :: c_maxlen_out 
+            INTEGER :: c_maxlen_out
             INTEGER :: flag
             INTEGER :: i
 
@@ -6062,14 +6062,14 @@
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_MULTI_C'::h5pget_fapl_multi_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: memb_name
-              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
               INTEGER, DIMENSION(H5FD_MEM_NTYPES_F), INTENT(OUT) :: memb_map
               INTEGER(HID_T), DIMENSION(H5FD_MEM_NTYPES_F), INTENT(OUT) :: memb_fapl
               CHARACTER(LEN=*), DIMENSION(H5FD_MEM_NTYPES_F), INTENT(OUT) :: memb_name
               REAL, DIMENSION(H5FD_MEM_NTYPES_F), INTENT(OUT) :: memb_addr
               INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: lenm
               INTEGER :: maxlen
-              INTEGER :: c_maxlen_out 
+              INTEGER :: c_maxlen_out
               INTEGER, INTENT(OUT) :: flag
               END FUNCTION h5pget_fapl_multi_c
             END INTERFACE
@@ -6077,37 +6077,37 @@
             do i=0, H5FD_MEM_NTYPES_F-1
              lenm(i) = LEN_TRIM(memb_name(i))
             enddo
-            hdferr = h5pget_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag, c_maxlen_out) 
+            hdferr = h5pget_fapl_multi_c(prp_id, memb_map, memb_fapl, memb_name, lenm, maxlen, memb_addr, flag, c_maxlen_out)
             relax = .TRUE.
-            if(flag .eq. 0) relax = .FALSE. 
+            if(flag .eq. 0) relax = .FALSE.
             if(present(maxlen_out)) maxlen_out = c_maxlen_out
           END SUBROUTINE h5pget_fapl_multi_f
 !----------------------------------------------------------------------
-! Name:		h5pset_szip_f 
+! Name:		h5pset_szip_f
 !
 ! Purpose: 	Sets up use of szip compression
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- dataset creation property list identifier
 !               options_mask
 !               pixels_per_block - szip parameters
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		April 10 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pset_szip_f(prp_id, options_mask, pixels_per_block, hdferr) 
+          SUBROUTINE h5pset_szip_f(prp_id, options_mask, pixels_per_block, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6115,8 +6115,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property 
-                                                 ! list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property
+                                                 ! list identifier
             INTEGER, INTENT(IN) :: options_mask
             INTEGER, INTENT(IN) :: pixels_per_block
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
@@ -6125,47 +6125,47 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5pset_szip_c(prp_id, options_mask, pixels_per_block) 
+              INTEGER FUNCTION h5pset_szip_c(prp_id, options_mask, pixels_per_block)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SZIP_C'::h5pset_szip_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
               INTEGER, INTENT(IN) :: options_mask
               INTEGER, INTENT(IN) :: pixels_per_block
               END FUNCTION h5pset_szip_c
             END INTERFACE
-            hdferr = h5pset_szip_c(prp_id, options_mask, pixels_per_block) 
+            hdferr = h5pset_szip_c(prp_id, options_mask, pixels_per_block)
 
           END SUBROUTINE h5pset_szip_f
 
 !----------------------------------------------------------------------
-! Name:		h5pall_filters_avail_f 
+! Name:		h5pall_filters_avail_f
 !
 ! Purpose: 	Checks if all filters set in the dataset creation
 !               property list are available
 !
-! Inputs:  
+! Inputs:
 !		prp_id		- data creation property list identifier
-! Outputs:  
+! Outputs:
 !               flag            - .TRUE. if all filters are available
 !                                 .FALSE. otherwise
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		April 10 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5pall_filters_avail_f(prp_id, flag, hdferr) 
+          SUBROUTINE h5pall_filters_avail_f(prp_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6173,8 +6173,8 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property 
-                                                 ! list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Dataset creation property
+                                                 ! list identifier
             LOGICAL, INTENT(OUT) :: flag
             INTEGER, INTENT(OUT) :: hdferr       ! Error code
             INTEGER :: status
@@ -6183,30 +6183,30 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5pall_filters_avail_c(prp_id, status) 
+              INTEGER FUNCTION h5pall_filters_avail_c(prp_id, status)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PALL_FILTERS_AVAIL_C'::h5pall_filters_avail_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier 
+              INTEGER(HID_T), INTENT(IN) :: prp_id ! File creation property list identifier
               INTEGER, INTENT(OUT) :: status
               END FUNCTION h5pall_filters_avail_c
             END INTERFACE
             flag = .TRUE.
-            hdferr = h5pall_filters_avail_c(prp_id, status) 
+            hdferr = h5pall_filters_avail_c(prp_id, status)
             if (status .eq. 0 ) flag = .FALSE.
 
           END SUBROUTINE h5pall_filters_avail_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_filter_by_id_f 
+! Name:		h5pget_filter_by_id_f
 !
 ! Purpose: 	Returns information about a filter in a pipeline
 !
-! Inputs:  
-!		prp_id		- data creation or transfer property list 
+! Inputs:
+!		prp_id		- data creation or transfer property list
 !				  identifier
-! Outputs:  
+! Outputs:
 !		filter_id	- filter identifier
 !		flags		- bit vector specifying certain general
 !				  properties of the filter
@@ -6214,21 +6214,21 @@
 !		cd_values	- auxiliary data for the filter
 !		namelen		- number of characters in the name buffer
 !		name		- buffer to retrieve filter name
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		April 10 2003
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pget_filter_by_id_f(prp_id, filter_id, flags, cd_nelmts, cd_values, namelen, name, hdferr) 
+          SUBROUTINE h5pget_filter_by_id_f(prp_id, filter_id, flags, cd_nelmts, cd_values, namelen, name, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6236,7 +6236,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
 
             INTEGER, INTENT(IN) :: filter_id  ! Filter identifier
             INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts  !Number of elements in cd_values.
@@ -6261,48 +6261,48 @@
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
               INTEGER(HID_T), INTENT(IN) :: prp_id
-              INTEGER, INTENT(IN) :: filter_id 
+              INTEGER, INTENT(IN) :: filter_id
               INTEGER, DIMENSION(*), INTENT(OUT) :: cd_values
-              INTEGER, INTENT(OUT) :: flags 
+              INTEGER, INTENT(OUT) :: flags
               INTEGER(SIZE_T), INTENT(INOUT) :: cd_nelmts
               INTEGER(SIZE_T), INTENT(IN) :: namelen
               CHARACTER(LEN=*), INTENT(OUT) :: name
               END FUNCTION h5pget_filter_by_id_c
             END INTERFACE
 
-            hdferr = h5pget_filter_by_id_c(prp_id, filter_id, flags, cd_nelmts,  & 
+            hdferr = h5pget_filter_by_id_c(prp_id, filter_id, flags, cd_nelmts,  &
                                      cd_values, namelen, name)
           END SUBROUTINE h5pget_filter_by_id_f
 
 !----------------------------------------------------------------------
-! Name:		h5pmodify_filter_f 
+! Name:		h5pmodify_filter_f
 !
-! Purpose: 	Adds a filter to the filter pipeline. 
+! Purpose: 	Adds a filter to the filter pipeline.
 !
-! Inputs:  
-!		prp_id		- data creation or transfer property list 
+! Inputs:
+!		prp_id		- data creation or transfer property list
 !				  identifier
 !		filter		- filter to be modified
 !		flags		- bit vector specifying certain general
 !				  properties of the filter
 !		cd_nelmts	- number of elements in cd_values
 !		cd_values	- auxiliary data for the filter
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		April 10 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5pmodify_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr) 
+          SUBROUTINE h5pmodify_filter_f(prp_id, filter, flags, cd_nelmts, cd_values,  hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6310,7 +6310,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier 
+            INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
             INTEGER, INTENT(IN) :: filter  !Filter to be modified
             INTEGER, INTENT(IN) :: flags  !Bit vector specifying certain general
                                           !properties of the filter.
@@ -6328,11 +6328,11 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PMODIFY_FILTER_C'::h5pmodify_filter_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
-              INTEGER, INTENT(IN) :: filter 
-              INTEGER, INTENT(IN) :: flags 
-              INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts 
-              INTEGER, DIMENSION(*), INTENT(IN) :: cd_values 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
+              INTEGER, INTENT(IN) :: filter
+              INTEGER, INTENT(IN) :: flags
+              INTEGER(SIZE_T), INTENT(IN) :: cd_nelmts
+              INTEGER, DIMENSION(*), INTENT(IN) :: cd_values
               END FUNCTION h5pmodify_filter_c
             END INTERFACE
 
@@ -6340,27 +6340,27 @@
           END SUBROUTINE h5pmodify_filter_f
 
 !----------------------------------------------------------------------
-! Name:		h5premove_filter_f 
+! Name:		h5premove_filter_f
 !
-! Purpose: 	Delete one or more filters from the filter pipeline. 
+! Purpose: 	Delete one or more filters from the filter pipeline.
 !
-! Inputs:  
-!		prp_id		- data creation or transfer property list 
+! Inputs:
+!		prp_id		- data creation or transfer property list
 !				  identifier
 !		filter		- filter to be removed
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Quincey Koziol
 !		January 27 2004
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5premove_filter_f(prp_id, filter, hdferr)
@@ -6385,8 +6385,8 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PREMOVE_FILTER_C'::h5premove_filter_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: prp_id 
-              INTEGER, INTENT(IN) :: filter 
+              INTEGER(HID_T), INTENT(IN) :: prp_id
+              INTEGER, INTENT(IN) :: filter
               END FUNCTION h5premove_filter_c
             END INTERFACE
 
@@ -6394,29 +6394,29 @@
           END SUBROUTINE h5premove_filter_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pget_attr_phase_change_f 
+! Name:		H5Pget_attr_phase_change_f
 !
-! Purpose: 	Retrieves attribute storage phase change thresholds 
+! Purpose: 	Retrieves attribute storage phase change thresholds
 !
-! Inputs:  
+! Inputs:
 !		ocpl_id		- Object (dataset or group) creation property list identifier
-! Outputs:  
+! Outputs:
 !               max_compact     - Maximum number of attributes to be stored in compact storage
 !                                 (Default: 8)
 !               min_dense       - Minimum number of attributes to be stored in dense storage
 !                                 (Default: 6)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pget_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
@@ -6445,34 +6445,34 @@
          INTEGER(HID_T), INTENT(IN) :: ocpl_id
          INTEGER, INTENT(OUT) :: max_compact
          INTEGER, INTENT(OUT) :: min_dense
- 
+
        END FUNCTION h5pget_attr_phase_change_c
     END INTERFACE
-    
+
     hdferr = h5pget_attr_phase_change_c(ocpl_id, max_compact, min_dense)
   END SUBROUTINE h5pget_attr_phase_change_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pset_attr_creation_order_f 
+! Name:		H5Pset_attr_creation_order_f
 !
 ! Purpose: 	Sets tracking and indexing of attribute creation order
 !
-! Inputs:  
+! Inputs:
 !		ocpl_id		- Object creation property list identifier
 !               crt_order_flags - Flags specifying whether to track and index attribute creation order
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_attr_creation_order_f(ocpl_id, crt_order_flags , hdferr)
@@ -6498,35 +6498,35 @@
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: ocpl_id
          INTEGER, INTENT(IN) :: crt_order_flags
- 
+
        END FUNCTION H5Pset_attr_creation_order_c
     END INTERFACE
-    
+
     hdferr = H5Pset_attr_creation_order_c(ocpl_id, crt_order_flags)
   END SUBROUTINE h5pset_attr_creation_order_f
-  
+
 
 !----------------------------------------------------------------------
-! Name:		H5Pset_shared_mesg_nindexes_f 
+! Name:		H5Pset_shared_mesg_nindexes_f
 !
-! Purpose: 	Sets number of shared object header message indexes 
+! Purpose: 	Sets number of shared object header message indexes
 !
-! Inputs:  
+! Inputs:
 !               plist_id - file creation property list
 !               nindexes - Number of shared object header message indexes to be available in files created with this property list
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_shared_mesg_nindexes_f( plist_id, nindexes, hdferr)
@@ -6538,7 +6538,7 @@
 !
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: plist_id ! file creation property list
-    INTEGER, INTENT(IN) :: nindexes ! Number of shared object header message indexes 
+    INTEGER, INTENT(IN) :: nindexes ! Number of shared object header message indexes
                                      !  available in files created WITH this property list
     INTEGER, INTENT(OUT) :: hdferr   ! Error code
 !
@@ -6550,41 +6550,41 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHARED_MESG_NINDEXES_C'::h5pset_shared_mesg_nindexes_c
          !DEC$ ENDIF
-         
+
          INTEGER(HID_T), INTENT(IN) :: plist_id
          INTEGER, INTENT(IN) :: nindexes
-         
+
        END FUNCTION H5pset_shared_mesg_nindexes_c
     END INTERFACE
-    
-    hdferr = h5pset_shared_mesg_nindexes_c(plist_id, nindexes) 
+
+    hdferr = h5pset_shared_mesg_nindexes_c(plist_id, nindexes)
 
   END SUBROUTINE h5pset_shared_mesg_nindexes_f
-  
+
 !----------------------------------------------------------------------
 ! Name:		H5Pset_shared_mesg_index_f
 !
 ! Purpose: 	Configures the specified shared object header message index
 !
-! Inputs:  
+! Inputs:
 !            fcpl_id - File creation property list identifier.
 !          index_num - Index being configured.
 !    mesg_type_flags - Types of messages that should be stored in this index.
 !      min_mesg_size - Minimum message size.
 !
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_shared_mesg_index_f(fcpl_id, index_num, mesg_type_flags, min_mesg_size, hdferr)
@@ -6610,19 +6610,19 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_SHARED_MESG_INDEX_C'::h5pset_shared_mesg_index_c
          !DEC$ ENDIF
-         
-         INTEGER(HID_T), INTENT(IN) :: fcpl_id 
+
+         INTEGER(HID_T), INTENT(IN) :: fcpl_id
          INTEGER, INTENT(IN) :: index_num
          INTEGER, INTENT(IN) :: mesg_type_flags
          INTEGER, INTENT(IN) :: min_mesg_size
-         
+
        END FUNCTION H5pset_shared_mesg_index_c
     END INTERFACE
-    
-    hdferr = h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size) 
+
+    hdferr = h5pset_shared_mesg_index_c(fcpl_id, index_num, mesg_type_flags, min_mesg_size)
 
   END SUBROUTINE h5pset_shared_mesg_index_f
-  
+
 !----------------------------------------------------------------------
 ! Name:	      H5Pget_attr_creation_order_f
 !
@@ -6633,18 +6633,18 @@
 !
 ! Outputs:
 !             crt_order_flags - Flags specifying whether to track and index attribute creation order
-!	      hdferr:		- error code		
+!	      hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pget_attr_creation_order_f(ocpl_id, crt_order_flags, hdferr)
@@ -6655,8 +6655,8 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (group or dataset) creation property list identifier 
-    INTEGER, INTENT(OUT) :: crt_order_flags ! Flags specifying whether to track and index attribute creation order 
+    INTEGER(HID_T), INTENT(IN) :: ocpl_id ! Object (group or dataset) creation property list identifier
+    INTEGER, INTENT(OUT) :: crt_order_flags ! Flags specifying whether to track and index attribute creation order
     INTEGER, INTENT(OUT) :: hdferr   ! Error code
 !
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -6670,7 +6670,7 @@
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: ocpl_id
          INTEGER, INTENT(OUT) :: crt_order_flags
-         
+
        END FUNCTION H5pget_attr_creation_order_c
     END INTERFACE
 
@@ -6689,18 +6689,18 @@
 !                high - The latest version of the library that will be used for writing objects.
 !
 ! Outputs:
-!	      hdferr:		- error code		
+!	      hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 18, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_libver_bounds_f(fapl_id, low, high, hdferr)
@@ -6733,7 +6733,7 @@
          INTEGER(HID_T), INTENT(IN) :: fapl_id
          INTEGER, INTENT(IN) :: low
          INTEGER, INTENT(IN) :: high
-         
+
        END FUNCTION H5pset_libver_bounds_c
     END INTERFACE
 
@@ -6742,7 +6742,7 @@
   END SUBROUTINE h5pset_libver_bounds_f
 
 !----------------------------------------------------------------------
-! Name:	      H5Pset_link_creation_order_f 
+! Name:	      H5Pset_link_creation_order_f
 !
 ! Purpose:    Sets creation order tracking and indexing for links in a group.
 !
@@ -6751,18 +6751,18 @@
 !         crt_order_flags - Creation order flag(s)
 !
 ! Outputs:
-!	      hdferr:		- error code		
+!	      hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 18, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
@@ -6788,7 +6788,7 @@
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: gcpl_id
          INTEGER, INTENT(IN) :: crt_order_flags
-         
+
        END FUNCTION H5pset_link_creation_order_c
     END INTERFACE
 
@@ -6801,23 +6801,23 @@
 !
 ! Purpose: 	Queries the settings for conversion between compact and dense groups.
 !
-! Inputs:  
+! Inputs:
 !		gcpl_id  	- Group creation property list identifier
-! Outputs:  
+! Outputs:
 !               max_compact     - Maximum number of attributes to be stored in compact storage
 !               min_dense       - Minimum number of attributes to be stored in dense storage
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 20, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pget_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
@@ -6844,7 +6844,7 @@
          INTEGER(HID_T), INTENT(IN) :: gcpl_id
          INTEGER, INTENT(OUT) :: max_compact
          INTEGER, INTENT(OUT) :: min_dense
- 
+
        END FUNCTION h5pget_link_phase_change_c
     END INTERFACE
 
@@ -6852,30 +6852,30 @@
   END SUBROUTINE h5pget_link_phase_change_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pget_obj_track_times_f 
+! Name:		H5Pget_obj_track_times_f
 !
 ! Purpose: 	Returns whether times are tracked for an object.
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- property list id
 !               flag            - object timestamp setting
 !                                 .TRUE.,.FALSE.
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 22, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pget_obj_track_times_f(plist_id, flag, hdferr) 
+  SUBROUTINE h5pget_obj_track_times_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6883,8 +6883,8 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property 
-                                         ! list identifier 
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property
+                                         ! list identifier
     LOGICAL, INTENT(OUT) :: flag   ! Object timestamp setting
     INTEGER, INTENT(OUT) :: hdferr ! Error code
     INTEGER :: status
@@ -6892,27 +6892,27 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
-       INTEGER FUNCTION h5pget_obj_track_times_c(plist_id, status) 
+       INTEGER FUNCTION h5pget_obj_track_times_c(plist_id, status)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_OBJ_TRACK_TIMES_C'::h5pget_obj_track_times_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier 
+         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier
          INTEGER, INTENT(OUT) :: status
        END FUNCTION h5pget_obj_track_times_c
     END INTERFACE
     flag = .TRUE.
-    hdferr = h5pget_obj_track_times_c(plist_id, status) 
+    hdferr = h5pget_obj_track_times_c(plist_id, status)
     IF(status.EQ.0) flag = .FALSE.
 
   END SUBROUTINE h5pget_obj_track_times_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pset_obj_track_times_f 
+! Name:		H5Pset_obj_track_times_f
 !
 ! Purpose: 	Set whether the birth, access, modification & change times for
 !               an object are stored.
-! 
+!
 !               Birth time is the time the object was created.  Access time is
 !               the last time that metadata or raw data was read from this
 !               object.  Modification time is the last time the data for
@@ -6921,31 +6921,31 @@
 !               time is the last time the metadata for this object was written
 !               (adding/modifying/deleting an attribute on an object, extending
 !               the size of a dataset, etc).
-! 
+!
 !               If these times are not tracked, they will be reported as
 !               12:00 AM UDT, Jan. 1, 1970 (i.e. 0 seconds past the UNIX
 !               epoch) when queried.
 !
-! Inputs:  
+! Inputs:
 !		plist_id	- property list id
 !               flag            - object timestamp setting
 !                                 .TRUE.,.FALSE.
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 22, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_obj_track_times_f(plist_id, flag, hdferr) 
+  SUBROUTINE h5pset_obj_track_times_f(plist_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -6953,8 +6953,8 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property 
-                                           ! list identifier 
+    INTEGER(HID_T), INTENT(IN) :: plist_id ! Dataset creation property
+                                           ! list identifier
     LOGICAL, INTENT(IN) :: flag    ! Object timestamp setting
     INTEGER, INTENT(OUT) :: hdferr ! Error code
     INTEGER :: status
@@ -6962,12 +6962,12 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
-       INTEGER FUNCTION h5pset_obj_track_times_c(plist_id, status) 
+       INTEGER FUNCTION h5pset_obj_track_times_c(plist_id, status)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_OBJ_TRACK_TIMES_C'::h5pset_obj_track_times_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier 
+         INTEGER(HID_T), INTENT(IN) :: plist_id ! File creation property list identifier
          INTEGER, INTENT(IN) :: status
        END FUNCTION h5pset_obj_track_times_c
     END INTERFACE
@@ -6984,28 +6984,28 @@
 !
 ! Purpose: 	Specifies in property list whether to create missing intermediate groups.
 !
-! Inputs:  
+! Inputs:
 !		lcpl_id            - Link creation property list identifier
-!               crt_intermed_group - crt_intermed_group specifying whether 
-!                                    to create intermediate groups upon the creation 
+!               crt_intermed_group - crt_intermed_group specifying whether
+!                                    to create intermediate groups upon the creation
 !                                    of an object
 ! Outputs:
-!		hdferr:		   - error code		
+!		hdferr:		   - error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		February 22, 2008
 !
-! Modifications: 	
+! Modifications:
 !
 ! Comment: The long subroutine name (>31) on older f90 compilers causes problems
-!          so had to shorten the name		
+!          so had to shorten the name
 !--------------------------------------------------------------------------------------
 
-  SUBROUTINE h5pset_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr) 
+  SUBROUTINE h5pset_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7014,14 +7014,14 @@
 !
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: lcpl_id ! Link creation property list identifier
-    INTEGER, INTENT(IN) :: crt_intermed_group  ! specifying whether to create intermediate groups 
+    INTEGER, INTENT(IN) :: crt_intermed_group  ! specifying whether to create intermediate groups
                                                ! upon the creation of an object
     INTEGER, INTENT(OUT) :: hdferr ! Error code
 !
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
-       INTEGER FUNCTION h5pset_create_inter_group_c(lcpl_id, crt_intermed_group) 
+       INTEGER FUNCTION h5pset_create_inter_group_c(lcpl_id, crt_intermed_group)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_CREATE_INTER_GROUP_C'::h5pset_create_inter_group_c
@@ -7045,18 +7045,18 @@
 !
 ! Outputs:
 !             crt_order_flags - Creation order flag(s)
-!	      hdferr:		- error code		
+!	      hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 3, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pget_link_creation_order_f(gcpl_id, crt_order_flags, hdferr)
@@ -7082,7 +7082,7 @@
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: gcpl_id
          INTEGER, INTENT(OUT) :: crt_order_flags
-         
+
        END FUNCTION H5pget_link_creation_order_c
     END INTERFACE
 
@@ -7091,7 +7091,7 @@
   END SUBROUTINE h5pget_link_creation_order_f
 
 !----------------------------------------------------------------------
-! Name:	      H5Pset_char_encoding 
+! Name:	      H5Pset_char_encoding
 !
 ! Purpose:    Sets the character encoding used to encode a string.
 !
@@ -7102,18 +7102,18 @@
 !     	                    H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
 !
 ! Outputs:
-!	      hdferr:		- error code		
+!	      hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 3, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_char_encoding_f(plist_id, encoding, hdferr)
@@ -7125,7 +7125,7 @@
 !
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: plist_id ! Property list identifier
-    
+
     INTEGER, INTENT(IN) :: encoding ! String encoding character set:
 !     	                                    H5T_CSET_ASCII_F -> US ASCII
 !     	                                    H5T_CSET_UTF8_F  -> UTF-8 Unicode encoding
@@ -7142,7 +7142,7 @@
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: plist_id
          INTEGER, INTENT(IN) :: encoding
-         
+
        END FUNCTION H5pset_char_encoding_c
     END INTERFACE
 
@@ -7151,7 +7151,7 @@
   END SUBROUTINE h5pset_char_encoding_f
 
 !----------------------------------------------------------------------
-! Name:	      H5Pget_char_encoding 
+! Name:	      H5Pget_char_encoding
 !
 ! Purpose:    Retrieves the character encoding used to create a string
 !
@@ -7162,18 +7162,18 @@
 !             encoding - Valid values for encoding are:
 !     	                    H5T_CSET_ASCII_F -> US ASCII
 !     	                    H5T_CSET_UTF8_F -> UTF-8 Unicode encoding
-!	        hdferr - error code		
+!	        hdferr - error code
 !		            Success:  0
-!		            Failure: -1   
+!		            Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 3, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE  h5pget_char_encoding_f(plist_id, encoding, hdferr)
@@ -7185,7 +7185,7 @@
 !
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: plist_id ! Property list identifier
-    
+
     INTEGER, INTENT(OUT) :: encoding ! Valid values for encoding are:
 !     	                                            H5T_CSET_ASCII_F -> US ASCII
 !     	                                            H5T_CSET_UTF8_F  -> UTF-8 Unicode encoding
@@ -7202,7 +7202,7 @@
          !DEC$ ENDIF
          INTEGER(HID_T), INTENT(IN) :: plist_id
          INTEGER, INTENT(OUT) :: encoding
-         
+
        END FUNCTION H5pget_char_encoding_c
     END INTERFACE
 
@@ -7211,17 +7211,17 @@
   END SUBROUTINE h5pget_char_encoding_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_copy_object_f 
+! Name:		h5pset_copy_object_f
 !
 ! Purpose: 	Sets properties to be used when an object is copied.
 !
-! Inputs: 
+! Inputs:
 !               ocp_plist_id - Object copy property list identifier
 !               copy_options - Copy option(s) to be set
-! Outputs:  
-!		hdferr	     - error code		
+! Outputs:
+!		hdferr	     - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -7230,10 +7230,10 @@
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_copy_object_f(ocp_plist_id, copy_options, hdferr) 
+  SUBROUTINE h5pset_copy_object_f(ocp_plist_id, copy_options, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7244,7 +7244,7 @@
     INTEGER(HID_T), INTENT(IN) :: ocp_plist_id ! Object copy property list identifier
     INTEGER, INTENT(IN) :: copy_options ! Copy option(s) to be set, valid options are:
                                         !   H5O_COPY_SHALLOW_HIERARCHY_F
-                                        !   H5O_COPY_EXPAND_SOFT_LINK_F 
+                                        !   H5O_COPY_EXPAND_SOFT_LINK_F
                                         !   H5O_COPY_EXPAND_EXT_LINK_F
                                         !   H5O_COPY_EXPAND_REFERENCE_F
                                         !   H5O_COPY_WITHOUT_ATTR_FLAG_F
@@ -7263,21 +7263,21 @@
          INTEGER, INTENT(IN) :: copy_options
        END FUNCTION h5pset_copy_object_c
     END INTERFACE
-    hdferr = h5pset_copy_object_c(ocp_plist_id, copy_options) 
+    hdferr = h5pset_copy_object_c(ocp_plist_id, copy_options)
   END SUBROUTINE h5pset_copy_object_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_copy_object_f 
+! Name:		h5pget_copy_object_f
 !
 ! Purpose: 	Retrieves the properties to be used when an object is copied.
 !
-! Inputs: 
+! Inputs:
 !               ocp_plist_id - Object copy property list identifier
-! Outputs:  
+! Outputs:
 !               copy_options - Copy option(s) to be get
-!		hdferr	     - error code		
+!		hdferr	     - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -7286,10 +7286,10 @@
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pget_copy_object_f(ocp_plist_id, copy_options, hdferr) 
+  SUBROUTINE h5pget_copy_object_f(ocp_plist_id, copy_options, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7300,7 +7300,7 @@
     INTEGER(HID_T), INTENT(IN) :: ocp_plist_id ! Object copy property list identifier
     INTEGER, INTENT(OUT) :: copy_options ! valid copy options returned are:
                                          !   H5O_COPY_SHALLOW_HIERARCHY_F
-                                         !   H5O_COPY_EXPAND_SOFT_LINK_F 
+                                         !   H5O_COPY_EXPAND_SOFT_LINK_F
                                          !   H5O_COPY_EXPAND_EXT_LINK_F
                                          !   H5O_COPY_EXPAND_REFERENCE_F
                                          !   H5O_COPY_WITHOUT_ATTR_FLAG_F
@@ -7318,22 +7318,22 @@
          INTEGER, INTENT(OUT) :: copy_options
        END FUNCTION h5pget_copy_object_c
     END INTERFACE
-    hdferr = h5pget_copy_object_c(ocp_plist_id, copy_options) 
+    hdferr = h5pget_copy_object_c(ocp_plist_id, copy_options)
   END SUBROUTINE h5pget_copy_object_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_data_transform_f 
+! Name:		h5pget_data_transform_f
 !
 ! Purpose: 	Retrieves a data transform expression.
 !
-! Inputs: 
+! Inputs:
 !               plist_id - Identifier of the property list or class
-! Outputs:  
+! Outputs:
 !               expression - buffer to hold transform expression
 !		hdferr	   - error code
 !                                       Success:  Actual lenght of the expression
-!                                                 If provided buffer "expression" is 
-!                                                 smaller, than expression will be 
+!                                                 If provided buffer "expression" is
+!                                                 smaller, than expression will be
 !                                                 truncated to fit into
 !                                                 provided user buffer
 !				 	Failure: -1
@@ -7348,7 +7348,7 @@
 ! Comment: Should hdferr return just 0 or 1 and add another arguement for the size?
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size) 
+  SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7364,7 +7364,7 @@
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
     INTEGER :: expression_len
     INTEGER(SIZE_T) :: size_default
-    
+
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -7374,8 +7374,8 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_DATA_TRANSFORM_C'::h5pget_data_transform_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id 
-         CHARACTER(LEN=*), INTENT(OUT) :: expression 
+         INTEGER(HID_T), INTENT(IN) :: plist_id
+         CHARACTER(LEN=*), INTENT(OUT) :: expression
          INTEGER(SIZE_T) :: size_default
          INTEGER :: expression_len
        END FUNCTION h5pget_data_transform_c
@@ -7391,14 +7391,14 @@
   END SUBROUTINE h5pget_data_transform_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_data_transform_f 
+! Name:		h5pset_data_transform_f
 !
 ! Purpose: 	Sets a data transform expression.
 !
-! Inputs: 
-!               plist_id - Identifier of the property list or class 
+! Inputs:
+!               plist_id - Identifier of the property list or class
 !               expression - buffer to hold transform expression
-! Outputs: 
+! Outputs:
 !		hdferr	   - error code
 !                                       Success:  0
 !				 	Failure: -1
@@ -7410,10 +7410,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_data_transform_f(plist_id, expression, hdferr) 
+  SUBROUTINE h5pset_data_transform_f(plist_id, expression, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7434,7 +7434,7 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_DATA_TRANSFORM_C'::h5pset_data_transform_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: plist_id 
+         INTEGER(HID_T), INTENT(IN) :: plist_id
          CHARACTER(LEN=*), INTENT(IN) :: expression
          INTEGER :: expression_len
        END FUNCTION h5pset_data_transform_c
@@ -7446,11 +7446,11 @@
   END SUBROUTINE h5pset_data_transform_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pget_local_heap_size_hint_f 
+! Name:		H5Pget_local_heap_size_hint_f
 !
 ! Purpose: 	Queries the local heap size hint for original-style groups.
 !
-! Inputs: 
+! Inputs:
 !               gcpl_id - Group creation property list identifier
 ! Outputs:
 !               size_hint - Hint for size of local heap
@@ -7465,10 +7465,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pget_local_heap_size_hint_f(gcpl_id, size_hint, hdferr) 
+  SUBROUTINE h5pget_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7498,13 +7498,13 @@
   END SUBROUTINE h5pget_local_heap_size_hint_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pget_est_link_info_f 
+! Name:		H5Pget_est_link_info_f
 !
 ! Purpose: 	Queries data required to estimate required local heap or object header size.
 !
-! Inputs: 
+! Inputs:
 !               gcpl_id - Group creation property list identifier
-! Outputs:  
+! Outputs:
 !       est_num_entries - Estimated number of links to be inserted into group
 !          est_name_len - Estimated average length of link names
 !		hdferr	- error code
@@ -7518,10 +7518,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pget_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr) 
+  SUBROUTINE h5pget_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7529,7 +7529,7 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier  
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
     INTEGER, INTENT(OUT) :: est_num_entries ! Estimated number of links to be inserted into group
     INTEGER, INTENT(OUT) :: est_name_len    ! Estimated average length of link names
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
@@ -7542,7 +7542,7 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_EST_LINK_INFO_C'::h5pget_est_link_info_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id  
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
          INTEGER, INTENT(OUT) :: est_num_entries
          INTEGER, INTENT(OUT) :: est_name_len
        END FUNCTION h5pget_est_link_info_c
@@ -7553,11 +7553,11 @@
   END SUBROUTINE h5pget_est_link_info_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pset_local_heap_size_hint_f 
+! Name:		H5Pset_local_heap_size_hint_f
 !
 ! Purpose: 	Sets the local heap size hint for original-style groups.
 !
-! Inputs: 
+! Inputs:
 !               gcpl_id - Group creation property list identifier
 !               size_hint - Hint for size of local heap
 ! Outputs:
@@ -7572,10 +7572,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_local_heap_size_hint_f(gcpl_id, size_hint, hdferr) 
+  SUBROUTINE h5pset_local_heap_size_hint_f(gcpl_id, size_hint, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7605,12 +7605,12 @@
   END SUBROUTINE h5pset_local_heap_size_hint_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_est_link_info_f 
+! Name:		h5pset_est_link_info_f
 !
 ! Purpose: 	Sets estimated number of links and length of link names in a group.
 !
-! Inputs: 
-!               gcpl_id - Group creation property list identifier  
+! Inputs:
+!               gcpl_id - Group creation property list identifier
 !       est_num_entries - Estimated number of links to be inserted into group
 !          est_name_len - Estimated average length of link names
 ! Outputs:
@@ -7625,10 +7625,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr) 
+  SUBROUTINE h5pset_est_link_info_f(gcpl_id, est_num_entries, est_name_len, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7636,7 +7636,7 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier  
+    INTEGER(HID_T), INTENT(IN) :: gcpl_id ! Group creation property list identifier
     INTEGER, INTENT(IN) :: est_num_entries ! Estimated number of links to be inserted into group
     INTEGER, INTENT(IN) :: est_name_len    ! Estimated average length of link names
     INTEGER, INTENT(OUT) :: hdferr       ! Error code
@@ -7649,7 +7649,7 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_EST_LINK_INFO_C'::h5pset_est_link_info_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: gcpl_id  
+         INTEGER(HID_T), INTENT(IN) :: gcpl_id
          INTEGER, INTENT(IN) :: est_num_entries
          INTEGER, INTENT(IN) :: est_name_len
        END FUNCTION h5pset_est_link_info_c
@@ -7664,23 +7664,23 @@
 !
 ! Purpose: 	Sets the parameters for conversion between compact and dense groups.
 !
-! Inputs:  
-!		gcpl_id  	- Group creation property list identifier  
+! Inputs:
+!		gcpl_id  	- Group creation property list identifier
 !               max_compact     - Maximum number of attributes to be stored in compact storage
 !               min_dense       - Minimum number of attributes to be stored in dense storage
 ! Outputs:
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 21, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_link_phase_change_f(gcpl_id, max_compact, min_dense, hdferr)
@@ -7707,7 +7707,7 @@
          INTEGER(HID_T), INTENT(IN) :: gcpl_id
          INTEGER, INTENT(IN) :: max_compact
          INTEGER, INTENT(IN) :: min_dense
- 
+
        END FUNCTION h5pset_link_phase_change_c
     END INTERFACE
 
@@ -7719,24 +7719,24 @@
 !
 ! Purpose: 	Sets up use of the direct I/O driver.
 !
-! Inputs:  
+! Inputs:
 !    fapl_id 	- File access property list identifier
 !    alignment 	- Required memory alignment boundary
 !    block_size - File system block size
 !    cbuf_size 	- Copy buffer size
 ! Outputs:
-!     hdferr:   - error code		
+!     hdferr:   - error code
 !		    Success:  0
-!		    Failure: -1   
+!		    Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 21, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
@@ -7746,7 +7746,7 @@
 !DEC$attributes dllexport :: h5pset_fapl_direct_f
 !DEC$endif
 !
-    IMPLICIT NONE  
+    IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier
     INTEGER(SIZE_T), INTENT(IN) :: alignment 	  ! Required memory alignment boundary!
     INTEGER(SIZE_T), INTENT(IN) :: block_size     ! File system block size
@@ -7761,7 +7761,7 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_FAPL_DIRECT_C'::h5pset_fapl_direct_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id 
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
          INTEGER(SIZE_T), INTENT(IN) :: alignment
          INTEGER(SIZE_T), INTENT(IN) :: block_size
          INTEGER(SIZE_T), INTENT(IN) :: cbuf_size
@@ -7776,24 +7776,24 @@
 !
 ! Purpose: 	Gets up use of the direct I/O driver.
 !
-! Inputs:  
+! Inputs:
 !    fapl_id 	- File access property list identifier
 ! Outputs:
 !    alignment 	- Required memory alignment boundary
 !    block_size - File system block size
 !    cbuf_size 	- Copy buffer size
-!     hdferr:   - error code		
+!     hdferr:   - error code
 !		    Success:  0
-!		    Failure: -1   
+!		    Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 21, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pget_fapl_direct_f(fapl_id, alignment, block_size, cbuf_size, hdferr)
@@ -7803,7 +7803,7 @@
 !DEC$attributes dllexport :: h5pget_fapl_direct_f
 !DEC$endif
 !
-    IMPLICIT NONE  
+    IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier
     INTEGER(SIZE_T), INTENT(OUT) :: alignment 	  ! Required memory alignment boundary!
     INTEGER(SIZE_T), INTENT(OUT) :: block_size     ! File system block size
@@ -7818,7 +7818,7 @@
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_FAPL_DIRECT_C'::h5pget_fapl_direct_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: fapl_id 
+         INTEGER(HID_T), INTENT(IN) :: fapl_id
          INTEGER(SIZE_T), INTENT(OUT) :: alignment
          INTEGER(SIZE_T), INTENT(OUT) :: block_size
          INTEGER(SIZE_T), INTENT(OUT) :: cbuf_size
@@ -7829,29 +7829,29 @@
   END SUBROUTINE h5pget_fapl_direct_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pset_attr_phase_change_f 
+! Name:		H5Pset_attr_phase_change_f
 !
 ! Purpose: 	Sets attribute storage phase change thresholds.
 !
-! Inputs:  
+! Inputs:
 !		ocpl_id		- Object (dataset or group) creation property list identifier
-! Outputs:  
+! Outputs:
 !               max_compact     - Maximum number of attributes to be stored in compact storage
 !                                 (Default: 8)
 !               min_dense       - Minimum number of attributes to be stored in dense storage
 !                                 (Default: 6)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		January, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr)
@@ -7880,21 +7880,21 @@
          INTEGER(HID_T), INTENT(IN) :: ocpl_id
          INTEGER, INTENT(IN) :: max_compact
          INTEGER, INTENT(IN) :: min_dense
- 
+
        END FUNCTION h5pset_attr_phase_change_c
     END INTERFACE
-    
+
     hdferr = h5pset_attr_phase_change_c(ocpl_id, max_compact, min_dense)
 
 
   END SUBROUTINE h5pset_attr_phase_change_f
 
 !----------------------------------------------------------------------
-! Name:		H5Pset_nbit_f 
+! Name:		H5Pset_nbit_f
 !
 ! Purpose: 	Sets up the use of the N-Bit filter.
 !
-! Inputs: 
+! Inputs:
 !               plist_id - Dataset creation property list identifier.
 ! Outputs:
 !		hdferr	  - error code
@@ -7908,10 +7908,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_nbit_f(plist_id, hdferr) 
+  SUBROUTINE h5pset_nbit_f(plist_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7939,11 +7939,11 @@
   END SUBROUTINE h5pset_nbit_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_scaleoffset_f 
+! Name:		h5pset_scaleoffset_f
 !
 ! Purpose: 	Sets up the use of the Scale-Offset filter.
 !
-! Inputs: 
+! Inputs:
 !               plist_id - Dataset creation property list identifier.
 !             scale_type - Flag indicating compression method.
 !           scale_factor - Parameter related to scale.
@@ -7959,10 +7959,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_scaleoffset_f(plist_id, scale_type, scale_factor, hdferr) 
+  SUBROUTINE h5pset_scaleoffset_f(plist_id, scale_type, scale_factor, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -7994,11 +7994,11 @@
   END SUBROUTINE h5pset_scaleoffset_f
 
 !----------------------------------------------------------------------
-! Name:		h5pset_nlinks_f 
+! Name:		h5pset_nlinks_f
 !
 ! Purpose: 	Sets maximum number of soft or user-defined link traversals.
 !
-! Inputs: 
+! Inputs:
 !            lapl_id - File access property list identifier
 !             nlinks - Maximum number of links to traverse
 !
@@ -8014,10 +8014,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pset_nlinks_f(lapl_id, nlinks, hdferr) 
+  SUBROUTINE h5pset_nlinks_f(lapl_id, nlinks, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -8028,7 +8028,7 @@
     INTEGER(HID_T), INTENT(IN) :: lapl_id ! File access property list identifier
     INTEGER(SIZE_T), INTENT(IN) :: nlinks ! Maximum number of links to traverse
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -8041,17 +8041,17 @@
          INTEGER(SIZE_T), INTENT(IN) :: nlinks
        END FUNCTION h5pset_nlinks_c
     END INTERFACE
-    
+
     hdferr = h5pset_nlinks_c(lapl_id, nlinks)
-    
+
   END SUBROUTINE h5pset_nlinks_f
 
 !----------------------------------------------------------------------
-! Name:		h5pget_nlinks_f 
+! Name:		h5pget_nlinks_f
 !
 ! Purpose:  Gets maximum number of soft or user-defined link traversals.
 !
-! Inputs: 
+! Inputs:
 !            lapl_id - File access property list identifier
 !             nlinks - Maximum number of links to traverse
 !
@@ -8067,10 +8067,10 @@
 !
 ! Modifications:
 !
-! Comment: 
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5pget_nlinks_f(lapl_id, nlinks, hdferr) 
+  SUBROUTINE h5pget_nlinks_f(lapl_id, nlinks, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -8081,7 +8081,7 @@
     INTEGER(HID_T), INTENT(IN) :: lapl_id ! File access property list identifier
     INTEGER(SIZE_T), INTENT(OUT) :: nlinks ! Maximum number of links to traverse
     INTEGER, INTENT(OUT) :: hdferr        ! Error code
-    
+
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
@@ -8094,9 +8094,9 @@
          INTEGER(SIZE_T), INTENT(OUT) :: nlinks
        END FUNCTION h5pget_nlinks_c
     END INTERFACE
-    
+
     hdferr = h5pget_nlinks_c(lapl_id, nlinks)
-    
+
   END SUBROUTINE h5pget_nlinks_f
 
 !----------------------------------------------------------------------
@@ -8104,27 +8104,27 @@
 !
 ! Purpose: 	Determines whether property is set to enable creating missing intermediate groups.
 !
-! Inputs:  
+! Inputs:
 !		lcpl_id            - Link creation property list identifier
-!               crt_intermed_group - Specifying whether to create intermediate groups upon 
+!               crt_intermed_group - Specifying whether to create intermediate groups upon
 !                                    the creation of an object
 ! Outputs:
-!		hdferr:		   - error code		
+!		hdferr:		   - error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	M.S. Breitenfeld
 !		April 4, 2008
 !
-! Modifications: 	
+! Modifications:
 !
 ! Comment: The long subroutine name (>31) on older f90 compilers causes problems
-!          so had to shorten the name		
+!          so had to shorten the name
 !--------------------------------------------------------------------------------------
 
-  SUBROUTINE h5pget_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr) 
+  SUBROUTINE h5pget_create_inter_group_f(lcpl_id, crt_intermed_group, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -8133,12 +8133,12 @@
 !
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: lcpl_id      ! Link creation property list identifier
-    INTEGER, INTENT(IN) :: crt_intermed_group  ! Flag specifying whether to create intermediate groups 
+    INTEGER, INTENT(IN) :: crt_intermed_group  ! Flag specifying whether to create intermediate groups
                                                ! upon creation of an object
     INTEGER, INTENT(OUT) :: hdferr ! Error code
 
     INTERFACE
-       INTEGER FUNCTION h5pget_create_inter_group_c(lcpl_id, crt_intermed_group) 
+       INTEGER FUNCTION h5pget_create_inter_group_c(lcpl_id, crt_intermed_group)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_CREATE_INTER_GROUP_C'::h5pget_create_inter_group_c
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index 299f6bd..ba5d273 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -242,7 +242,7 @@ nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type)
 /*----------------------------------------------------------------------------
  * Name:        h5rget_name_object_c
  * Purpose:     Call H5Rget_name for an object
- * Inputs: 
+ * Inputs:
  *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
  *          ref - An object or dataset region reference.
  *
@@ -285,14 +285,14 @@ nh5rget_name_object_c (hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *nam
      *size_default = (size_t_f)c_size;
      ret_value = 0;
      if(c_buf) HDfree(c_buf);
-     
+
      return ret_value;
 }
 
 /*----------------------------------------------------------------------------
  * Name:        h5rget_name_region_c
  * Purpose:     Call H5Rget_name for a dataset region
- * Inputs: 
+ * Inputs:
  *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
  *          ref - An object or dataset region reference.
  *
@@ -330,11 +330,11 @@ nh5rget_name_region_c (hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_le
      /*
       * Convert C name to FORTRAN and place it in the given buffer
       */
-     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1); 
+     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1);
 
      *size_default = (size_t_f)c_size;
      ret_value = 0;
      if(c_buf) HDfree(c_buf);
-     
+
      return ret_value;
 }
diff --git a/fortran/src/H5Rff.f90 b/fortran/src/H5Rff.f90
index a4f4a65..5068762 100644
--- a/fortran/src/H5Rff.f90
+++ b/fortran/src/H5Rff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,90 +11,90 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5R functions.
-! 
+!
       MODULE H5R
         USE H5GLOBAL
 
 ! If you change the value of these parameters, do not forget to change corresponding
-! values in the H5f90.h file. 
-!        INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2 
-!        INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
+! values in the H5f90.h file.
+!        INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
+!        INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
 !
 !        TYPE hobj_ref_t_f
-!             INTEGER ref(REF_OBJ_BUF_LEN)  
-!        END TYPE 
+!             INTEGER ref(REF_OBJ_BUF_LEN)
+!        END TYPE
 !
 !        TYPE hdset_reg_ref_t_f
-!             INTEGER ref(REF_REG_BUF_LEN) 
-!        END TYPE 
+!             INTEGER ref(REF_REG_BUF_LEN)
+!        END TYPE
 !
           INTERFACE h5rcreate_f
 
             MODULE PROCEDURE h5rcreate_object_f
-            MODULE PROCEDURE h5rcreate_region_f 
+            MODULE PROCEDURE h5rcreate_region_f
+
+          END INTERFACE
 
-          END INTERFACE 
-          
           INTERFACE h5rdereference_f
 
             MODULE PROCEDURE h5rdereference_object_f
-            MODULE PROCEDURE h5rdereference_region_f 
+            MODULE PROCEDURE h5rdereference_region_f
+
+          END INTERFACE
 
-          END INTERFACE 
-          
           INTERFACE h5rget_region_f
 
-            MODULE PROCEDURE h5rget_region_region_f 
+            MODULE PROCEDURE h5rget_region_region_f
+
+          END INTERFACE
 
-          END INTERFACE 
-          
           INTERFACE h5rget_object_type_f
 
             MODULE PROCEDURE h5rget_object_type_obj_f
 
-          END INTERFACE 
-          
+          END INTERFACE
+
           INTERFACE h5rget_name_f
 
             MODULE PROCEDURE h5rget_name_object_f
-            MODULE PROCEDURE h5rget_name_region_f 
+            MODULE PROCEDURE h5rget_name_region_f
 
-          END INTERFACE 
+          END INTERFACE
 
         CONTAINS
-          
+
 !----------------------------------------------------------------------
-! Name:		h5rcreate_object_f 
+! Name:		h5rcreate_object_f
 !
 ! Purpose: 	Creates reference to the object
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the object at the specified location
-! Outputs:  
+! Outputs:
 !		ref		- reference to the specified object
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		This is a module procedure for the h5rcreate_f 
-!			subroutine.		
+! Comment:		This is a module procedure for the h5rcreate_f
+!			subroutine.
 !----------------------------------------------------------------------
-  
-          SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr) 
+
+          SUBROUTINE h5rcreate_object_f(loc_id, name, ref, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -102,11 +102,11 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the object at location specified
-                                                   ! by loc_id identifier 
-            TYPE(hobj_ref_t_f), INTENT(OUT) :: ref   ! Object reference 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+                                                   ! by loc_id identifier
+            TYPE(hobj_ref_t_f), INTENT(OUT) :: ref   ! Object reference
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
             INTEGER :: namelen                     ! Name length
             INTEGER(HADDR_T) :: ref_f              ! Local buffer to pass reference
@@ -120,9 +120,9 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_OBJECT_C':: h5rcreate_object_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
+              !DEC$ATTRIBUTES reference :: name
               INTEGER(HADDR_T) :: ref_f
-              INTEGER(HID_T), INTENT(IN) :: loc_id  
+              INTEGER(HID_T), INTENT(IN) :: loc_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER :: namelen
               END FUNCTION h5rcreate_object_c
@@ -132,38 +132,38 @@
             ref_f = 0
             hdferr = h5rcreate_object_c(ref_f, loc_id, name, namelen )
             ref%ref = ref_f
-        
+
           END SUBROUTINE h5rcreate_object_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5rcreate_region_f 
+! Name:		h5rcreate_region_f
 !
 ! Purpose: 	Creates r eference to the dataset region
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the dataset at the specified location
 !		space_id	- dataspace identifier that describes selected region
-! Outputs:  
+! Outputs:
 !		ref		- reference to the dataset region
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		This is a module procedure for the h5rcreate_f 
-!			subroutine.		
+! Comment:		This is a module procedure for the h5rcreate_f
+!			subroutine.
 !----------------------------------------------------------------------
-  
-          SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr) 
+
+          SUBROUTINE h5rcreate_region_f(loc_id, name, space_id, ref, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -171,12 +171,12 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier 
+            INTEGER(HID_T), INTENT(IN) :: loc_id   ! Location identifier
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of the dataset at location specified
-                                                   ! by loc_id identifier 
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataset's dataspace identifier 
-            TYPE(hdset_reg_ref_t_f), INTENT(OUT) :: ref ! Dataset region reference 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+                                                   ! by loc_id identifier
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataset's dataspace identifier
+            TYPE(hdset_reg_ref_t_f), INTENT(OUT) :: ref ! Dataset region reference
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
             INTEGER :: namelen                     ! Name length
             INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
@@ -190,13 +190,13 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RCREATE_REGION_C':: h5rcreate_region_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: name 
-!              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
+              !DEC$ATTRIBUTES reference :: name
+!              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
               INTEGER :: ref_f(REF_REG_BUF_LEN)
-              INTEGER(HID_T), INTENT(IN) :: loc_id  
+              INTEGER(HID_T), INTENT(IN) :: loc_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER :: namelen
-              INTEGER(HID_T), INTENT(IN) :: space_id 
+              INTEGER(HID_T), INTENT(IN) :: space_id
               END FUNCTION h5rcreate_region_c
             END INTERFACE
 
@@ -206,37 +206,37 @@
             ref%ref = ref_f
 
           END SUBROUTINE h5rcreate_region_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5rdereference_object_f
 !
 ! Purpose: 	Opens the HDF5 object referenced
 !
-! Inputs:  
-!		dset_id		- identifier of the dataset containing 
-!				  reference		
+! Inputs:
+!		dset_id		- identifier of the dataset containing
+!				  reference
 !		ref		- reference to open
-! Outputs:  
+! Outputs:
 !		obj_id		- object_identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		This is a module procedure for the h5rdereference_f 
-!			subroutine.		
+! Comment:		This is a module procedure for the h5rdereference_f
+!			subroutine.
 !----------------------------------------------------------------------
-  
-          
-          SUBROUTINE h5rdereference_object_f(dset_id, ref, obj_id, hdferr) 
+
+
+          SUBROUTINE h5rdereference_object_f(dset_id, ref, obj_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -244,10 +244,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
-            TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference 
-            INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Object identifier 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+            TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference
+            INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Object identifier
+            INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
             INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
 
@@ -261,9 +261,9 @@
            !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_OBJECT_C':: h5rdereference_object_c
               !DEC$ ENDIF
 !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-              INTEGER(HID_T), INTENT(IN) :: dset_id  
+              INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HADDR_T) :: ref_f
-              INTEGER(HID_T), INTENT(OUT) :: obj_id 
+              INTEGER(HID_T), INTENT(OUT) :: obj_id
               END FUNCTION h5rdereference_object_c
             END INTERFACE
 
@@ -271,37 +271,37 @@
             hdferr = h5rdereference_object_c(dset_id, ref_f, obj_id )
 
           END SUBROUTINE h5rdereference_object_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5rdereference_region_f
 !
 ! Purpose: 	Opens the dataset region
 !
-! Inputs:  
-!		dset_id		- identifier of the dataset containing 
-!				  reference to teh regions		
+! Inputs:
+!		dset_id		- identifier of the dataset containing
+!				  reference to teh regions
 !		ref		- reference to open
-! Outputs:  
+! Outputs:
 !		obj_id		- dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		This is a module procedure for the h5rdereference_f 
-!			subroutine.		
+! Comment:		This is a module procedure for the h5rdereference_f
+!			subroutine.
 !----------------------------------------------------------------------
-  
-          
-          SUBROUTINE h5rdereference_region_f(dset_id, ref, obj_id, hdferr) 
+
+
+          SUBROUTINE h5rdereference_region_f(dset_id, ref, obj_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -309,10 +309,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
-            TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref   ! Object reference 
-            INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Dataspace identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code 
+            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+            TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref   ! Object reference
+            INTEGER(HID_T), INTENT(OUT) :: obj_id   ! Dataspace identifier
+            INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
             INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
 
@@ -325,10 +325,10 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
            !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RDEREFERENCE_REGION_C':: h5rdereference_region_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id  
-!              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
+              INTEGER(HID_T), INTENT(IN) :: dset_id
+!              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
               INTEGER :: ref_f(REF_REG_BUF_LEN)
-              INTEGER(HID_T), INTENT(OUT) :: obj_id 
+              INTEGER(HID_T), INTENT(OUT) :: obj_id
               END FUNCTION h5rdereference_region_c
             END INTERFACE
 
@@ -336,38 +336,38 @@
             hdferr = h5rdereference_region_c(dset_id, ref_f, obj_id )
 
           END SUBROUTINE h5rdereference_region_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5rget_region_region_f
 !
 ! Purpose: 	Retrieves a dataspace with the specified region selected
 !
-! Inputs:  
-!		dset_id		- identifier of the dataset containing 
-!				  reference to the regions		
+! Inputs:
+!		dset_id		- identifier of the dataset containing
+!				  reference to the regions
 !		ref		- reference to open
-! Outputs:  
+! Outputs:
 !		space_id	- dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		This is a module procedure for the h5rget_region_f 
-!			subroutine.		
+! Comment:		This is a module procedure for the h5rget_region_f
+!			subroutine.
 !----------------------------------------------------------------------
-  
-          
-          
-          SUBROUTINE h5rget_region_region_f(dset_id, ref, space_id, hdferr) 
+
+
+
+          SUBROUTINE h5rget_region_region_f(dset_id, ref, space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -375,10 +375,10 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
-            TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref   ! Dataset region reference 
-            INTEGER(HID_T), INTENT(OUT) :: space_id   ! Space identifier 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code 
+            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+            TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref   ! Dataset region reference
+            INTEGER(HID_T), INTENT(OUT) :: space_id   ! Space identifier
+            INTEGER, INTENT(OUT) :: hdferr          ! Error code
             INTEGER :: ref_f(REF_REG_BUF_LEN)          ! Local buffer to pass reference
 
 !            INTEGER, EXTERNAL :: h5rget_region_region_c
@@ -390,10 +390,10 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
            !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RGET_REGION_REGION_C':: h5rget_region_region_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: dset_id  
-!              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
+              INTEGER(HID_T), INTENT(IN) :: dset_id
+!              INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
               INTEGER :: ref_f(REF_REG_BUF_LEN)
-              INTEGER(HID_T), INTENT(OUT) :: space_id 
+              INTEGER(HID_T), INTENT(OUT) :: space_id
               END FUNCTION h5rget_region_region_c
             END INTERFACE
 
@@ -401,17 +401,17 @@
             hdferr = h5rget_region_region_c(dset_id, ref_f, space_id )
 
           END SUBROUTINE h5rget_region_region_f
-          
+
 !----------------------------------------------------------------------
 ! Name:		h5rget_object_type_obj_f
 !
-! Purpose: 	Retrieves the type of object that an object reference points to.	
+! Purpose: 	Retrieves the type of object that an object reference points to.
 !
-! Inputs:  
-!		dset_id		- identifier of the dataset containing 
+! Inputs:
+!		dset_id		- identifier of the dataset containing
 !				  reference to the objects
 !		ref		- reference to open
-! Outputs:  
+! Outputs:
 !		obj_type	- object_type, possible values:
 !					  H5G_UNKNOWN_F     (-1)
 !					  H5G_GROUP_F        0
@@ -419,25 +419,25 @@
 ! 					  H5G_TYPE_F         2
 !					  H5G_LINK_F         3
 !
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		This is a module procedure for the h5rget_object_type_f 
-!			subroutine.		
+! Comment:		This is a module procedure for the h5rget_object_type_f
+!			subroutine.
 !----------------------------------------------------------------------
-  
 
-          SUBROUTINE h5rget_object_type_obj_f(dset_id, ref, obj_type, hdferr) 
+
+          SUBROUTINE h5rget_object_type_obj_f(dset_id, ref, obj_type, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -445,16 +445,16 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier 
-            TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference 
-            INTEGER, INTENT(OUT) :: obj_type   ! Object type  
+            INTEGER(HID_T), INTENT(IN) :: dset_id   ! Dataset identifier
+            TYPE(hobj_ref_t_f), INTENT(IN) :: ref   ! Object reference
+            INTEGER, INTENT(OUT) :: obj_type   ! Object type
                                                !  H5G_UNKNOWN_F     (-1)
                                                !  H5G_GROUP_F        0
                                                !  H5G_DATASET_F      1
                                                !  H5G_TYPE_F         2
                                                !  H5G_LINK_F         3
 
-            INTEGER, INTENT(OUT) :: hdferr          ! Error code 
+            INTEGER, INTENT(OUT) :: hdferr          ! Error code
             INTEGER(HADDR_T) :: ref_f          ! Local buffer to pass reference
 
 !            INTEGER, EXTERNAL :: h5rget_object_type_obj_c
@@ -467,9 +467,9 @@
            !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5RGET_OBJECT_TYPE_OBJ_C':: h5rget_object_type_obj_c
               !DEC$ ENDIF
 !              INTEGER, PARAMETER :: REF_OBJ_BUF_LEN = 2
-              INTEGER(HID_T), INTENT(IN) :: dset_id  
+              INTEGER(HID_T), INTENT(IN) :: dset_id
               INTEGER(HADDR_T) :: ref_f
-              INTEGER, INTENT(OUT) :: obj_type 
+              INTEGER, INTENT(OUT) :: obj_type
               END FUNCTION h5rget_object_type_obj_c
             END INTERFACE
 
@@ -487,25 +487,25 @@
 !                   loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
 !                      ref - An object or dataset region reference.
 !
-! Outputs:  
+! Outputs:
 !                     name - A name associated with the referenced object or dataset region.
 !
-!		hdferr:    - error code		
+!		hdferr:    - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !                     size - The size of the name buffer.
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 28, 2008
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  
 
-  SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size) 
+
+  SUBROUTINE h5rget_name_object_f(loc_id,  ref, name, hdferr, size)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -513,18 +513,18 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the dataset containing the reference 
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the dataset containing the reference
                                            ! or for the group that dataset is in.
     TYPE(hobj_ref_t_f), INTENT(IN) :: ref  ! Object reference
     INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! The size of the name buffer,
                                            ! returning 0 (zero) if no name is associated with the identifier
     CHARACTER(LEN=*), INTENT(OUT) :: name  ! A name associated with the referenced object or dataset region.
-    INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+    INTEGER, INTENT(OUT) :: hdferr         ! Error code
     INTEGER(HADDR_T) :: ref_f              ! Local buffer to pass reference
 
     INTEGER(SIZE_T) :: size_default
     INTEGER(SIZE_T) :: name_len
-    
+
     INTERFACE
        INTEGER FUNCTION h5rget_name_object_c(loc_id, ref_f, name, name_len, size_default)
          USE H5GLOBAL
@@ -539,14 +539,14 @@
          INTEGER(SIZE_T) :: name_len
        END FUNCTION h5rget_name_object_c
     END INTERFACE
-    
+
     name_len=LEN(name)
 
     ref_f = ref%ref
     hdferr = h5rget_name_object_c(loc_id, ref_f, name, name_len, size_default)
-    
+
     IF(PRESENT(size)) size = size_default
-    
+
   END SUBROUTINE h5rget_name_object_f
 
 !----------------------------------------------------------------------
@@ -558,25 +558,25 @@
 !                   loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
 !                      ref - An object or dataset region reference.
 !
-! Outputs:  
+! Outputs:
 !                     name - A name associated with the referenced object or dataset region.
 !
-!		hdferr:    - error code		
+!		hdferr:    - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !                     size - The size of the name buffer.
 !
 ! Programmer:	M.S. Breitenfeld
 !		March 28, 2008
 !
-! Modifications: 
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-  
 
-  SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size) 
+
+  SUBROUTINE h5rget_name_region_f(loc_id, ref, name, hdferr, size)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -584,18 +584,18 @@
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the dataset containing the reference 
+    INTEGER(HID_T), INTENT(IN) :: loc_id   ! Identifier for the dataset containing the reference
                                            ! or for the group that dataset is in.
     TYPE(hdset_reg_ref_t_f), INTENT(IN) :: ref  ! Object reference
     INTEGER(SIZE_T), OPTIONAL, INTENT(OUT) :: size   ! The size of the name buffer,
                                            ! returning 0 (zero) if no name is associated with the identifier
     CHARACTER(LEN=*), INTENT(OUT) :: name  ! A name associated with the referenced object or dataset region.
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
- 
+
     INTEGER :: ref_f(REF_REG_BUF_LEN)      ! Local buffer to pass reference
     INTEGER(SIZE_T) :: size_default
     INTEGER(SIZE_T) :: name_len
-    
+
     INTERFACE
        INTEGER FUNCTION h5rget_name_region_c(loc_id, ref_f, name, name_len, size_default)
          USE H5GLOBAL
@@ -610,14 +610,14 @@
          INTEGER(SIZE_T) :: name_len
        END FUNCTION h5rget_name_region_c
     END INTERFACE
-    
+
     name_len=LEN(name)
 
     ref_f = ref%ref
     hdferr = h5rget_name_region_c(loc_id, ref_f, name, name_len, size_default)
-    
+
     IF(PRESENT(size)) size = size_default
-    
+
   END SUBROUTINE h5rget_name_region_f
 
 END MODULE H5R
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 4c8f799..5cf5b51 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -1030,7 +1030,7 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hsi
 /*----------------------------------------------------------------------------
  * Name:        h5sdecode_c
  * Purpose:     Call H5Sdecode
- * Inputs:       
+ * Inputs:
  *		buf     - Buffer for the data space object to be decoded.
  * Outputs:
  *              obj_id  - Object_id (non-negative)
@@ -1052,7 +1052,7 @@ nh5sdecode_c ( _fcd buf, hid_t_f *obj_id )
    * Call H5Sdecode function.
    */
 
-  c_buf = (unsigned char*)buf; 
+  c_buf = (unsigned char*)buf;
 
   c_obj_id = H5Sdecode(c_buf);
   if(c_obj_id < 0)
@@ -1067,7 +1067,7 @@ nh5sdecode_c ( _fcd buf, hid_t_f *obj_id )
 /*----------------------------------------------------------------------------
  * Name:        h5sencode_c
  * Purpose:     Call H5Sencode
- * Inputs:       
+ * Inputs:
  *            obj_id - Identifier of the object to be encoded.
  *		 buf - Buffer for the object to be encoded into.
  *            nalloc - The size of the allocated buffer.
@@ -1112,9 +1112,9 @@ nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
     return ret_value;
   }
 
-  /* copy the C buffer to the FORTRAN buffer. 
+  /* copy the C buffer to the FORTRAN buffer.
    * Can not use HD5packFstring because we don't want to
-   * eliminate the NUL terminator or pad remaining space 
+   * eliminate the NUL terminator or pad remaining space
    * with blanks.
    */
 
@@ -1128,7 +1128,7 @@ nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
 /*----------------------------------------------------------------------------
  * Name:        h5sextent_equal_c
  * Purpose:     Call H5Sextent_equal
- * Inputs:        
+ * Inputs:
  *		space1_id - First dataspace identifier.
  *              space2_id - Second dataspace identifier.
  * Outputs:
diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90
index c212d9a..91429e0 100644
--- a/fortran/src/H5Sff.f90
+++ b/fortran/src/H5Sff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,43 +11,43 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains Fortran90 interfaces for H5S functions.
-! 
+!
       MODULE H5S
         USE H5GLOBAL
- 
+
         CONTAINS
-          
+
 !----------------------------------------------------------------------
-! Name:		h5screate_simple_f 
+! Name:		h5screate_simple_f
 !
 ! Purpose: 	Creates a new simple data space and opens it for access	.
 !
-! Inputs:  
+! Inputs:
 !		rank		- number of dimensions
 !		dims		- an array of the size of each dimension
-! Outputs:  
+! Outputs:
 !		space_id	- dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!		maxdims		- an array of the maximum size of each 
+!		maxdims		- an array of the maximum size of each
 !				  dimension
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5screate_simple_f(rank, dims, space_id, hdferr, maxdims) 
+          SUBROUTINE h5screate_simple_f(rank, dims, space_id, hdferr, maxdims)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -56,15 +56,15 @@
 !
 
             IMPLICIT NONE
-            INTEGER, INTENT(IN) :: rank     ! Number of dataspace dimensions 
-            INTEGER(HSIZE_T), INTENT(IN) :: dims(rank) 
-                                                    ! Array with the dimension 
-                                                    ! sizes 
-            INTEGER(HID_T), INTENT(OUT) :: space_id ! Dataspace identifier 
+            INTEGER, INTENT(IN) :: rank     ! Number of dataspace dimensions
+            INTEGER(HSIZE_T), INTENT(IN) :: dims(rank)
+                                                    ! Array with the dimension
+                                                    ! sizes
+            INTEGER(HID_T), INTENT(OUT) :: space_id ! Dataspace identifier
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER(HSIZE_T), OPTIONAL, INTENT(IN) :: maxdims(rank) 
-                                                    ! Array with the maximum 
-                                                    ! dimension sizes 
+            INTEGER(HSIZE_T), OPTIONAL, INTENT(IN) :: maxdims(rank)
+                                                    ! Array with the maximum
+                                                    ! dimension sizes
             INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: f_maxdims
 
 !            INTEGER, EXTERNAL :: h5screate_simple_c
@@ -82,44 +82,44 @@
               INTEGER(HID_T), INTENT(OUT) :: space_id
               END FUNCTION h5screate_simple_c
             END INTERFACE
-            
+
             allocate (f_maxdims(rank), stat=hdferr)
-            if (hdferr .NE. 0) then 
+            if (hdferr .NE. 0) then
                 hdferr = -1
                 return
-            endif 
-            if (present(maxdims)) then 
-                f_maxdims = maxdims 
+            endif
+            if (present(maxdims)) then
+                f_maxdims = maxdims
             else
                 f_maxdims = dims
-            endif 
+            endif
             hdferr = h5screate_simple_c(rank, dims, f_maxdims, space_id)
             deallocate(f_maxdims)
 
           END SUBROUTINE h5screate_simple_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5sclose_f 
+! Name:		h5sclose_f
 !
-! Purpose: 	Releases and terminates access to a dataspace.	
+! Purpose: 	Releases and terminates access to a dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- identifier of dataspace to release
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5sclose_f(space_id, hdferr)
@@ -152,31 +152,31 @@
           END SUBROUTINE h5sclose_f
 
 !----------------------------------------------------------------------
-! Name:		h5screate_f 
+! Name:		h5screate_f
 !
-! Purpose: 	Creates a new dataspace of a specified type. 	
+! Purpose: 	Creates a new dataspace of a specified type.
 !
-! Inputs:  
+! Inputs:
 !		classtype	- the type of the dataspace to be created
-! Outputs:  
+! Outputs:
 !		space_id	- dataspace identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5screate_f(classtype, space_id, hdferr) 
+          SUBROUTINE h5screate_f(classtype, space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -186,12 +186,12 @@
 
             IMPLICIT NONE
             INTEGER, INTENT(IN) :: classtype     ! The type of the dataspace
-                                                 ! to be created. 
+                                                 ! to be created.
                                                  ! Possible values are:
                                                  !  H5S_SCALAR_F (0)
                                                  !  H5S_SIMPLE_F(1)
                                                  !  H5S_NULL_F(2)
-            INTEGER(HID_T), INTENT(OUT) :: space_id ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(OUT) :: space_id ! Dataspace identifier
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5screate_c
@@ -213,31 +213,31 @@
           END SUBROUTINE h5screate_f
 
 !----------------------------------------------------------------------
-! Name:		h5scopy_f 
+! Name:		h5scopy_f
 !
-! Purpose: 	Creates an exact copy of a dataspace.	
+! Purpose: 	Creates an exact copy of a dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		new_space_id	- identifier of dataspace's copy
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5scopy_f(space_id, new_space_id, hdferr) 
+          SUBROUTINE h5scopy_f(space_id, new_space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -246,16 +246,16 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HID_T), INTENT(OUT) :: new_space_id 
-                                             ! Identifier of dataspace's copy 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER(HID_T), INTENT(OUT) :: new_space_id
+                                             ! Identifier of dataspace's copy
             INTEGER, INTENT(OUT) :: hdferr   ! Error code
 
 !            INTEGER, EXTERNAL :: h5scopy_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5scopy_c(space_id, new_space_id)  
+              INTEGER FUNCTION h5scopy_c(space_id, new_space_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SCOPY_C'::h5scopy_c
@@ -266,35 +266,35 @@
             END INTERFACE
 
             hdferr = h5scopy_c(space_id, new_space_id)
- 
+
           END SUBROUTINE h5scopy_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_hyper_nblocks_f 
+! Name:		h5sget_select_hyper_nblocks_f
 !
-! Purpose: 	Get number of hyperslab blocks.	
+! Purpose: 	Get number of hyperslab blocks.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		num_blocks	- number of hyperslab blocks in the current
 !				  hyperslab selection
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5sget_select_hyper_nblocks_f(space_id, num_blocks, hdferr) 
+          SUBROUTINE h5sget_select_hyper_nblocks_f(space_id, num_blocks, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -303,11 +303,11 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks 
-                                             !number of hyperslab blocks 
-                                             !in the current dataspace 
-                                             !selection 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks
+                                             !number of hyperslab blocks
+                                             !in the current dataspace
+                                             !selection
             INTEGER, INTENT(OUT) :: hdferr   ! Error code
 
 !            INTEGER, EXTERNAL :: h5sget_select_hyper_nblocks_c
@@ -320,43 +320,43 @@
 !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_HYPER_NBLOCKS_C'::h5sget_select_hyper_nblocks_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks 
+              INTEGER(HSSIZE_T), INTENT(OUT) :: num_blocks
               END FUNCTION h5sget_select_hyper_nblocks_c
             END INTERFACE
 
             hdferr =  h5sget_select_hyper_nblocks_c (space_id, num_blocks)
- 
+
           END SUBROUTINE h5sget_select_hyper_nblocks_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_hyper_blocklist_f 
+! Name:		h5sget_select_hyper_blocklist_f
 !
-! Purpose: 	Gets the list of hyperslab blocks currently selected. 	
+! Purpose: 	Gets the list of hyperslab blocks currently selected.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
 !		startblock	- hyperslab block to start with
 !		num_blocks	- number of blocks to get
-! Outputs:  
+! Outputs:
 !		buf		- buffer to hold block list
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5sget_select_hyper_blocklist_f(space_id, startblock, &
-                                                    num_blocks, buf, hdferr) 
+                                                    num_blocks, buf, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -365,14 +365,14 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HSIZE_T), INTENT(IN) :: startblock 
-                                             !Hyperslab block to start with. 
-            INTEGER(HSIZE_T), INTENT(IN) :: num_blocks 
-                                             !number of hyperslab blocks 
-                                             !to get in the current dataspace 
-                                             !selection 
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER(HSIZE_T), INTENT(IN) :: startblock
+                                             !Hyperslab block to start with.
+            INTEGER(HSIZE_T), INTENT(IN) :: num_blocks
+                                             !number of hyperslab blocks
+                                             !to get in the current dataspace
+                                             !selection
+            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
                                              !List of hyperslab blocks selected
             INTEGER, INTENT(OUT) :: hdferr   ! Error code
 
@@ -387,44 +387,44 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
             !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_HYPER_BLOCKLIST_C'::h5sget_select_hyper_blocklist_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id 
-              INTEGER(HSIZE_T), INTENT(IN) :: startblock 
-              INTEGER(HSIZE_T), INTENT(IN) :: num_blocks 
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf 
+              INTEGER(HID_T), INTENT(IN) :: space_id
+              INTEGER(HSIZE_T), INTENT(IN) :: startblock
+              INTEGER(HSIZE_T), INTENT(IN) :: num_blocks
+              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
               END FUNCTION h5sget_select_hyper_blocklist_c
             END INTERFACE
 
- 
+
             hdferr =  h5sget_select_hyper_blocklist_c(space_id, startblock, &
                                                        num_blocks, buf )
- 
+
           END SUBROUTINE h5sget_select_hyper_blocklist_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_bounds_f 
+! Name:		h5sget_select_bounds_f
 !
-! Purpose: 	Gets the bounding box containing the current selection. 	
+! Purpose: 	Gets the bounding box containing the current selection.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-!		
-! Outputs:  
+!
+! Outputs:
 !		start		- starting coordinates of bounding box
 !		end		- ending coordinates of bounding box
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE  h5sget_select_bounds_f(space_id, start, end, hdferr)
@@ -436,13 +436,13 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
             INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: start
-                                             !Starting coordinates of the bounding box. 
+                                             !Starting coordinates of the bounding box.
             INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: end
                                              !Ending coordinates of the bounding box,
-                                             !i.e., the coordinates of the diagonally 
-                                             !opposite corner 
+                                             !i.e., the coordinates of the diagonally
+                                             !opposite corner
             INTEGER, INTENT(OUT) :: hdferr   ! Error code
 
 !            INTEGER, EXTERNAL :: h5sget_select_bounds_c
@@ -461,35 +461,35 @@
             END INTERFACE
 
             hdferr =   h5sget_select_bounds_c(space_id, start, end)
- 
+
           END SUBROUTINE h5sget_select_bounds_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_elem_npoints_f 
+! Name:		h5sget_select_elem_npoints_f
 !
-! Purpose: 	Gets the number of element points in the current selection	
+! Purpose: 	Gets the number of element points in the current selection
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
-!		num_points	- number of element points in the current 
+! Outputs:
+!		num_points	- number of element points in the current
 !				  dataspace selection
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5sget_select_elem_npoints_f(space_id, num_points, hdferr) 
+          SUBROUTINE h5sget_select_elem_npoints_f(space_id, num_points, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -498,11 +498,11 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HSSIZE_T), INTENT(OUT) :: num_points 
-                                             !number of element points 
-                                             !in the current dataspace 
-                                             !selection 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER(HSSIZE_T), INTENT(OUT) :: num_points
+                                             !number of element points
+                                             !in the current dataspace
+                                             !selection
             INTEGER, INTENT(OUT) :: hdferr   ! Error code
 
 !            INTEGER, EXTERNAL :: h5sget_select_elem_npoints_c
@@ -515,43 +515,43 @@
 !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_ELEM_NPOINTS_C'::h5sget_select_elem_npoints_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSSIZE_T), INTENT(OUT) :: num_points 
+              INTEGER(HSSIZE_T), INTENT(OUT) :: num_points
               END FUNCTION h5sget_select_elem_npoints_c
             END INTERFACE
 
             hdferr =  h5sget_select_elem_npoints_c (space_id, num_points)
- 
+
           END SUBROUTINE h5sget_select_elem_npoints_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_elem_pointlist_f 
+! Name:		h5sget_select_elem_pointlist_f
 !
-! Purpose:	Gets the list of element points currently selected.  	
+! Purpose:	Gets the list of element points currently selected.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-!		startpoint	- element point to start with 
+!		startpoint	- element point to start with
 !		num_points	- number of elemnt points to get
-! Outputs:  
+! Outputs:
 !		buf		- buffer with element points selected
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5sget_select_elem_pointlist_f(space_id, startpoint, &
-                                                    num_points, buf, hdferr) 
+                                                    num_points, buf, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -559,12 +559,12 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HSIZE_T), INTENT(IN) :: startpoint 
-                                             !Element point to start with. 
-            INTEGER(HSIZE_T), INTENT(IN) :: num_points 
-                                             !Number of element points to get 
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER(HSIZE_T), INTENT(IN) :: startpoint
+                                             !Element point to start with.
+            INTEGER(HSIZE_T), INTENT(IN) :: num_points
+                                             !Number of element points to get
+            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
                                              !List of element points selected
             INTEGER, INTENT(OUT) :: hdferr   ! Error code
 
@@ -579,9 +579,9 @@
 !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_ELEM_POINTLIST_C'::h5sget_select_elem_pointlist_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: space_id
-              INTEGER(HSIZE_T), INTENT(IN) :: startpoint 
-              INTEGER(HSIZE_T), INTENT(IN) :: num_points 
-              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf 
+              INTEGER(HSIZE_T), INTENT(IN) :: startpoint
+              INTEGER(HSIZE_T), INTENT(IN) :: num_points
+              INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: buf
               END FUNCTION h5sget_select_elem_pointlist_c
             END INTERFACE
 
@@ -590,38 +590,38 @@
           END SUBROUTINE h5sget_select_elem_pointlist_f
 
 !----------------------------------------------------------------------
-! Name:		h5sselect_elements_f 
+! Name:		h5sselect_elements_f
 !
-! Purpose:	Selects elements to be included in the selection for 
-!		a dataspace 	
+! Purpose:	Selects elements to be included in the selection for
+!		a dataspace
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
 !		operator	- flag, valid values are:
 !				  H5S_SELECT_SET_F (0)
 !				  H5S_SELECT_OR_F (1)
 !		rank		- number of dataspace dimensions
 !		num_elements	- number of elements to be selected
-!		coord		- 2D (rank x num_elements) array with the 
+!		coord		- 2D (rank x num_elements) array with the
 !				  elements coordinates
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5sselect_elements_f(space_id, operator, rank, & 
-                                          num_elements, coord, hdferr) 
+          SUBROUTINE h5sselect_elements_f(space_id, operator, rank, &
+                                          num_elements, coord, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -629,15 +629,15 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
             INTEGER, INTENT(IN) :: operator    ! Flag, valid values are:
                                                ! H5S_SELECT_SET_F (0)
                                                ! H5S_SELECT_OR_F (1)
-            INTEGER, INTENT(IN) :: rank     ! Number of dataspace dimensions 
+            INTEGER, INTENT(IN) :: rank     ! Number of dataspace dimensions
             INTEGER(SIZE_T), INTENT(IN) :: num_elements  ! Number of elements to be
                                                  ! selected
-            INTEGER(HSIZE_T), & 
-            DIMENSION(rank,num_elements), INTENT(IN) :: coord 
+            INTEGER(HSIZE_T), &
+            DIMENSION(rank,num_elements), INTENT(IN) :: coord
                                           ! Array with the coordinates
                                           ! of the selected elements
                                           ! coord(rank, num_elements)
@@ -669,39 +669,39 @@
             endif
             do i = 1, rank
                c_coord(i,:) = coord(rank-i+1, :) - 1
-            enddo 
+            enddo
             hdferr = h5sselect_elements_c(space_id, operator, num_elements, &
                                           c_coord)
             deallocate(c_coord)
- 
+
           END SUBROUTINE h5sselect_elements_f
 
 !----------------------------------------------------------------------
-! Name:		h5sselect_all_f 
+! Name:		h5sselect_all_f
 !
-! Purpose: 	Selects the entire dataspace. 	
+! Purpose: 	Selects the entire dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- identifier for the dataspace in which
 !				  selection being made
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sselect_all_f(space_id, hdferr) 
+          SUBROUTINE h5sselect_all_f(space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -709,7 +709,7 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5sselect_all_c
@@ -730,31 +730,31 @@
           END SUBROUTINE h5sselect_all_f
 
 !----------------------------------------------------------------------
-! Name:		h5sselect_none_f 
+! Name:		h5sselect_none_f
 !
-! Purpose: 	Resets the selection region to include no elements. 	
+! Purpose: 	Resets the selection region to include no elements.
 !
-! Inputs:  
-!		space_id	- the identifier for the dataspace in which 
-!                                 the selection is being reset. 
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+!		space_id	- the identifier for the dataspace in which
+!                                 the selection is being reset.
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sselect_none_f(space_id, hdferr) 
+          SUBROUTINE h5sselect_none_f(space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -763,7 +763,7 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5sselect_none_c
@@ -775,7 +775,7 @@
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_NONE_C'::h5sselect_none_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: space_id 
+              INTEGER(HID_T), INTENT(IN) :: space_id
               END FUNCTION h5sselect_none_c
             END INTERFACE
 
@@ -784,31 +784,31 @@
           END SUBROUTINE h5sselect_none_f
 
 !----------------------------------------------------------------------
-! Name:		h5sselect_valid_f 
+! Name:		h5sselect_valid_f
 !
-! Purpose:	Verifies that the selection is within the extent of 
-!		the dataspace.  	
+! Purpose:	Verifies that the selection is within the extent of
+!		the dataspace.
 !
-! Inputs:  
-!		space_id	- identifier for the dataspace for which 
+! Inputs:
+!		space_id	- identifier for the dataspace for which
 !				  selection is verified
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5sselect_valid_f(space_id, status, hdferr) 
+          SUBROUTINE h5sselect_valid_f(space_id, status, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -817,10 +817,10 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
             LOGICAL, INTENT(OUT) :: status          ! TRUE if the selection is
                                                     ! contained within the extent,
-                                                    ! FALSE otherwise. 
+                                                    ! FALSE otherwise.
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
             INTEGER :: flag ! "TRUE/FALSE/ERROR" flag from C routine
 
@@ -828,14 +828,14 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5sselect_valid_c(space_id, flag) 
+              INTEGER FUNCTION h5sselect_valid_c(space_id, flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SSELECT_VALID_C'::h5sselect_valid_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: space_id
               INTEGER :: flag
-              END FUNCTION h5sselect_valid_c 
+              END FUNCTION h5sselect_valid_c
             END INTERFACE
 
             hdferr = h5sselect_valid_c(space_id, flag)
@@ -845,31 +845,31 @@
           END SUBROUTINE h5sselect_valid_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_simple_extent_npoints_f 
+! Name:		h5sget_simple_extent_npoints_f
 !
-! Purpose: 	Determines the number of elements in a dataspace. 	
+! Purpose: 	Determines the number of elements in a dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		npoints		- number of elements in the dataspace
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sget_simple_extent_npoints_f(space_id, npoints, hdferr) 
+          SUBROUTINE h5sget_simple_extent_npoints_f(space_id, npoints, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -878,8 +878,8 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier 
-            INTEGER(HSIZE_T), INTENT(OUT) :: npoints  ! Number of elements in 
+            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier
+            INTEGER(HSIZE_T), INTENT(OUT) :: npoints  ! Number of elements in
                                                        ! dataspace
             INTEGER, INTENT(OUT) :: hdferr             ! Error code
 
@@ -887,7 +887,7 @@
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5sget_simple_extent_npoints_c( space_id, npoints) 
+              INTEGER FUNCTION h5sget_simple_extent_npoints_c( space_id, npoints)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SIMPLE_EXTENT_NPOINTS_C'::h5sget_simple_extent_npoints_c
@@ -898,35 +898,35 @@
             END INTERFACE
 
             hdferr = h5sget_simple_extent_npoints_c( space_id, npoints)
- 
+
           END SUBROUTINE h5sget_simple_extent_npoints_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_npoints_f 
+! Name:		h5sget_select_npoints_f
 !
-! Purpose: 	Determines the number of elements in a dataspace selection. 	
+! Purpose: 	Determines the number of elements in a dataspace selection.
 !
-! Inputs: 
-!		space_id	- dataspace identifier 
-! Outputs:  
+! Inputs:
+!		space_id	- dataspace identifier
+! Outputs:
 !		npoints		- number of points in the dataspace selection
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sget_select_npoints_f(space_id, npoints, hdferr) 
+          SUBROUTINE h5sget_select_npoints_f(space_id, npoints, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -935,16 +935,16 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier
             INTEGER(HSSIZE_T), INTENT(OUT) :: npoints  ! Number of elements in the
-                                                       ! selection 
+                                                       ! selection
             INTEGER, INTENT(OUT) :: hdferr             ! Error code
 
 !            INTEGER, EXTERNAL :: h5sget_select_npoints_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5sget_select_npoints_c(space_id, npoints) 
+              INTEGER FUNCTION h5sget_select_npoints_c(space_id, npoints)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SELECT_NPOINTS_C'::h5sget_select_npoints_c
@@ -955,35 +955,35 @@
             END INTERFACE
 
             hdferr = h5sget_select_npoints_c(space_id, npoints)
- 
+
           END SUBROUTINE h5sget_select_npoints_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_simple_extent_ndims_f 
+! Name:		h5sget_simple_extent_ndims_f
 !
-! Purpose: 	Determines the dimensionality of a dataspace	
+! Purpose: 	Determines the dimensionality of a dataspace
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		rank		- number of dataspace dimensions
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sget_simple_extent_ndims_f(space_id, rank, hdferr) 
+          SUBROUTINE h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -992,15 +992,15 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier 
-            INTEGER, INTENT(OUT) :: rank               ! Number of dimensions 
+            INTEGER(HID_T), INTENT(IN) :: space_id     ! Dataspace identifier
+            INTEGER, INTENT(OUT) :: rank               ! Number of dimensions
             INTEGER, INTENT(OUT) :: hdferr             ! Error code
 
 !            INTEGER, EXTERNAL :: h5sget_simple_extent_ndims_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5sget_simple_extent_ndims_c(space_id, rank) 
+              INTEGER FUNCTION h5sget_simple_extent_ndims_c(space_id, rank)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SGET_SIMPLE_EXTENT_NDIMS_C'::h5sget_simple_extent_ndims_c
@@ -1011,37 +1011,37 @@
             END INTERFACE
 
             hdferr = h5sget_simple_extent_ndims_c(space_id, rank)
- 
+
           END SUBROUTINE h5sget_simple_extent_ndims_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_simple_extent_dims_f 
+! Name:		h5sget_simple_extent_dims_f
 !
-! Purpose: 	Retrieves dataspace dimension size and maximum size. 	
+! Purpose: 	Retrieves dataspace dimension size and maximum size.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		dims		- array to store size of each dimension
-!		maxdims		- array to store maximum size of each 
+!		maxdims		- array to store maximum size of each
 !				  dimension
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sget_simple_extent_dims_f(space_id, dims, maxdims, hdferr) 
+          SUBROUTINE h5sget_simple_extent_dims_f(space_id, dims, maxdims, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1050,12 +1050,12 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims 
-                                                   ! Array to store dimension sizes 
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: maxdims 
-                                                   ! Array to store max dimension 
-                                                   ! sizes  
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: dims
+                                                   ! Array to store dimension sizes
+            INTEGER(HSIZE_T), DIMENSION(*), INTENT(OUT) :: maxdims
+                                                   ! Array to store max dimension
+                                                   ! sizes
             INTEGER, INTENT(OUT) :: hdferr         ! Error code: -1 on failure,
                                                    ! number of dimensions on
                                                    ! on success
@@ -1076,39 +1076,39 @@
             END INTERFACE
 
             hdferr = h5sget_simple_extent_dims_c(space_id, dims, maxdims)
- 
+
           END SUBROUTINE h5sget_simple_extent_dims_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_simple_extent_type_f 
+! Name:		h5sget_simple_extent_type_f
 !
-! Purpose: 	Determine the current class of a dataspace	
+! Purpose: 	Determine the current class of a dataspace
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		classtype	- class type, possible values are:
 !				  H5S_NO_CLASS_F (-1)
 !				  H5S_SCALAR_F (0)
 !				  H5S_SIMPLE_F (1)
 !				  H5S_NULL_F   (2)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sget_simple_extent_type_f(space_id, classtype, hdferr) 
+          SUBROUTINE h5sget_simple_extent_type_f(space_id, classtype, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1117,9 +1117,9 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
             INTEGER, INTENT(OUT) :: classtype      ! Class type , possible values
-                                                   ! are: 
+                                                   ! are:
                                                    !  H5S_NO_CLASS_F (-1)
                                                    !  H5S_SCALAR_F (0)
                                                    !  H5S_SIMPLE_F (1)
@@ -1141,39 +1141,39 @@
             END INTERFACE
 
             hdferr = h5sget_simple_extent_type_c(space_id, classtype)
- 
+
           END SUBROUTINE h5sget_simple_extent_type_f
 
 !----------------------------------------------------------------------
-! Name:		h5sset_extent_simple_f 
+! Name:		h5sset_extent_simple_f
 !
-! Purpose: 	Sets or resets the size of an existing dataspace. 	
+! Purpose: 	Sets or resets the size of an existing dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
 !		rank		- dataspace number of dimensions
 !		current_size	- array with the new sizes of dimensions
-!		maximum_size	- array with the new maximum sizes of 
+!		maximum_size	- array with the new maximum sizes of
 !				  dimensions
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5sset_extent_simple_f(space_id, rank, current_size, &
-                                            maximum_size, hdferr) 
+                                            maximum_size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1182,15 +1182,15 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-            INTEGER, INTENT(IN) :: rank            ! Dataspace rank 
-            INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: current_size 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
+            INTEGER, INTENT(IN) :: rank            ! Dataspace rank
+            INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: current_size
                                                    ! Array with the new sizes
-                                                   ! of dimensions 
-            INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: maximum_size  
+                                                   ! of dimensions
+            INTEGER(HSIZE_T), DIMENSION(rank), INTENT(IN) :: maximum_size
                                                    ! Array with the new maximum
-                                                   ! sizes of dimensions 
-                                                   ! sizes  
+                                                   ! sizes of dimensions
+                                                   ! sizes
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
 !            INTEGER, EXTERNAL :: h5sset_extent_simple_c
@@ -1198,7 +1198,7 @@
 !
             INTERFACE
               INTEGER FUNCTION h5sset_extent_simple_c(space_id, rank, &
-                               current_size,  maximum_size) 
+                               current_size,  maximum_size)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SSET_EXTENT_SIMPLE_C'::h5sset_extent_simple_c
@@ -1212,36 +1212,36 @@
 
             hdferr = h5sset_extent_simple_c(space_id, rank, current_size, &
                                             maximum_size)
- 
+
           END SUBROUTINE h5sset_extent_simple_f
 
 !----------------------------------------------------------------------
-! Name:		h5sis_simple_f 
+! Name:		h5sis_simple_f
 !
-! Purpose: 	Determines whether a dataspace is a simple dataspace. 	
+! Purpose: 	Determines whether a dataspace is a simple dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
+! Outputs:
 !		status		- flag to indicate if dataspace
-!				  is simple or not 
-!		hdferr:		- error code		
+!				  is simple or not
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sis_simple_f(space_id, status, hdferr) 
+          SUBROUTINE h5sis_simple_f(space_id, status, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1250,18 +1250,18 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
             LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if dataspace
                                                 ! is simple or not ( TRUE or
-                                                ! FALSE)  
+                                                ! FALSE)
             INTEGER, INTENT(OUT) :: hdferr      ! Error code
-            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C" 
+            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
 
 !            INTEGER, EXTERNAL :: h5sis_simple_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5sis_simple_c(space_id, flag) 
+              INTEGER FUNCTION h5sis_simple_c(space_id, flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SIS_SIMPLE_C'::h5sis_simple_c
@@ -1274,35 +1274,35 @@
             hdferr = h5sis_simple_c(space_id, flag)
             status = .TRUE.
             if (flag .EQ. 0) status = .FALSE.
- 
+
           END SUBROUTINE h5sis_simple_f
 
 !----------------------------------------------------------------------
-! Name:		h5soffset_simple_f 
+! Name:		h5soffset_simple_f
 !
-! Purpose:	Sets the offset of a simple dataspace.  	
+! Purpose:	Sets the offset of a simple dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-!		offset		- the offset at which to position the 
-!				  selection 
-! Outputs:  
-!		hdferr:		- error code		
+!		offset		- the offset at which to position the
+!				  selection
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5soffset_simple_f(space_id, offset, hdferr) 
+          SUBROUTINE h5soffset_simple_f(space_id, offset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1311,17 +1311,17 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
             INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) ::  offset
                                                    ! The offset at which to position
-                                                   ! the selection  
+                                                   ! the selection
             INTEGER, INTENT(OUT) :: hdferr         ! Error code
 
 !            INTEGER, EXTERNAL :: h5soffset_simple_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5soffset_simple_c(space_id, offset) 
+              INTEGER FUNCTION h5soffset_simple_c(space_id, offset)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SOFFSET_SIMPLE_C'::h5soffset_simple_c
@@ -1332,37 +1332,37 @@
             END INTERFACE
 
             hdferr = h5soffset_simple_c(space_id, offset)
- 
+
           END SUBROUTINE h5soffset_simple_f
 
 !----------------------------------------------------------------------
-! Name:		h5sextent_copy_f 
+! Name:		h5sextent_copy_f
 !
-! Purpose: 	Copies the extent of a dataspace. 	
+! Purpose: 	Copies the extent of a dataspace.
 !
-! Inputs:  
-!		dest_space_id	- the identifier for the dataspace to which 
-!				  the extent is copied 
-!		source_space_id	- the identifier for the dataspace from 
+! Inputs:
+!		dest_space_id	- the identifier for the dataspace to which
+!				  the extent is copied
+!		source_space_id	- the identifier for the dataspace from
 !				  which the extent is copied
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sextent_copy_f(dest_space_id, source_space_id, hdferr) 
+          SUBROUTINE h5sextent_copy_f(dest_space_id, source_space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1373,7 +1373,7 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: dest_space_id  ! Identifier of destination
                                                          ! dataspace
-            INTEGER(HID_T), INTENT(IN) :: source_space_id ! Identifier of source 
+            INTEGER(HID_T), INTENT(IN) :: source_space_id ! Identifier of source
                                                           ! dataspace
             INTEGER, INTENT(OUT) :: hdferr                ! Error code
 
@@ -1392,33 +1392,33 @@
             END INTERFACE
 
             hdferr = h5sextent_copy_c(dest_space_id, source_space_id)
- 
+
           END SUBROUTINE h5sextent_copy_f
 
 !----------------------------------------------------------------------
-! Name:		h5sset_extent_none_f 
+! Name:		h5sset_extent_none_f
 !
-! Purpose:	Removes the extent from a dataspace.  	
+! Purpose:	Removes the extent from a dataspace.
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5sset_extent_none_f(space_id, hdferr) 
+          SUBROUTINE h5sset_extent_none_f(space_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1427,14 +1427,14 @@
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id  ! Dataspace identifier
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
 
 !            INTEGER, EXTERNAL :: h5sset_extent_none_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5sset_extent_none_c(space_id) 
+              INTEGER FUNCTION h5sset_extent_none_c(space_id)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SSET_EXTENT_NONE_C'::h5sset_extent_none_c
@@ -1444,43 +1444,43 @@
             END INTERFACE
 
             hdferr = h5sset_extent_none_c(space_id)
- 
+
           END SUBROUTINE h5sset_extent_none_f
 
 !----------------------------------------------------------------------
-! Name:		h5sselect_hyperslab_f 
+! Name:		h5sselect_hyperslab_f
 !
-! Purpose:	Selects a hyperslab region to add to the current selected 
-!		region 	
+! Purpose:	Selects a hyperslab region to add to the current selected
+!		region
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace identifier
 !		operator	- flag, valid values are:
 !				  H5S_SELECT_SET_F (0)
 !				  H5S_SELECT_OR_F (1)
 !		start		- array with hyperslab offsets
-!		count		- number of blocks included in the 
+!		count		- number of blocks included in the
 !				  hyperslab
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		stride		- array with hyperslab strides
-!		block		- array with hyperslab block sizes 
+!		block		- array with hyperslab block sizes
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 6, 2001 
+!			port).  March 6, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
           SUBROUTINE h5sselect_hyperslab_f(space_id, operator, start, count, &
-                                           hdferr, stride, block) 
+                                           hdferr, stride, block)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1488,26 +1488,26 @@
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
             INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
                                                 ! H5S_SELECT_SET_F (0)
                                                 ! H5S_SELECT_OR_F (1)
-                                                !  
+                                                !
             INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
-                                          ! Starting coordinates of the hyperslab 
-            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count 
-                                          ! Number of blocks to select 
-                                          ! from dataspace 
+                                          ! Starting coordinates of the hyperslab
+            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
+                                          ! Number of blocks to select
+                                          ! from dataspace
             INTEGER, INTENT(OUT) :: hdferr     ! Error code
             INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: stride
                                           ! Array of how many elements to move
                                           ! in each direction
-            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block 
+            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block
                                           ! Sizes of element block
-            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block 
+            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block
             INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_stride
             INTEGER :: rank
-            INTEGER :: error1, error2 
+            INTEGER :: error1, error2
 
 !            INTEGER, EXTERNAL :: h5sselect_hyperslab_c
 !  MS FORTRAN needs explicit interface for C functions called here.
@@ -1524,7 +1524,7 @@
               INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
               INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
               INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: stride
-              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block 
+              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block
               END FUNCTION h5sselect_hyperslab_c
             END INTERFACE
 
@@ -1578,48 +1578,48 @@
                                            def_stride, def_block)
             deallocate(def_block)
             deallocate(def_stride)
- 
+
           END SUBROUTINE h5sselect_hyperslab_f
 !----------------------------------------------------------------------
-! Name:		h5scombine_hyperslab_f 
+! Name:		h5scombine_hyperslab_f
 !
-! Purpose:	Combine a hyperslab selection with the current 
-!               selection for a dataspace 
+! Purpose:	Combine a hyperslab selection with the current
+!               selection for a dataspace
 !
-! Inputs:  
-!		space_id	- dataspace of selection to use 
+! Inputs:
+!		space_id	- dataspace of selection to use
 !		operator	- flag, valid values are:
-!				  H5S_SELECT_NOOP_F 
-!				  H5S_SELECT_SET_F 
-!				  H5S_SELECT_OR_F 
-!				  H5S_SELECT_AND_F 
-!				  H5S_SELECT_XOR_F 
-!				  H5S_SELECT_NOTB_F 
-!				  H5S_SELECT_NOTA_F 
-!				  H5S_SELECT_APPEND_F 
-!				  H5S_SELECT_PREPEND_F 
+!				  H5S_SELECT_NOOP_F
+!				  H5S_SELECT_SET_F
+!				  H5S_SELECT_OR_F
+!				  H5S_SELECT_AND_F
+!				  H5S_SELECT_XOR_F
+!				  H5S_SELECT_NOTB_F
+!				  H5S_SELECT_NOTA_F
+!				  H5S_SELECT_APPEND_F
+!				  H5S_SELECT_PREPEND_F
 !		start		- array with hyperslab offsets
-!		count		- number of blocks included in the 
+!		count		- number of blocks included in the
 !				  hyperslab
-! Outputs:  
+! Outputs:
 !               hyper_id        - identifier for the new hyperslab
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !		stride		- array with hyperslab strides
-!		block		- array with hyperslab block sizes 
+!		block		- array with hyperslab block sizes
 !
 ! Programmer:	Elena Pourmal
 !		October 7, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:	Commented out until 1.6 ? 10/08/2002	
+! Comment:	Commented out until 1.6 ? 10/08/2002
 !----------------------------------------------------------------------
 
 !          SUBROUTINE h5scombine_hyperslab_f(space_id, operator, start, count, &
-!                                            hyper_id,  hdferr, stride, block) 
+!                                            hyper_id,  hdferr, stride, block)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1627,34 +1627,34 @@
 !DEC$endif
 !
 !            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
+!            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier
 !            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F 
-						!  H5S_SELECT_SET_F 
-						!  H5S_SELECT_OR_F 
-						!  H5S_SELECT_AND_F 
-						!  H5S_SELECT_XOR_F 
-						!  H5S_SELECT_NOTB_F 
-						!  H5S_SELECT_NOTA_F 
-						!  H5S_SELECT_APPEND_F 
-						!  H5S_SELECT_PREPEND_F 
-                                                !  
+						!  H5S_SELECT_NOOP_F
+						!  H5S_SELECT_SET_F
+						!  H5S_SELECT_OR_F
+						!  H5S_SELECT_AND_F
+						!  H5S_SELECT_XOR_F
+						!  H5S_SELECT_NOTB_F
+						!  H5S_SELECT_NOTA_F
+						!  H5S_SELECT_APPEND_F
+						!  H5S_SELECT_PREPEND_F
+                                                !
 !            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
-                                          ! Starting coordinates of the hyperslab 
-!            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count 
-                                          ! Number of blocks to select 
-                                          ! from dataspace 
-!            INTEGER(HID_T), INTENT(OUT) :: hyper_id ! New hyperslab identifier 
+                                          ! Starting coordinates of the hyperslab
+!            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
+                                          ! Number of blocks to select
+                                          ! from dataspace
+!            INTEGER(HID_T), INTENT(OUT) :: hyper_id ! New hyperslab identifier
 !            INTEGER, INTENT(OUT) :: hdferr     ! Error code
 !            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: stride
                                           ! Array of how many elements to move
                                           ! in each direction
-!            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block 
+!            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block
                                           ! Sizes of element block
-!            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block 
+!            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block
 !            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_stride
 !            INTEGER :: rank
-!            INTEGER :: error1, error2 
+!            INTEGER :: error1, error2
 
 !            INTERFACE
 !              INTEGER FUNCTION h5scombine_hyperslab_c(space_id, operator, &
@@ -1668,7 +1668,7 @@
 !              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: start
 !              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
 !              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: stride
-!              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block 
+!              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block
 !              INTEGER(HID_T), INTENT(OUT) :: hyper_id
 !              END FUNCTION h5scombine_hyperslab_c
 !            END INTERFACE
@@ -1723,45 +1723,45 @@
 !                                           def_stride, def_block, hyper_id)
 !            deallocate(def_block)
 !            deallocate(def_stride)
- 
+
 !          END SUBROUTINE h5scombine_hyperslab_f
 
 !----------------------------------------------------------------------
-! Name:		h5scombine_select_f 
+! Name:		h5scombine_select_f
 !
-! Purpose:	Combine two hyperslab selections with an operation 
+! Purpose:	Combine two hyperslab selections with an operation
 !               and return a dataspace with resulting selection.
 !
-! Inputs:  
-!		space1_id	- dataspace of selection to use 
+! Inputs:
+!		space1_id	- dataspace of selection to use
 !		operator	- flag, valid values are:
-!				  H5S_SELECT_NOOP_F 
-!				  H5S_SELECT_SET_F 
-!				  H5S_SELECT_OR_F 
-!				  H5S_SELECT_AND_F 
-!				  H5S_SELECT_XOR_F 
-!				  H5S_SELECT_NOTB_F 
-!				  H5S_SELECT_NOTA_F 
-!				  H5S_SELECT_APPEND_F 
-!				  H5S_SELECT_PREPEND_F 
-!		space2_id	- dataspace of selection to use 
-! Outputs:  
+!				  H5S_SELECT_NOOP_F
+!				  H5S_SELECT_SET_F
+!				  H5S_SELECT_OR_F
+!				  H5S_SELECT_AND_F
+!				  H5S_SELECT_XOR_F
+!				  H5S_SELECT_NOTB_F
+!				  H5S_SELECT_NOTA_F
+!				  H5S_SELECT_APPEND_F
+!				  H5S_SELECT_PREPEND_F
+!		space2_id	- dataspace of selection to use
+! Outputs:
 !               ds_id           - idataspace identifier with the new selection
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:		- NONE
 !
 ! Programmer:	Elena Pourmal
 !		October 7, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment: commented out until 1.6 release(?) 10/08/2002		
+! Comment: commented out until 1.6 release(?) 10/08/2002
 !----------------------------------------------------------------------
 
 !          SUBROUTINE h5scombine_select_f(space1_id, operator, space2_id, &
-!                                            ds_id,  hdferr) 
+!                                            ds_id,  hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1769,20 +1769,20 @@
 !DEC$endif
 !
 !            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: space1_id ! First dataspace identifier 
-!            INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier 
+!            INTEGER(HID_T), INTENT(IN) :: space1_id ! First dataspace identifier
+!            INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier
 !            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F 
-						!  H5S_SELECT_SET_F 
-						!  H5S_SELECT_OR_F 
-						!  H5S_SELECT_AND_F 
-						!  H5S_SELECT_XOR_F 
-						!  H5S_SELECT_NOTB_F 
-						!  H5S_SELECT_NOTA_F 
-						!  H5S_SELECT_APPEND_F 
-						!  H5S_SELECT_PREPEND_F 
-                                                !  
-!            INTEGER(HID_T), INTENT(OUT) :: ds_id ! New dataspace identifier 
+						!  H5S_SELECT_NOOP_F
+						!  H5S_SELECT_SET_F
+						!  H5S_SELECT_OR_F
+						!  H5S_SELECT_AND_F
+						!  H5S_SELECT_XOR_F
+						!  H5S_SELECT_NOTB_F
+						!  H5S_SELECT_NOTA_F
+						!  H5S_SELECT_APPEND_F
+						!  H5S_SELECT_PREPEND_F
+                                                !
+!            INTEGER(HID_T), INTENT(OUT) :: ds_id ! New dataspace identifier
 !            INTEGER, INTENT(OUT) :: hdferr     ! Error code
 !
 !            INTERFACE
@@ -1802,45 +1802,45 @@
 !            hdferr = h5scombine_select_c(space1_id, operator, space2_id, &
 !                                         ds_id)
 !            return
- 
+
 !          END SUBROUTINE h5scombine_select_f
 
 !----------------------------------------------------------------------
-! Name:		h5sselect_select_f 
+! Name:		h5sselect_select_f
 !
-! Purpose:	Refine a hyperslab selection with an operation 
+! Purpose:	Refine a hyperslab selection with an operation
 !               using second hyperslab
 !
-! Inputs:  
+! Inputs:
 !		space1_id	- dataspace of selection  to modify
 !		operator	- flag, valid values are:
-!				  H5S_SELECT_NOOP_F 
-!				  H5S_SELECT_SET_F 
-!				  H5S_SELECT_OR_F 
-!				  H5S_SELECT_AND_F 
-!				  H5S_SELECT_XOR_F 
-!				  H5S_SELECT_NOTB_F 
-!				  H5S_SELECT_NOTA_F 
-!				  H5S_SELECT_APPEND_F 
-!				  H5S_SELECT_PREPEND_F 
-!		space2_id	- dataspace of selection to use 
-!				  
-! Outputs:  
-!		hdferr:		- error code		
+!				  H5S_SELECT_NOOP_F
+!				  H5S_SELECT_SET_F
+!				  H5S_SELECT_OR_F
+!				  H5S_SELECT_AND_F
+!				  H5S_SELECT_XOR_F
+!				  H5S_SELECT_NOTB_F
+!				  H5S_SELECT_NOTA_F
+!				  H5S_SELECT_APPEND_F
+!				  H5S_SELECT_PREPEND_F
+!		space2_id	- dataspace of selection to use
+!
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:		- NONE
 !
 ! Programmer:	Elena Pourmal
 !		October 7, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:Commented out until 1.6 release(?) 10/08/2002 EIP		
+! Comment:Commented out until 1.6 release(?) 10/08/2002 EIP
 !----------------------------------------------------------------------
 
 !          SUBROUTINE h5sselect_select_f(space1_id, operator, space2_id, &
-!                                        hdferr) 
+!                                        hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1849,19 +1849,19 @@
 !
 !            IMPLICIT NONE
 !            INTEGER(HID_T), INTENT(INOUT) :: space1_id ! Dataspace identifier to
-                                                       ! modify 
-!            INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier 
+                                                       ! modify
+!            INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier
 !            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F 
-						!  H5S_SELECT_SET_F 
-						!  H5S_SELECT_OR_F 
-						!  H5S_SELECT_AND_F 
-						!  H5S_SELECT_XOR_F 
-						!  H5S_SELECT_NOTB_F 
-						!  H5S_SELECT_NOTA_F 
-						!  H5S_SELECT_APPEND_F 
-						!  H5S_SELECT_PREPEND_F 
-                                                !  
+						!  H5S_SELECT_NOOP_F
+						!  H5S_SELECT_SET_F
+						!  H5S_SELECT_OR_F
+						!  H5S_SELECT_AND_F
+						!  H5S_SELECT_XOR_F
+						!  H5S_SELECT_NOTB_F
+						!  H5S_SELECT_NOTA_F
+						!  H5S_SELECT_APPEND_F
+						!  H5S_SELECT_PREPEND_F
+                                                !
 !            INTEGER, INTENT(OUT) :: hdferr     ! Error code
 
 !            INTERFACE
@@ -1879,37 +1879,37 @@
 
 !            hdferr = h5sselect_select_c(space1_id, operator, space2_id)
 !            return
- 
+
 !          END SUBROUTINE h5sselect_select_f
 
 !----------------------------------------------------------------------
-! Name:		h5sget_select_type_f 
+! Name:		h5sget_select_type_f
 !
 ! Purpose:	Retrieve the type of selection
 !
-! Inputs:  
+! Inputs:
 !		space_id	- dataspace iidentifier with selection
-! Outputs:  
+! Outputs:
 !		type    	- flag, valid values are:
-!				  H5S_SEL_ERROR_F 
-!				  H5S_SEL_NONE_F 
-!				  H5S_SEL_POINTS_F 
-!				  H5S_SEL_HYPERSLABS_F 
-!				  H5S_SEL_ALL_F 
-!		hdferr:		- error code		
+!				  H5S_SEL_ERROR_F
+!				  H5S_SEL_NONE_F
+!				  H5S_SEL_POINTS_F
+!				  H5S_SEL_HYPERSLABS_F
+!				  H5S_SEL_ALL_F
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:		- NONE
 !
 ! Programmer:	Elena Pourmal
 !		October 7, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5sget_select_type_f(space_id, type, hdferr) 
+          SUBROUTINE h5sget_select_type_f(space_id, type, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1919,11 +1919,11 @@
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(INOUT) :: space_id ! Dataspace identifier to
             INTEGER, INTENT(OUT) :: type        ! Selection type
-						!  H5S_SEL_ERROR_F 
-						!  H5S_SEL_NONE_F 
-						!  H5S_SEL_POINTS_F 
-						!  H5S_SEL_HYPERSLABS_F 
-						!  H5S_SEL_ALL_F 
+						!  H5S_SEL_ERROR_F
+						!  H5S_SEL_NONE_F
+						!  H5S_SEL_POINTS_F
+						!  H5S_SEL_HYPERSLABS_F
+						!  H5S_SEL_ALL_F
             INTEGER, INTENT(OUT) :: hdferr     ! Error code
 
             INTERFACE
@@ -1939,7 +1939,7 @@
 
             hdferr = h5sget_select_type_c(space_id, type)
             return
- 
+
           END SUBROUTINE h5sget_select_type_f
 
 !----------------------------------------------------------------------
@@ -1947,11 +1947,11 @@
 !
 ! Purpose:	Decode a binary object description of data space and return a new object handle.
 !
-! Inputs:  
+! Inputs:
 !		buf -  Buffer for the data space object to be decoded.
 !            obj_id - Object ID
 ! Outputs:
-!           hdferr: - error code		
+!           hdferr: - error code
 !			Success:  0
 !			Failure: -1
 !
@@ -1960,12 +1960,12 @@
 ! Programmer:	M.S. Breitenfeld
 !		March 26, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5sdecode_f(buf, obj_id, hdferr) 
+  SUBROUTINE h5sdecode_f(buf, obj_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1989,7 +1989,7 @@
     END INTERFACE
 
     hdferr = h5sdecode_c(buf, obj_id)
-    
+
   END SUBROUTINE h5sdecode_f
 
 !----------------------------------------------------------------------
@@ -2003,7 +2003,7 @@
 !            nalloc - The size of the allocated buffer.
 ! Outputs:
 !            nalloc - The size of the buffer needed.
-!           hdferr: - error code		
+!           hdferr: - error code
 !	                Success:  0
 !		        Failure: -1
 !
@@ -2012,12 +2012,12 @@
 ! Programmer:	M.S. Breitenfeld
 !		March 26, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5sencode_f(obj_id, buf, nalloc, hdferr) 
+  SUBROUTINE h5sencode_f(obj_id, buf, nalloc, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2042,25 +2042,25 @@
          INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
        END FUNCTION h5sencode_c
     END INTERFACE
-    
+
     hdferr = h5sencode_c(buf, obj_id, nalloc)
 
   END SUBROUTINE h5sencode_f
-  
+
 
 !----------------------------------------------------------------------
-! Name:		h5sextent_equal_f 
+! Name:		h5sextent_equal_f
 !
 ! Purpose: 	Determines whether two dataspace extents are equal.
 !
-! Inputs:  
+! Inputs:
 !		space1_id - First dataspace identifier.
 !               space2_id - Second dataspace identifier.
-! Outputs:  
+! Outputs:
 !                   Equal - .TRUE. if equal, .FALSE. if unequal.
-!		  hdferr: - error code		
+!		  hdferr: - error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -2069,7 +2069,7 @@
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5sextent_equal_f(space1_id, space2_id, equal, hdferr)
@@ -2098,14 +2098,14 @@
          INTEGER(HID_T) :: c_equal
        END FUNCTION h5sextent_equal_c
     END INTERFACE
-    
+
     hdferr = h5sextent_equal_c(space1_id, space2_id, c_equal)
 
-    
+
     equal = .FALSE.
-    IF(c_equal.GT.0) equal = .TRUE. 
+    IF(c_equal.GT.0) equal = .TRUE.
+
 
-    
   END SUBROUTINE h5sextent_equal_f
 
 END MODULE H5S
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 490d739..f1be9c6 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -79,7 +79,7 @@ done:
  *                M.S. Breitenfeld
  *---------------------------------------------------------------------------*/
 int_f
-nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, 
+nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id,
 	     hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id)
 {
     char *c_name = NULL;
@@ -1655,17 +1655,17 @@ nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *class )
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, 
+nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
 		  hid_t_f *tcpl_id, hid_t_f *tapl_id)
 {
   int ret_value = -1;
-  
+
   /* Call H5Tcommit_anon function */
   if(H5Tcommit_anon((hid_t)*loc_id, (hid_t)*dtype_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
     goto done;
-  
+
   ret_value = 0;
-  
+
  done:
   return ret_value;
 }
@@ -1674,8 +1674,8 @@ nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
  * Name:        h5tcommitted_c
  * Purpose:     Call H5Tcommitted
  *              dtype_id - dataset identifier
- * Returns:     a positive value, for TRUE, if the datatype has been committed, 
- *              or 0 (zero), for FALSE, if the datatype has not been committed. 
+ * Returns:     a positive value, for TRUE, if the datatype has been committed,
+ *              or 0 (zero), for FALSE, if the datatype has not been committed.
  *		Otherwise returns a negative value.
  * Programmer:  M.S. Breitenfeld
  *              February 25, 2008
@@ -1685,9 +1685,9 @@ int_f
 nh5tcommitted_c(hid_t_f *dtype_id)
 {
   int_f ret_value;
-  
+
   /* Call H5Tcommitted function */
-  
+
   ret_value=(int_f)H5Tcommitted((hid_t)*dtype_id);
 
   return ret_value;
@@ -1697,7 +1697,7 @@ nh5tcommitted_c(hid_t_f *dtype_id)
 /*----------------------------------------------------------------------------
  * Name:        h5tdecode_c
  * Purpose:     Call H5Tdecode
- * Inputs:       
+ * Inputs:
  *		buf     - Buffer for the data space object to be decoded.
  * Outputs:
  *              obj_id  - Object_id (non-negative)
@@ -1719,7 +1719,7 @@ nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
    * Call H5Tdecode function.
    */
 
-  c_buf = (unsigned char*)buf; 
+  c_buf = (unsigned char*)buf;
 
   c_obj_id = H5Tdecode(c_buf);
   if(c_obj_id < 0)
@@ -1734,7 +1734,7 @@ nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
 /*----------------------------------------------------------------------------
  * Name:        h5tencode_c
  * Purpose:     Call H5Tencode
- * Inputs:       
+ * Inputs:
  *            obj_id - Identifier of the object to be encoded.
  *		 buf - Buffer for the object to be encoded into.
  *            nalloc - The size of the allocated buffer.
@@ -1779,9 +1779,9 @@ nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
     return ret_value;
   }
 
-  /* copy the C buffer to the FORTRAN buffer. 
+  /* copy the C buffer to the FORTRAN buffer.
    * Can not use HD5packFstring because we don't want to
-   * eliminate the NUL terminator or pad remaining space 
+   * eliminate the NUL terminator or pad remaining space
    * with blanks.
    */
 
@@ -1794,7 +1794,7 @@ nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
 
 /*----------------------------------------------------------------------------
  * Name:        h5tget_create_plist_c
- * Purpose:     Call H5Tget_create_plist 
+ * Purpose:     Call H5Tget_create_plist
  * Inputs:      dtype_id          - Datatype identifier
  * Outputs:     dtpl_id           - Datatype property list identifier
  * Returns:     0 on success, -1 on failure
@@ -1810,7 +1810,7 @@ nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
 
     if ((*dtpl_id = (hid_t_f)H5Tget_create_plist((hid_t)*dtype_id)) < 0)
         return ret_value;
-    
+
     ret_value = 0;
     return ret_value;
 }
@@ -1818,9 +1818,9 @@ nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
 /*----------------------------------------------------------------------------
  * Name:        h5tcompiler_conv_c
  * Purpose:     Call H5Tcompiler_conv
- * Inputs:    
+ * Inputs:
  *              src_id - Identifier for the source datatype.
- *              dst_id - Identifier for the destination datatype. 
+ *              dst_id - Identifier for the destination datatype.
  * Outputs:     c_flag - flag; TRUE for compiler conversion, FALSE for library conversion
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1843,7 +1843,7 @@ nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
 /*----------------------------------------------------------------------------
  * Name:        h5tget_native_type_c
  * Purpose:     Call H5Tget_native_type
- * Inputs:    
+ * Inputs:
  *              dtype_id         - Datatype identifier for the dataset datatype.
  *              direction        - Direction of search.
  * Outputs:     native_dtype_id  - The native datatype identifier for the specified dataset datatype
diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90
index 7a812ab..fd852f1 100644
--- a/fortran/src/H5Tff.f90
+++ b/fortran/src/H5Tff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5T functions
@@ -19,36 +19,36 @@
 MODULE H5T
 
   USE H5GLOBAL
-      
+
 CONTAINS
 
 !----------------------------------------------------------------------
-! Name:		h5topen_f 
+! Name:		h5topen_f
 !
-! Purpose: 	Opens named datatype. 	
+! Purpose: 	Opens named datatype.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- a datatype name
-! Outputs:  
+! Outputs:
 !		type_id		- datatype identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !              tapl_id          - datatype access property list identifier.
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: Explicit Fortran interfaces were added for 
+! Modifications: Explicit Fortran interfaces were added for
 !		 called C functions (it is needed for Windows
-!		 port).  March 7, 2001 
+!		 port).  March 7, 2001
 !
 !                Added optional parameter 'tapl_id' for compatability
-!                with H5Topen2. April 9, 2009.              
+!                with H5Topen2. April 9, 2009.
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5topen_f(loc_id, name, type_id, hdferr, tapl_id)
@@ -59,7 +59,7 @@ CONTAINS
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier 
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
     CHARACTER(LEN=*), INTENT(IN) :: name ! Datatype name within file or group
     INTEGER(HID_T), INTENT(OUT) :: type_id  ! Datatype identifier
     INTEGER, INTENT(OUT) :: hdferr ! Error code
@@ -76,7 +76,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TOPEN_C'::h5topen_c
          !DEC$ ENDIF
-         !DEC$ATTRIBUTES reference ::name 
+         !DEC$ATTRIBUTES reference ::name
          INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: name
          INTEGER :: namelen
@@ -84,7 +84,7 @@ CONTAINS
          INTEGER(HID_T) :: tapl_id_default
        END FUNCTION h5topen_c
     END INTERFACE
-    
+
     namelen = LEN(name)
 
     tapl_id_default = H5P_DEFAULT_F
@@ -94,42 +94,42 @@ CONTAINS
   END SUBROUTINE h5topen_f
 
 !----------------------------------------------------------------------
-! Name:		h5tcommit_f 
+! Name:		h5tcommit_f
 !
-! Purpose: 	Commits a transient datatype to a file, creating a 
-!		new named datatype. 	
+! Purpose: 	Commits a transient datatype to a file, creating a
+!		new named datatype.
 !
-! Inputs:  
+! Inputs:
 !		loc_id		- location identifier
 !		name		- name of the datatype to be stored
 !				  at the specified location
 !		type_id		- identifier of a datatype to be stored
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !	       lcpl_id          - Link creation property list
 !              tcpl_id          - Datatype creation property list
 !              tapl_id          - Datatype access property list
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: - Explicit Fortran interfaces were added for 
+! Modifications: - Explicit Fortran interfaces were added for
 !		   called C functions (it is needed for Windows
 !	           port).  March 7, 2001
 !
-!                - Added optional parameters introduced in version 1.8 
+!                - Added optional parameters introduced in version 1.8
 !                  M.S. Breitenfeld
 !
 !
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5tcommit_f(loc_id, name, type_id, hdferr, &
-       lcpl_id, tcpl_id, tapl_id  ) 
+       lcpl_id, tcpl_id, tapl_id  )
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -137,10 +137,10 @@ CONTAINS
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier 
-    CHARACTER(LEN=*), INTENT(IN) :: name  
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! File or group identifier
+    CHARACTER(LEN=*), INTENT(IN) :: name
                                   ! Datatype name within file or group
-    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
+    INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! Datatype creation property list
@@ -162,7 +162,7 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCOMMIT_C'::h5tcommit_c
          !DEC$ ENDIF
-         !DEC$ATTRIBUTES reference ::name 
+         !DEC$ATTRIBUTES reference ::name
          INTEGER(HID_T), INTENT(IN) :: loc_id
          CHARACTER(LEN=*), INTENT(IN) :: name
          INTEGER :: namelen
@@ -180,7 +180,7 @@ CONTAINS
     IF (PRESENT(lcpl_id)) lcpl_id_default = lcpl_id
     IF (PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
     IF (PRESENT(tapl_id)) tapl_id_default = tapl_id
-    
+
     namelen = LEN(name)
 
     hdferr = h5tcommit_c(loc_id, name, namelen, type_id, &
@@ -189,32 +189,32 @@ CONTAINS
   END SUBROUTINE h5tcommit_f
 
 !----------------------------------------------------------------------
-! Name:		h5tcopy_f 
+! Name:		h5tcopy_f
 !
-! Purpose: 	iCreates a copy of exisiting datatype.	
+! Purpose: 	iCreates a copy of exisiting datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		new_type_id	- identifier of datatype's copy
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tcopy_f(type_id, new_type_id, hdferr) 
+          SUBROUTINE h5tcopy_f(type_id, new_type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -222,9 +222,9 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER(HID_T), INTENT(OUT) :: new_type_id 
-                                 ! Identifier of datatype's copy 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER(HID_T), INTENT(OUT) :: new_type_id
+                                 ! Identifier of datatype's copy
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tcopy_c
@@ -245,34 +245,34 @@ CONTAINS
           END SUBROUTINE h5tcopy_f
 
 !----------------------------------------------------------------------
-! Name:		h5tequal_f 
+! Name:		h5tequal_f
 !
-! Purpose: 	Determines whether two datatype identifiers refer 
-!		to the same datatype. 	
+! Purpose: 	Determines whether two datatype identifiers refer
+!		to the same datatype.
 !
-! Inputs:  
+! Inputs:
 !		type1_id	- datatype identifier
 !		type2_id	- datatype identifier
-! Outputs:  
+! Outputs:
 !		flag		- TRUE/FALSE flag to indicate
 !				  if two datatypes are equal
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tequal_f(type1_id, type2_id, flag, hdferr) 
+          SUBROUTINE h5tequal_f(type1_id, type2_id, flag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -280,8 +280,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type1_id ! Datatype identifier 
-            INTEGER(HID_T), INTENT(IN) :: type2_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type1_id ! Datatype identifier
+            INTEGER(HID_T), INTENT(IN) :: type2_id ! Datatype identifier
             LOGICAL, INTENT(OUT) :: flag ! TRUE/FALSE flag to indicate if two
                                          ! datatypes are equal
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -295,8 +295,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TEQUAL_C'::h5tequal_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type1_id 
-              INTEGER(HID_T), INTENT(IN) :: type2_id 
+              INTEGER(HID_T), INTENT(IN) :: type1_id
+              INTEGER(HID_T), INTENT(IN) :: type2_id
               INTEGER :: c_flag
               END FUNCTION h5tequal_c
             END INTERFACE
@@ -307,31 +307,31 @@ CONTAINS
           END SUBROUTINE h5tequal_f
 
 !----------------------------------------------------------------------
-! Name:		h5tclose_f 
+! Name:		h5tclose_f
 !
-! Purpose:	Releases a datatype.  	
+! Purpose:	Releases a datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tclose_f(type_id, hdferr) 
+          SUBROUTINE h5tclose_f(type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -339,7 +339,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL ::  h5tclose_c
@@ -359,13 +359,13 @@ CONTAINS
           END SUBROUTINE h5tclose_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_class_f 
+! Name:		h5tget_class_f
 !
-! Purpose:	Returns the datatype class identifier.  	
+! Purpose:	Returns the datatype class identifier.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		class		- class, possible values are:
 !					 H5T_NO_CLASS_F (-1)
 !					 H5T_INTEGER_F  (0)
@@ -377,24 +377,24 @@ CONTAINS
 !					 H5T_COMPOUND_F (6)
 !					 H5T_REFERENCE_F (7)
 !					 H5T_ENUM_F (8)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tget_class_f(type_id, class, hdferr) 
+          SUBROUTINE h5tget_class_f(type_id, class, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -402,8 +402,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: class 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: class
                            ! Datatype class, possible values are:
                                           ! H5T_NO_CLASS_F (-1)
                                           ! H5T_INTEGER_F  (0)
@@ -426,7 +426,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_CLASS_C'::h5tget_class_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(OUT) :: class
               END FUNCTION h5tget_class_c
             END INTERFACE
@@ -435,32 +435,32 @@ CONTAINS
           END SUBROUTINE h5tget_class_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_size_f 
+! Name:		h5tget_size_f
 !
-! Purpose: 	Returns the size of a datatype. 	
+! Purpose: 	Returns the size of a datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		size		- datatype size
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tget_size_f(type_id, size, hdferr) 
+          SUBROUTINE h5tget_size_f(type_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -468,7 +468,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(OUT) :: size ! Datatype size
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -490,32 +490,32 @@ CONTAINS
           END SUBROUTINE h5tget_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_size_f 
+! Name:		h5tset_size_f
 !
-! Purpose: 	Sets the total size for an atomic datatype.	
+! Purpose: 	Sets the total size for an atomic datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		size		- size of the datatype
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tset_size_f(type_id, size, hdferr) 
+          SUBROUTINE h5tset_size_f(type_id, size, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -523,7 +523,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(IN) :: size ! Datatype size
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -545,36 +545,36 @@ CONTAINS
           END SUBROUTINE h5tset_size_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_order_f 
+! Name:		h5tget_order_f
 !
-! Purpose: 	Returns the byte order of an atomic datatype. 	
+! Purpose: 	Returns the byte order of an atomic datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		order		- byte order for the datatype, possible
 !				  values are:
 !					 H5T_ORDER_LE_F
 !					 H5T_ORDER_BE_F
 !					 H5T_ORDER_VAX_F (not implemented yet)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tget_order_f(type_id, order, hdferr) 
+          SUBROUTINE h5tget_order_f(type_id, order, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -582,8 +582,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: order 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: order
                               ! Datatype byte order, bossible values are:
                                           ! H5T_ORDER_LE_F
                                           ! H5T_ORDER_BE_F
@@ -608,36 +608,36 @@ CONTAINS
           END SUBROUTINE h5tget_order_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_order_f 
+! Name:		h5tset_order_f
 !
-! Purpose: 	Sets the byte ordering of an atomic datatype. 	
+! Purpose: 	Sets the byte ordering of an atomic datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		order		- datatype byte order
 !				  Possible values are:
 !					 H5T_ORDER_LE_F
 !					 H5T_ORDER_BE_F
 !					 H5T_ORDER_VAX_F (not implemented yet)
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tset_order_f(type_id, order, hdferr) 
+          SUBROUTINE h5tset_order_f(type_id, order, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -645,12 +645,12 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(IN) :: order ! Datatype byte order, bossible values
                                           ! are:
-                                          ! H5T_ORDER_LE_F 
+                                          ! H5T_ORDER_LE_F
                                           ! H5T_ORDER_BE_F
-                                          ! H5T_ORDER_VAX_F 
+                                          ! H5T_ORDER_VAX_F
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tset_order_c
@@ -671,32 +671,32 @@ CONTAINS
           END SUBROUTINE h5tset_order_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_precision_f 
+! Name:		h5tget_precision_f
 !
-! Purpose: 	Returns the precision of an atomic datatype. 	
+! Purpose: 	Returns the precision of an atomic datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		precision	- precision of the datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tget_precision_f(type_id, precision, hdferr) 
+          SUBROUTINE h5tget_precision_f(type_id, precision, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -704,7 +704,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(OUT) :: precision ! Datatype precision
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -717,8 +717,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_PRECISION_C'::h5tget_precision_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
-              INTEGER(SIZE_T), INTENT(OUT) :: precision 
+              INTEGER(HID_T), INTENT(IN) :: type_id
+              INTEGER(SIZE_T), INTENT(OUT) :: precision
               END FUNCTION h5tget_precision_c
             END INTERFACE
 
@@ -726,31 +726,31 @@ CONTAINS
           END SUBROUTINE h5tget_precision_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_precision_f 
+! Name:		h5tset_precision_f
 !
-! Purpose: 	Sets the precision of an atomic datatype. 	
+! Purpose: 	Sets the precision of an atomic datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		precision	- datatype precision
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_precision_f(type_id, precision, hdferr) 
+          SUBROUTINE h5tset_precision_f(type_id, precision, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -758,7 +758,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(IN) :: precision ! Datatype precision
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -771,8 +771,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_PRECISION_C'::h5tset_precision_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
-              INTEGER(SIZE_T), INTENT(IN) :: precision 
+              INTEGER(HID_T), INTENT(IN) :: type_id
+              INTEGER(SIZE_T), INTENT(IN) :: precision
               END FUNCTION h5tset_precision_c
             END INTERFACE
 
@@ -780,31 +780,31 @@ CONTAINS
           END SUBROUTINE h5tset_precision_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_offset_f 
+! Name:		h5tget_offset_f
 !
-! Purpose: 	Retrieves the bit offset of the first significant bit. 	
+! Purpose: 	Retrieves the bit offset of the first significant bit.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		offset		- offset value
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_offset_f(type_id, offset, hdferr) 
+          SUBROUTINE h5tget_offset_f(type_id, offset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -812,7 +812,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(OUT) :: offset ! Datatype bit offset of the
                                            ! first significant bit
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -826,8 +826,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_OFFSET_C'::h5tget_offset_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
-              INTEGER(SIZE_T), INTENT(OUT) :: offset 
+              INTEGER(HID_T), INTENT(IN) :: type_id
+              INTEGER(SIZE_T), INTENT(OUT) :: offset
               END FUNCTION h5tget_offset_c
             END INTERFACE
 
@@ -835,31 +835,31 @@ CONTAINS
           END SUBROUTINE h5tget_offset_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_offset_f 
+! Name:		h5tset_offset_f
 !
-! Purpose: 	Sets the bit offset of the first significant bit. 	
+! Purpose: 	Sets the bit offset of the first significant bit.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		offset		- offset value
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_offset_f(type_id, offset, hdferr) 
+          SUBROUTINE h5tset_offset_f(type_id, offset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -867,7 +867,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(IN) :: offset ! Datatype bit offset of the
                                            ! first significant bit
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -881,8 +881,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_OFFSET_C'::h5tset_offset_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
-              INTEGER(SIZE_T), INTENT(IN) :: offset 
+              INTEGER(HID_T), INTENT(IN) :: type_id
+              INTEGER(SIZE_T), INTENT(IN) :: offset
               END FUNCTION h5tset_offset_c
             END INTERFACE
 
@@ -890,39 +890,39 @@ CONTAINS
           END SUBROUTINE h5tset_offset_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_pad_f 
+! Name:		h5tget_pad_f
 !
-! Purpose: 	Retrieves the padding type of the least and 
-!		most-significant bit padding. 
+! Purpose: 	Retrieves the padding type of the least and
+!		most-significant bit padding.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
-!		lsbpad		- least-significant bit padding type 
-!		msbpad		- most-significant bit padding type 
+! Outputs:
+!		lsbpad		- least-significant bit padding type
+!		msbpad		- most-significant bit padding type
 !					 Possible values of padding type are:
 !					 H5T_PAD_ERROR_F      = -1
 !					 H5T_PAD_ZERO_F = 0
 !					 H5T_PAD_ONE_F = 1
 !					 H5T_PAD_BACKGROUND_F = 2
 !					 H5T_PAD_NPAD_F      = 3
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_pad_f(type_id, lsbpad, msbpad, hdferr) 
+          SUBROUTINE h5tget_pad_f(type_id, lsbpad, msbpad, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -930,10 +930,10 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: lsbpad ! padding type of the 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: lsbpad ! padding type of the
                                            ! least significant bit
-            INTEGER, INTENT(OUT) :: msbpad ! padding type of the 
+            INTEGER, INTENT(OUT) :: msbpad ! padding type of the
                                            ! most significant bit
                                            ! Possible values of padding type are:
                                            ! H5T__PAD_ZERO_F = 0
@@ -954,7 +954,7 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_PAD_C'::h5tget_pad_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(OUT) :: lsbpad 
+              INTEGER, INTENT(OUT) :: lsbpad
               INTEGER, INTENT(OUT) :: msbpad
               END FUNCTION h5tget_pad_c
             END INTERFACE
@@ -963,38 +963,38 @@ CONTAINS
           END SUBROUTINE h5tget_pad_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_pad_f 
+! Name:		h5tset_pad_f
 !
-! Purpose: 	Sets the least and most-significant bits padding types. 
+! Purpose: 	Sets the least and most-significant bits padding types.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-!		lsbpad		- least-significant bit padding type 
-!		msbpad		- most-significant bit padding type 
+!		lsbpad		- least-significant bit padding type
+!		msbpad		- most-significant bit padding type
 !					 Possible values of padding type are:
 !					 H5T_PAD_ERROR_F      = -1
 !					 H5T_PAD_ZERO_F = 0
 !					 H5T_PAD_ONE_F = 1
 !					 H5T_PAD_BACKGROUND_F = 2
 !					 H5T_PAD_NPAD_F      = 3
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_pad_f(type_id, lsbpad, msbpad, hdferr) 
+          SUBROUTINE h5tset_pad_f(type_id, lsbpad, msbpad, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1002,10 +1002,10 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: lsbpad ! padding type of the 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: lsbpad ! padding type of the
                                            ! least significant bit
-            INTEGER, INTENT(IN) :: msbpad ! padding type of the 
+            INTEGER, INTENT(IN) :: msbpad ! padding type of the
                                            ! most significant bit
                                            ! Possible values of padding type are:
                                            ! H5T_PAD_ZERO_F = 0
@@ -1025,7 +1025,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_PAD_C'::h5tset_pad_c
               !DEC$ ENDIF
-              INTEGER, INTENT(IN) :: lsbpad 
+              INTEGER, INTENT(IN) :: lsbpad
               INTEGER, INTENT(IN) :: msbpad
               END FUNCTION h5tset_pad_c
             END INTERFACE
@@ -1034,36 +1034,36 @@ CONTAINS
           END SUBROUTINE h5tset_pad_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_sign_f 
+! Name:		h5tget_sign_f
 !
-! Purpose: 	Retrieves the sign type for an integer type. 
+! Purpose: 	Retrieves the sign type for an integer type.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
-!		sign		- sign type 
+! Outputs:
+!		sign		- sign type
 !					Possible values are:
 !					Unsigned integer type H5T_SGN_NONE_F = 0
 !					Two's complement signed integer type
 !					H5T_SGN_2_F = 1
-!					or error value: H5T_SGN_ERROR_F=-1 
-!		hdferr:		- error code		
+!					or error value: H5T_SGN_ERROR_F=-1
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_sign_f(type_id, sign, hdferr) 
+          SUBROUTINE h5tget_sign_f(type_id, sign, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1071,13 +1071,13 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(OUT) :: sign ! sign type for an integer type
                                          !possible values are:
                                          !Unsigned integer type H5T_SGN_NONE_F = 0
                                          !Two's complement signed integer type
                                          !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1 
+                                         !or error value: H5T_SGN_ERROR_F=-1
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_sign_c
@@ -1098,36 +1098,36 @@ CONTAINS
           END SUBROUTINE h5tget_sign_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_sign_f 
+! Name:		h5tset_sign_f
 !
-! Purpose: 	Sets the sign proprety for an integer type. 
+! Purpose: 	Sets the sign proprety for an integer type.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-!		sign		- sign type 
+!		sign		- sign type
 !					Possible values are:
 !					Unsigned integer type H5T_SGN_NONE_F = 0
 !					Two's complement signed integer type
 !					H5T_SGN_2_F = 1
-!					or error value: H5T_SGN_ERROR_F=-1 
-! Outputs:  
-!		hdferr:		- error code		
+!					or error value: H5T_SGN_ERROR_F=-1
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_sign_f(type_id, sign, hdferr) 
+          SUBROUTINE h5tset_sign_f(type_id, sign, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1135,13 +1135,13 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: sign !sign type for an integer type 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: sign !sign type for an integer type
                                          !possible values are:
                                          !Unsigned integer type H5T_SGN_NONE_F = 0
                                          !Two's complement signed integer type
                                          !H5T_SGN_2_F = 1
-                                         !or error value: H5T_SGN_ERROR_F=-1 
+                                         !or error value: H5T_SGN_ERROR_F=-1
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tset_sign_c
@@ -1162,35 +1162,35 @@ CONTAINS
           END SUBROUTINE h5tset_sign_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_fields_f 
+! Name:		h5tget_fields_f
 !
-! Purpose: 	Retrieves floating point datatype bit field information. 
+! Purpose: 	Retrieves floating point datatype bit field information.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		spos		- sign bit-position
 !		epos		- exponent bit-position
 !		esize		- size of exponent in bits
 !		mpos		- mantissa position
 !		msize		- size of mantissa in bits
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr) 
+          SUBROUTINE h5tget_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1198,11 +1198,11 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER(SIZE_T), INTENT(OUT) :: spos   ! sign bit-position 
-            INTEGER(SIZE_T), INTENT(OUT) :: epos   ! exponent bit-position 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER(SIZE_T), INTENT(OUT) :: spos   ! sign bit-position
+            INTEGER(SIZE_T), INTENT(OUT) :: epos   ! exponent bit-position
             INTEGER(SIZE_T), INTENT(OUT) :: esize  ! size of exponent in bits
-            INTEGER(SIZE_T), INTENT(OUT) :: mpos   ! mantissa bit-position 
+            INTEGER(SIZE_T), INTENT(OUT) :: mpos   ! mantissa bit-position
             INTEGER(SIZE_T), INTENT(OUT) :: msize  ! size of mantissa in bits
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -1216,10 +1216,10 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_FIELDS_C'::h5tget_fields_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(OUT) :: spos  
-              INTEGER(SIZE_T), INTENT(OUT) :: epos  
+              INTEGER(SIZE_T), INTENT(OUT) :: spos
+              INTEGER(SIZE_T), INTENT(OUT) :: epos
               INTEGER(SIZE_T), INTENT(OUT) :: esize
-              INTEGER(SIZE_T), INTENT(OUT) :: mpos 
+              INTEGER(SIZE_T), INTENT(OUT) :: mpos
               INTEGER(SIZE_T), INTENT(OUT) :: msize
               END FUNCTION h5tget_fields_c
             END INTERFACE
@@ -1228,36 +1228,36 @@ CONTAINS
           END SUBROUTINE h5tget_fields_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_fields_f 
+! Name:		h5tset_fields_f
 !
-! Purpose: 	Sets locations and sizes of floating point bit fields. 
+! Purpose: 	Sets locations and sizes of floating point bit fields.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		spos		- sign bit-position
 !		epos		- exponent bit-position
 !		esize		- size of exponent in bits
 !		mpos		- mantissa position
 !		msize		- size of mantissa in bits
-!		hdferr:		- error code		
-! Outputs:  
-!		hdferr:		- error code		
+!		hdferr:		- error code
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr) 
+          SUBROUTINE h5tset_fields_f(type_id, spos, epos, esize, mpos, msize, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1266,10 +1266,10 @@ CONTAINS
 !
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
-            INTEGER(SIZE_T), INTENT(IN) :: spos   ! sign bit-position 
-            INTEGER(SIZE_T), INTENT(IN) :: epos   ! exponent bit-position 
+            INTEGER(SIZE_T), INTENT(IN) :: spos   ! sign bit-position
+            INTEGER(SIZE_T), INTENT(IN) :: epos   ! exponent bit-position
             INTEGER(SIZE_T), INTENT(IN) :: esize  ! size of exponent in bits
-            INTEGER(SIZE_T), INTENT(IN) :: mpos   ! mantissa bit-position 
+            INTEGER(SIZE_T), INTENT(IN) :: mpos   ! mantissa bit-position
             INTEGER(SIZE_T), INTENT(IN) :: msize  ! size of mantissa in bits
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -1283,10 +1283,10 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_FIELDS_C'::h5tset_fields_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER(SIZE_T), INTENT(IN) :: spos  
-              INTEGER(SIZE_T), INTENT(IN) :: epos  
+              INTEGER(SIZE_T), INTENT(IN) :: spos
+              INTEGER(SIZE_T), INTENT(IN) :: epos
               INTEGER(SIZE_T), INTENT(IN) :: esize
-              INTEGER(SIZE_T), INTENT(IN) :: mpos 
+              INTEGER(SIZE_T), INTENT(IN) :: mpos
               INTEGER(SIZE_T), INTENT(IN) :: msize
               END FUNCTION h5tset_fields_c
             END INTERFACE
@@ -1295,31 +1295,31 @@ CONTAINS
           END SUBROUTINE h5tset_fields_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_ebias_f 
+! Name:		h5tget_ebias_f
 !
-! Purpose: 	Retrieves the exponent bias of a floating-point type. 
+! Purpose: 	Retrieves the exponent bias of a floating-point type.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		ebias		- datatype exponent bias
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_ebias_f(type_id, ebias, hdferr) 
+          SUBROUTINE h5tget_ebias_f(type_id, ebias, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1327,7 +1327,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(OUT) :: ebias ! Datatype exponent bias of a floating-point type
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -1340,7 +1340,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_EBIAS_C'::h5tget_ebias_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(SIZE_T), INTENT(OUT) :: ebias
               END FUNCTION h5tget_ebias_c
             END INTERFACE
@@ -1349,32 +1349,32 @@ CONTAINS
           END SUBROUTINE h5tget_ebias_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_ebias_f 
+! Name:		h5tset_ebias_f
 !
-! Purpose: 	Sets the exponent bias of a floating-point type. 
+! Purpose: 	Sets the exponent bias of a floating-point type.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		ebias		- datatype exponent bias
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tset_ebias_f(type_id, ebias, hdferr) 
+          SUBROUTINE h5tset_ebias_f(type_id, ebias, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1382,7 +1382,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER(SIZE_T), INTENT(IN) :: ebias !Datatype exponent bias of a floating-point type
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -1395,7 +1395,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TSET_EBIAS_C'::h5tset_ebias_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(SIZE_T), INTENT(IN) :: ebias
               END FUNCTION h5tset_ebias_c
             END INTERFACE
@@ -1404,35 +1404,35 @@ CONTAINS
           END SUBROUTINE h5tset_ebias_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_norm_f 
+! Name:		h5tget_norm_f
 !
-! Purpose: 	Retrieves mantissa normalization of a floating-point 
-!		datatype. 
+! Purpose: 	Retrieves mantissa normalization of a floating-point
+!		datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		norm		- normalization types, valid values are:
 !					H5T_NORM_IMPLIED_F(0)
 !					H5T_NORM_MSBSET_F(1)
 !					H5T_NORM_NONE_F(2)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_norm_f(type_id, norm, hdferr) 
+          SUBROUTINE h5tget_norm_f(type_id, norm, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1440,11 +1440,11 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(OUT) :: norm !mantissa normalization of a floating-point datatype
                                          !Valid normalization types are:
-                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not 
-                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of 
+                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not
+                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of
                                          !mantissa is always 1, H5T_NORM_NONE_F(2)
                                          !Mantissa is not normalize
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -1467,35 +1467,35 @@ CONTAINS
           END SUBROUTINE h5tget_norm_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_norm_f 
+! Name:		h5tset_norm_f
 !
-! Purpose: 	Sets the mantissa normalization of a floating-point datatype. 
+! Purpose: 	Sets the mantissa normalization of a floating-point datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		norm		- normalization types, valid values are:
 !					H5T_NORM_IMPLIED_F(0)
 !					H5T_NORM_MSBSET_F(1)
 !					H5T_NORM_NONE_F(2)
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tset_norm_f(type_id, norm, hdferr) 
+          SUBROUTINE h5tset_norm_f(type_id, norm, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1503,11 +1503,11 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(IN) :: norm !mantissa normalization of a floating-point datatype
                                          !Valid normalization types are:
-                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not 
-                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of 
+                                         !H5T_NORM_IMPLIED_F(0),MSB of mantissa is not
+                                         !stored, always 1,  H5T_NORM_MSBSET_F(1), MSB of
                                          !mantissa is always 1, H5T_NORM_NONE_F(2)
                                          !Mantissa is not normalize
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -1530,36 +1530,36 @@ CONTAINS
           END SUBROUTINE h5tset_norm_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_inpad_f 
+! Name:		h5tget_inpad_f
 !
-! Purpose: 	Retrieves the internal padding type for unused bits 
-!		in floating-point datatypes. 
+! Purpose: 	Retrieves the internal padding type for unused bits
+!		in floating-point datatypes.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		padtype		- padding type for unused bits
 !				  Possible values of padding type are:
 !					 H5T_PAD_ZERO_F = 0
 !					 H5T_PAD_ONE_F = 1
 !					 H5T_PAD_BACKGROUND_F = 2
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_inpad_f(type_id, padtype, hdferr) 
+          SUBROUTINE h5tget_inpad_f(type_id, padtype, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1567,8 +1567,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: padtype ! padding type for unused bits 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: padtype ! padding type for unused bits
                                             ! in floating-point datatypes.
                                             ! Possible values of padding type are:
                                             ! H5T__PAD_ZERO_F = 0
@@ -1595,35 +1595,35 @@ CONTAINS
           END SUBROUTINE h5tget_inpad_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_inpad_f 
+! Name:		h5tset_inpad_f
 !
-! Purpose: 	Fills unused internal floating point bits. 
+! Purpose: 	Fills unused internal floating point bits.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		padtype		- padding type for unused bits
 !				  Possible values of padding type are:
 !					 H5T_PAD_ZERO_F = 0
 !					 H5T_PAD_ONE_F = 1
 !					 H5T_PAD_BACKGROUND_F = 2
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_inpad_f(type_id, padtype, hdferr) 
+          SUBROUTINE h5tset_inpad_f(type_id, padtype, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1631,8 +1631,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: padtype ! padding type for unused bits 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: padtype ! padding type for unused bits
                                            ! in floating-point datatypes.
                                            ! Possible values of padding type are:
                                            ! H5T__PAD_ZERO_F = 0
@@ -1658,33 +1658,33 @@ CONTAINS
           END SUBROUTINE h5tset_inpad_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_cset_f 
+! Name:		h5tget_cset_f
 !
-! Purpose: 	Retrieves the character set type of a string datatype. 
+! Purpose: 	Retrieves the character set type of a string datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		cset		- character set type of a string datatype
 !				  Possible values of padding type are:
 !				                  H5T_CSET_ASCII_F = 0
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_cset_f(type_id, cset, hdferr) 
+          SUBROUTINE h5tget_cset_f(type_id, cset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1692,8 +1692,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: cset ! character set type of a string datatype 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: cset ! character set type of a string datatype
                                             ! Possible values of padding type are:
                                             !H5T_CSET_ASCII_F = 0
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -1716,33 +1716,33 @@ CONTAINS
           END SUBROUTINE h5tget_cset_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_cset_f 
+! Name:		h5tset_cset_f
 !
-! Purpose: 	Sets character set to be used. 
+! Purpose: 	Sets character set to be used.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		cset		- character set type of a string datatype
 !				  Possible values of padding type are:
 !				                  H5T_CSET_ASCII_F = 0
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_cset_f(type_id, cset, hdferr) 
+          SUBROUTINE h5tset_cset_f(type_id, cset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1750,8 +1750,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: cset !character set type of a string datatype  
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: cset !character set type of a string datatype
                                            !Possible values of padding type are:
                                            !H5T_CSET_ASCII_F = 0
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -1774,36 +1774,36 @@ CONTAINS
           END SUBROUTINE h5tset_cset_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_strpad_f 
+! Name:		h5tget_strpad_f
 !
-! Purpose: 	Retrieves the storage mechanism for a string datatype. 
+! Purpose: 	Retrieves the storage mechanism for a string datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
+! Outputs:
 !		strpad		- storage method for a string datatype
 !				  Possible values are:
-!				  H5T_STR_NULLTERM_F, 
-!				  H5T_STR_NULLPAD_F, 
+!				  H5T_STR_NULLTERM_F,
+!				  H5T_STR_NULLPAD_F,
 !				  H5T_STR_SPACEPAD_F
 !				  H5T_STR_ERROR_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_strpad_f(type_id, strpad, hdferr) 
+          SUBROUTINE h5tget_strpad_f(type_id, strpad, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1811,8 +1811,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: strpad 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: strpad
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_strpad_c
@@ -1833,36 +1833,36 @@ CONTAINS
           END SUBROUTINE h5tget_strpad_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_strpad_f 
+! Name:		h5tset_strpad_f
 !
-! Purpose: 	Defines the storage mechanism for character strings. 
+! Purpose: 	Defines the storage mechanism for character strings.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		strpad		- storage method for a string datatype
 !				  Possible values are:
-!				  H5T_STR_NULLTERM_F, 
-!				  H5T_STR_NULLPAD_F, 
+!				  H5T_STR_NULLTERM_F,
+!				  H5T_STR_NULLPAD_F,
 !				  H5T_STR_SPACEPAD_F
 !				  H5T_STR_ERROR_F
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_strpad_f(type_id, strpad, hdferr) 
+          SUBROUTINE h5tset_strpad_f(type_id, strpad, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1870,8 +1870,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: strpad ! string padding method for a string datatype 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: strpad ! string padding method for a string datatype
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tset_strpad_c
@@ -1892,32 +1892,32 @@ CONTAINS
           END SUBROUTINE h5tset_strpad_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_nmembers_f 
+! Name:		h5tget_nmembers_f
 !
-! Purpose: 	Retrieves the number of fields in a compound datatype. 
+! Purpose: 	Retrieves the number of fields in a compound datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
-!		num_members	- number of members	
-!		hdferr:		- error code		
+! Outputs:
+!		num_members	- number of members
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tget_nmembers_f(type_id, num_members, hdferr) 
+          SUBROUTINE h5tget_nmembers_f(type_id, num_members, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1925,8 +1925,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(OUT) :: num_members !number of fields in a compound datatype 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(OUT) :: num_members !number of fields in a compound datatype
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_nmembers_c
@@ -1947,33 +1947,33 @@ CONTAINS
           END SUBROUTINE h5tget_nmembers_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_member_name_f 
+! Name:		h5tget_member_name_f
 !
-! Purpose: 	Retrieves the name of a field of a compound datatype. 
+! Purpose: 	Retrieves the name of a field of a compound datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		index		- filed index (0-based)
-! Outputs:  
+! Outputs:
 !		member_name	- buffer to hold member's name
 !		namelen		- name lenght
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_member_name_f(type_id, index, member_name,  namelen, hdferr) 
+          SUBROUTINE h5tget_member_name_f(type_id, index, member_name,  namelen, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1981,11 +1981,11 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: index !Field index (0-based) of the field name to retrieve 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: index !Field index (0-based) of the field name to retrieve
             CHARACTER(LEN=*), INTENT(OUT) :: member_name !name of a field of
-                                                         !a compound datatype 
-            INTEGER, INTENT(OUT) :: namelen ! Length of the name 
+                                                         !a compound datatype
+            INTEGER, INTENT(OUT) :: namelen ! Length of the name
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_member_name_c
@@ -1998,43 +1998,43 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_NAME_C'::h5tget_member_name_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: member_name
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: index
               CHARACTER(LEN=*), INTENT(OUT) :: member_name
               INTEGER, INTENT(OUT) :: namelen
-              END FUNCTION 
+              END FUNCTION
             END INTERFACE
 
             hdferr = h5tget_member_name_c(type_id, index, member_name, namelen)
           END SUBROUTINE h5tget_member_name_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_member_offset_f 
+! Name:		h5tget_member_offset_f
 !
-! Purpose: 	Retrieves the offset of a field of a compound datatype. 
+! Purpose: 	Retrieves the offset of a field of a compound datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		member_no 	- number of the field
-! Outputs:  
+! Outputs:
 !		offset		- byte offset of the requested field
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_member_offset_f(type_id, member_no, offset, hdferr) 
+          SUBROUTINE h5tget_member_offset_f(type_id, member_no, offset, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2042,8 +2042,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            INTEGER, INTENT(IN) :: member_no !Number of the field  
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            INTEGER, INTENT(IN) :: member_no !Number of the field
                                                        !whose offset is requested
             INTEGER(SIZE_T), INTENT(OUT) :: offset !byte offset of the beginning of the field
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -2066,19 +2066,19 @@ CONTAINS
             hdferr = h5tget_member_offset_c(type_id, member_no, offset )
           END SUBROUTINE h5tget_member_offset_f
 !----------------------------------------------------------------------
-! Name:		h5tget_member_index_f 
+! Name:		h5tget_member_index_f
 !
-! Purpose: 	Retrieves the index of a compound or enumeration datatype member. 
+! Purpose: 	Retrieves the index of a compound or enumeration datatype member.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		name		- name of the field or member whose index to
 !                                 to be retrieved from the datatype.
-! Outputs:  
+! Outputs:
 !               index           - 0-based index of the filed or member (0 to N-1)
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
@@ -2087,10 +2087,10 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_member_index_f(type_id, name, index, hdferr) 
+          SUBROUTINE h5tget_member_index_f(type_id, name, index, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2098,11 +2098,11 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
             CHARACTER(LEN=*), INTENT(IN) :: name   ! Field or member name
             INTEGER, INTENT(OUT) :: index          ! Field or member index
             INTEGER, INTENT(OUT) :: hdferr          ! Error code
-            INTEGER :: namelen          ! Name length 
+            INTEGER :: namelen          ! Name length
 
             INTERFACE
               INTEGER FUNCTION h5tget_member_index_c(type_id, name, namelen, index)
@@ -2110,11 +2110,11 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_INDEX_C'::h5tget_member_index_c
               !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference ::name 
+              !DEC$ATTRIBUTES reference ::name
               INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN)  :: namelen
-              INTEGER, INTENT(OUT) :: index  
+              INTEGER, INTENT(OUT) :: index
               END FUNCTION h5tget_member_index_c
             END INTERFACE
 
@@ -2124,29 +2124,29 @@ CONTAINS
 
 
 !----------------------------------------------------------------------
-! Name:		h5tget_member_dim_f 
+! Name:		h5tget_member_dim_f
 !
-! Purpose: 	This function is not supported in hdf5-1.4.* 
+! Purpose: 	This function is not supported in hdf5-1.4.*
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-!          SUBROUTINE h5tget_member_dims_f(type_id, field_idx,dims, field_dims, perm, hdferr) 
+!          SUBROUTINE h5tget_member_dims_f(type_id, field_idx,dims, field_dims, perm, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2154,14 +2154,14 @@ CONTAINS
 !DEC$endif
 !
 !            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-!            INTEGER, INTENT(IN) :: field_idx !Field index (0-based) of 
+!            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+!            INTEGER, INTENT(IN) :: field_idx !Field index (0-based) of
 !                                             !field_dims, perm)
 !            INTEGER, INTENT(OUT) :: dims     !number of dimensions of the field
 !
-!            INTEGER(SIZE_T),DIMENSION(*), INTENT(OUT) ::  field_dims !buffer to store the 
+!            INTEGER(SIZE_T),DIMENSION(*), INTENT(OUT) ::  field_dims !buffer to store the
 !                                                                      !dimensions of the field
-!            INTEGER, DIMENSION(*), INTENT(OUT)  ::  perm  !buffer to store the 
+!            INTEGER, DIMENSION(*), INTENT(OUT)  ::  perm  !buffer to store the
 !                                                                   !permutation vector of the field
 !            INTEGER, INTENT(OUT) :: hdferr        ! Error code
 !            INTEGER, EXTERNAL :: h5tget_member_dims_c
@@ -2170,32 +2170,32 @@ CONTAINS
 !          END SUBROUTINE h5tget_member_dims_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_array_dims_f 
+! Name:		h5tget_array_dims_f
 !
 ! Purpose: 	Returns sizes of array dimensions.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- array datatype identifier
-! Outputs:  
+! Outputs:
 !		dims		- buffer to store array datatype
 !				  dimensions
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_array_dims_f(type_id, dims, hdferr) 
+          SUBROUTINE h5tget_array_dims_f(type_id, dims, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2204,9 +2204,9 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier
             INTEGER(HSIZE_T),DIMENSION(*), INTENT(OUT) ::  dims !buffer to store array datatype
-                                                                ! dimensions 
+                                                                ! dimensions
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_array_dims_c
@@ -2228,31 +2228,31 @@ CONTAINS
           END SUBROUTINE h5tget_array_dims_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_array_ndims_f 
+! Name:		h5tget_array_ndims_f
 !
-! Purpose: 	Returns the rank of an array datatype. 
+! Purpose: 	Returns the rank of an array datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- array datatype identifier
-! Outputs:  
+! Outputs:
 !		ndims		- number of array dimensions
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_array_ndims_f(type_id, ndims, hdferr) 
+          SUBROUTINE h5tget_array_ndims_f(type_id, ndims, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2261,7 +2261,7 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Array datatype identifier
             INTEGER, INTENT(OUT) ::  ndims ! number of array dimensions
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
@@ -2284,31 +2284,31 @@ CONTAINS
           END SUBROUTINE h5tget_array_ndims_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_super_f 
+! Name:		h5tget_super_f
 !
-! Purpose: 	Returns the base datatype from which a datatype is derived. 
+! Purpose: 	Returns the base datatype from which a datatype is derived.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
-!		base_type_id	- identifier of the base type		
-!		hdferr:		- error code		
+! Outputs:
+!		base_type_id	- identifier of the base type
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_super_f(type_id, base_type_id, hdferr) 
+          SUBROUTINE h5tget_super_f(type_id, base_type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2317,7 +2317,7 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! datatype identifier
             INTEGER(HID_T), INTENT(OUT) :: base_type_id ! identifier of the datatype
                                            ! from which datatype (type_id) was derived
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -2331,7 +2331,7 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_SUPER_C'::h5tget_super_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER(HID_T), INTENT(OUT) :: base_type_id
               END FUNCTION h5tget_super_c
             END INTERFACE
@@ -2341,33 +2341,33 @@ CONTAINS
           END SUBROUTINE h5tget_super_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_member_type_f 
+! Name:		h5tget_member_type_f
 !
-! Purpose: 	Returns the datatype of the specified member. 
+! Purpose: 	Returns the datatype of the specified member.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- compound datatype identifier
 !		field_idx	- field index (0-based)
 !
-! Outputs:  
+! Outputs:
 !		datatype	- idnetifier of the member's datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_member_type_f(type_id,  field_idx, datatype, hdferr) 
+          SUBROUTINE h5tget_member_type_f(type_id,  field_idx, datatype, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2375,10 +2375,10 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(IN) :: field_idx !Field index (0-based) of the field type to retrieve
-            INTEGER(HID_T), INTENT(OUT) :: datatype !identifier of a copy of 
-                                                    !the datatype of the field 
+            INTEGER(HID_T), INTENT(OUT) :: datatype !identifier of a copy of
+                                                    !the datatype of the field
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_member_type_c
@@ -2400,36 +2400,36 @@ CONTAINS
           END SUBROUTINE h5tget_member_type_f
 
 !----------------------------------------------------------------------
-! Name:		h5tcreate_f 
+! Name:		h5tcreate_f
 !
 ! Purpose: 	Creates a new dataype
 !
-! Inputs:  
+! Inputs:
 !		class		- datatype class, possible values are:
 !					 H5T_COMPOUND_F
-!					 H5T_ENUM_F   
+!					 H5T_ENUM_F
 !					 H5T_OPAQUE_F
 !		size		- datattype size
-! Outputs:  
+! Outputs:
 !		type_id		- datatype identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
 
-          SUBROUTINE h5tcreate_f(class, size, type_id, hdferr) 
+          SUBROUTINE h5tcreate_f(class, size, type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2439,7 +2439,7 @@ CONTAINS
             IMPLICIT NONE
             INTEGER, INTENT(IN) :: class ! Datatype class can be one of
                                          ! H5T_COMPOUND_F
-                                         ! H5T_ENUM_F   
+                                         ! H5T_ENUM_F
                                          ! H5T_OPAQUE_F
             INTEGER(SIZE_T), INTENT(IN) :: size ! Size of the datatype
             INTEGER(HID_T), INTENT(OUT) :: type_id ! Datatype identifier
@@ -2454,9 +2454,9 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TCREATE_C'::h5tcreate_c
               !DEC$ ENDIF
-              INTEGER, INTENT(IN) :: class 
-              INTEGER(SIZE_T), INTENT(IN) :: size 
-              INTEGER(HID_T), INTENT(OUT) :: type_id 
+              INTEGER, INTENT(IN) :: class
+              INTEGER(SIZE_T), INTENT(IN) :: size
+              INTEGER(HID_T), INTENT(OUT) :: type_id
               END FUNCTION h5tcreate_c
             END INTERFACE
 
@@ -2464,34 +2464,34 @@ CONTAINS
           END SUBROUTINE h5tcreate_f
 
 !----------------------------------------------------------------------
-! Name:		h5tinsert_f 
+! Name:		h5tinsert_f
 !
-! Purpose: 	Adds a new member to a compound datatype. 
+! Purpose: 	Adds a new member to a compound datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- compound dattype identifier
 !		name		- name of the field to insert
-!		offset		- start of the member in an instance of 
+!		offset		- start of the member in an instance of
 !				  the compound datatype
 !		field_id	- datatype identifier of the field to insert
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tinsert_f(type_id,  name, offset, field_id, hdferr) 
+          SUBROUTINE h5tinsert_f(type_id,  name, offset, field_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2499,7 +2499,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             CHARACTER(LEN=*), INTENT(IN) :: name !Name of the field to insert
             INTEGER(SIZE_T), INTENT(IN) :: offset !start of the member in an instance of
                                                    !the compound datatype
@@ -2521,7 +2521,7 @@ CONTAINS
               INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER(SIZE_T), INTENT(IN) :: offset
-              INTEGER(HID_T), INTENT(IN) :: field_id 
+              INTEGER(HID_T), INTENT(IN) :: field_id
               INTEGER :: namelen
               END FUNCTION h5tinsert_c
             END INTERFACE
@@ -2531,30 +2531,30 @@ CONTAINS
           END SUBROUTINE h5tinsert_f
 
 !----------------------------------------------------------------------
-! Name:		h5tpack_f 
+! Name:		h5tpack_f
 !
-! Purpose: 	Recursively removes padding from within a compound datatype. 
+! Purpose: 	Recursively removes padding from within a compound datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- compound datatype identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tpack_f(type_id, hdferr) 
+          SUBROUTINE h5tpack_f(type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2578,33 +2578,33 @@ CONTAINS
               END FUNCTION h5tpack_c
             END INTERFACE
 
-            hdferr = h5tpack_c(type_id) 
+            hdferr = h5tpack_c(type_id)
           END SUBROUTINE h5tpack_f
 
 !----------------------------------------------------------------------
-! Name:		h5tinsert_array_f 
+! Name:		h5tinsert_array_f
 !
 ! Purpose: 	This function is not available on hdf5-1.4.*
 !
-! Inputs:  
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-!          SUBROUTINE h5tinsert_array_f(parent_id,name,offset, ndims, dims, member_id, hdferr, perm) 
+!          SUBROUTINE h5tinsert_array_f(parent_id,name,offset, ndims, dims, member_id, hdferr, perm)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2614,16 +2614,16 @@ CONTAINS
 !            IMPLICIT NONE
 !            INTEGER(HID_T), INTENT(IN) :: parent_id ! identifier of the parent compound datatype
 !            CHARACTER(LEN=*), INTENT(IN) :: name !Name of the new member
-!            INTEGER(SIZE_T), INTENT(IN) :: offset !Offset to start of new member 
+!            INTEGER(SIZE_T), INTENT(IN) :: offset !Offset to start of new member
 !                                                   !within compound datatype
-!            INTEGER, INTENT(IN) ::  ndims !Dimensionality of new member. 
+!            INTEGER, INTENT(IN) ::  ndims !Dimensionality of new member.
 !                                          !Valid values are 0 (zero) through 4 (four)
 !            INTEGER(SIZE_T), DIMENSION(*), INTENT(IN) :: dims !Size of new member array
 !            INTEGER(HID_T), INTENT(IN) :: member_id ! identifier of the datatype of the new member
 !            INTEGER, INTENT(OUT) :: hdferr        ! Error code
 !
-!            INTEGER, DIMENSION(*), OPTIONAL, INTENT(IN) :: perm 
-!                                                               !Pointer to buffer to store 
+!            INTEGER, DIMENSION(*), OPTIONAL, INTENT(IN) :: perm
+!                                                               !Pointer to buffer to store
 !                                                               !the permutation vector of the field
 !            INTEGER :: namelen, sizeofperm
 !            INTEGER, EXTERNAL :: h5tinsert_array_c,  h5tinsert_array_c2
@@ -2631,40 +2631,40 @@ CONTAINS
 !            if (present(perm)) then
 !              hdferr = h5tinsert_array_c(parent_id, name, namelen, offset, ndims,dims, member_id, perm)
 !            else
-!              hdferr = h5tinsert_array_c2(parent_id, name, namelen, offset, ndims,dims, member_id)  
-!            end if           
-!           
+!              hdferr = h5tinsert_array_c2(parent_id, name, namelen, offset, ndims,dims, member_id)
+!            end if
+!
 !         END SUBROUTINE h5tinsert_array_f
 
 !----------------------------------------------------------------------
-! Name:		h5tarray_create_f 
+! Name:		h5tarray_create_f
 !
-! Purpose: 	Creates an array datatype object. 
+! Purpose: 	Creates an array datatype object.
 !
-! Inputs:  
-!		base_id		- datatype identifier for the array 
+! Inputs:
+!		base_id		- datatype identifier for the array
 !				  base datatype
 !		rank		- rank of the array
 !		dims		- array dimension sizes
-! Outputs:  
+! Outputs:
 !		type_id		- array datatype identifier
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-         
-          SUBROUTINE h5tarray_create_f(base_id, rank, dims, type_id, hdferr) 
+
+          SUBROUTINE h5tarray_create_f(base_id, rank, dims, type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2675,7 +2675,7 @@ CONTAINS
             INTEGER(HID_T), INTENT(IN) :: base_id ! identifier of array base datatype
             INTEGER, INTENT(IN) ::  rank ! Rank of the array
             INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims !Sizes of each array dimension
-            INTEGER(HID_T), INTENT(OUT) :: type_id ! identifier of the array datatype 
+            INTEGER(HID_T), INTENT(OUT) :: type_id ! identifier of the array datatype
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 
@@ -2696,36 +2696,36 @@ CONTAINS
             END INTERFACE
 
             hdferr = h5tarray_create_c(base_id, rank, dims, type_id)
-           
+
          END SUBROUTINE h5tarray_create_f
 
 !----------------------------------------------------------------------
-! Name:		h5tenum_create_f 
+! Name:		h5tenum_create_f
 !
-! Purpose: 	Creates a new enumeration datatype. 
+! Purpose: 	Creates a new enumeration datatype.
 !
-! Inputs:  
-!		parent_id	- datatype identifier for base datatype		
-! Outputs:  
+! Inputs:
+!		parent_id	- datatype identifier for base datatype
+! Outputs:
 !		new_type_id	- datatype identifier for the enumeration
 !				  datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tenum_create_f(parent_id, new_type_id, hdferr) 
+          SUBROUTINE h5tenum_create_f(parent_id, new_type_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2735,9 +2735,9 @@ CONTAINS
             IMPLICIT NONE
             INTEGER(HID_T), INTENT(IN) :: parent_id  ! Datatype identifier for
                                                      ! the  base datatype
-            INTEGER(HID_T), INTENT(OUT) :: new_type_id 
+            INTEGER(HID_T), INTENT(OUT) :: new_type_id
                                                      !datatype identifier for the
-                                                     ! new enumeration datatype    
+                                                     ! new enumeration datatype
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tenum_create_c
@@ -2749,8 +2749,8 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_CREATE_C'::h5tenum_create_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: parent_id 
-              INTEGER(HID_T), INTENT(OUT) :: new_type_id 
+              INTEGER(HID_T), INTENT(IN) :: parent_id
+              INTEGER(HID_T), INTENT(OUT) :: new_type_id
               END FUNCTION h5tenum_create_c
             END INTERFACE
 
@@ -2758,30 +2758,30 @@ CONTAINS
           END SUBROUTINE h5tenum_create_f
 
 !----------------------------------------------------------------------
-! Name:		h5tenaum_insert_f 
+! Name:		h5tenaum_insert_f
 !
-! Purpose: 	Inserts a new enumeration datatype member. 
+! Purpose: 	Inserts a new enumeration datatype member.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-! Outputs:  
-!		hdferr:		- error code		
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-            
-          SUBROUTINE h5tenum_insert_f(type_id,  name, value, hdferr) 
+
+          SUBROUTINE h5tenum_insert_f(type_id,  name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2789,7 +2789,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  !Name of  the new member
             INTEGER, INTENT(IN) :: value !value of the new member
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -2805,8 +2805,8 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_INSERT_C'::h5tenum_insert_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id 
-              CHARACTER(LEN=*), INTENT(IN) :: name 
+              INTEGER(HID_T), INTENT(IN) :: type_id
+              CHARACTER(LEN=*), INTENT(IN) :: name
               INTEGER, INTENT(IN) :: value
               INTEGER :: namelen
               END FUNCTION h5tenum_insert_c
@@ -2817,34 +2817,34 @@ CONTAINS
           END SUBROUTINE h5tenum_insert_f
 
 !----------------------------------------------------------------------
-! Name:		h5tenum_nameof_f 
+! Name:		h5tenum_nameof_f
 !
-! Purpose: 	Returns the symbol name corresponding to a specified 
-!    		member of an enumeration datatype. 
+! Purpose: 	Returns the symbol name corresponding to a specified
+!    		member of an enumeration datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
-!		value		- value of the enumeration datatype 
+!		value		- value of the enumeration datatype
 !		namelen		- name buffer size
-! Outputs:  
+! Outputs:
 !		name		- buffer to hold symbol name
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tenum_nameof_f(type_id,  value, namelen, name, hdferr) 
+          SUBROUTINE h5tenum_nameof_f(type_id,  value, namelen, name, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2852,7 +2852,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             CHARACTER(LEN=*), INTENT(OUT) :: name  !Name of the  enumeration datatype.
             INTEGER(SIZE_T), INTENT(IN) :: namelen !length of the name
             INTEGER, INTENT(IN) :: value !value of the  enumeration datatype.
@@ -2868,9 +2868,9 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_NAMEOF_C'::h5tenum_nameof_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER(LEN=*), INTENT(OUT) :: name
-              INTEGER(SIZE_T), INTENT(IN) :: namelen 
+              INTEGER(SIZE_T), INTENT(IN) :: namelen
               INTEGER, INTENT(IN) :: value
               END FUNCTION h5tenum_nameof_c
             END INTERFACE
@@ -2879,33 +2879,33 @@ CONTAINS
           END SUBROUTINE h5tenum_nameof_f
 
 !----------------------------------------------------------------------
-! Name:		h5tenum_valuof_f 
+! Name:		h5tenum_valuof_f
 !
-! Purpose: 	Returns the value corresponding to a specified 
-!		member of an enumeration datatype. 
+! Purpose: 	Returns the value corresponding to a specified
+!		member of an enumeration datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		name		- symbol name
-! Outputs:  
+! Outputs:
 !		value		- value of the enumeration datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-            
-          SUBROUTINE h5tenum_valueof_f(type_id,  name, value, hdferr) 
+
+          SUBROUTINE h5tenum_valueof_f(type_id,  name, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2913,7 +2913,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             CHARACTER(LEN=*), INTENT(IN) :: name  !Name of the  enumeration datatype.
             INTEGER, INTENT(OUT) :: value !value of the  enumeration datatype.
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -2929,9 +2929,9 @@ CONTAINS
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TENUM_VALUEOF_C'::h5tenum_valueof_c
               !DEC$ ENDIF
               !DEC$ATTRIBUTES reference :: name
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER(LEN=*), INTENT(IN) :: name
-              INTEGER, INTENT(IN) :: namelen 
+              INTEGER, INTENT(IN) :: namelen
               INTEGER, INTENT(OUT) :: value
               END FUNCTION h5tenum_valueof_c
             END INTERFACE
@@ -2941,32 +2941,32 @@ CONTAINS
           END SUBROUTINE h5tenum_valueof_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_member_value_f 
+! Name:		h5tget_member_value_f
 !
-! Purpose: 	Returns the value of an enumeration datatype member. 
+! Purpose: 	Returns the value of an enumeration datatype member.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- datatype identifier
 !		member_no	- number of the enumeration datatype member
-! Outputs:  
+! Outputs:
 !		value		- value of the enumeration datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_member_value_f(type_id,  member_no, value, hdferr) 
+          SUBROUTINE h5tget_member_value_f(type_id,  member_no, value, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2974,7 +2974,7 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
             INTEGER, INTENT(IN) :: member_no !Number of the enumeration datatype member
             INTEGER, INTENT(OUT) :: value !value of the  enumeration datatype.
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
@@ -2988,42 +2988,42 @@ CONTAINS
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_VALUE_C'::h5tget_member_value_c
               !DEC$ ENDIF
-              INTEGER(HID_T), INTENT(IN) :: type_id 
+              INTEGER(HID_T), INTENT(IN) :: type_id
               INTEGER, INTENT(IN) :: member_no
               INTEGER, INTENT(OUT) :: value
-              END FUNCTION 
+              END FUNCTION
             END INTERFACE
 
             hdferr = h5tget_member_value_c(type_id, member_no, value)
           END SUBROUTINE h5tget_member_value_f
 
 !----------------------------------------------------------------------
-! Name:		h5tset_tag_f 
+! Name:		h5tset_tag_f
 !
-! Purpose: 	Tags an opaque datatype. 
+! Purpose: 	Tags an opaque datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- identifier for opaque datatype
-!		tag		- unique ASCII string with which the opaque 
-!				  datatype is to be tagged. 
-! Outputs:  
-!		hdferr:		- error code		
+!		tag		- unique ASCII string with which the opaque
+!				  datatype is to be tagged.
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tset_tag_f(type_id, tag, hdferr) 
+          SUBROUTINE h5tset_tag_f(type_id, tag, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3031,9 +3031,9 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            CHARACTER(LEN=*), INTENT(IN) :: tag !Unique ASCII string with which 
-                                                !the opaque datatype is to be tagged 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            CHARACTER(LEN=*), INTENT(IN) :: tag !Unique ASCII string with which
+                                                !the opaque datatype is to be tagged
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
             INTEGER :: taglen
 
@@ -3058,32 +3058,32 @@ CONTAINS
           END SUBROUTINE h5tset_tag_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_tag_f 
+! Name:		h5tget_tag_f
 !
-! Purpose: 	Gets the tag associated with an opaque datatype. 
+! Purpose: 	Gets the tag associated with an opaque datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- identifier for opaque datatype
-! Outputs:  
+! Outputs:
 !		tag		- unique ASCII string associated with opaque
 !				  datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  March 7, 2001 
+!			port).  March 7, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_tag_f(type_id, tag,taglen, hdferr) 
+          SUBROUTINE h5tget_tag_f(type_id, tag,taglen, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3091,10 +3091,10 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier 
-            CHARACTER(LEN=*), INTENT(OUT) :: tag !Unique ASCII string with which 
+            INTEGER(HID_T), INTENT(IN) :: type_id ! Datatype identifier
+            CHARACTER(LEN=*), INTENT(OUT) :: tag !Unique ASCII string with which
                                                 !the opaque datatype is to be tagged
-            INTEGER, INTENT(OUT) :: taglen !length of tag 
+            INTEGER, INTENT(OUT) :: taglen !length of tag
             INTEGER, INTENT(OUT) :: hdferr        ! Error code
 
 !            INTEGER, EXTERNAL :: h5tget_tag_c
@@ -3109,7 +3109,7 @@ CONTAINS
               !DEC$ATTRIBUTES reference :: tag
               INTEGER(HID_T), INTENT(IN) :: type_id
               CHARACTER(LEN=*), INTENT(OUT) :: tag
-              INTEGER, INTENT(OUT) :: taglen 
+              INTEGER, INTENT(OUT) :: taglen
               END FUNCTION h5tget_tag_c
             END INTERFACE
 
@@ -3117,29 +3117,29 @@ CONTAINS
           END SUBROUTINE h5tget_tag_f
 
 !----------------------------------------------------------------------
-! Name:		h5tvlen_create_f 
+! Name:		h5tvlen_create_f
 !
-! Purpose: 	Creates a new variable-lenght datatype. 
+! Purpose: 	Creates a new variable-lenght datatype.
 !
-! Inputs:  
+! Inputs:
 !		type_id		- identifier iof base datatype
-! Outputs:  
+! Outputs:
 !		vltype_id	- identifier for VL datatype
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		Wednesday, October 23, 2002
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment: Only basic Fortran base datatypes are supported		
+! Comment: Only basic Fortran base datatypes are supported
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tvlen_create_f(type_id, vltype_id, hdferr) 
+          SUBROUTINE h5tvlen_create_f(type_id, vltype_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3147,8 +3147,8 @@ CONTAINS
 !DEC$endif
 !
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN)  :: type_id    ! Datatype identifier 
-            INTEGER(HID_T), INTENT(OUT) :: vltype_id  ! VL datatype identifier 
+            INTEGER(HID_T), INTENT(IN)  :: type_id    ! Datatype identifier
+            INTEGER(HID_T), INTENT(OUT) :: vltype_id  ! VL datatype identifier
             INTEGER, INTENT(OUT) :: hdferr            ! Error code
 
             INTERFACE
@@ -3166,30 +3166,30 @@ CONTAINS
           END SUBROUTINE h5tvlen_create_f
 
 !----------------------------------------------------------------------
-! Name:		h5tis_variable_str_f 
+! Name:		h5tis_variable_str_f
 !
 ! Purpose: 	Determines whether a dattype is a variable string.
 !
-! Inputs:  
+! Inputs:
 !		type_id	-  	- datartpe identifier
-! Outputs:  
+! Outputs:
 !		status		- flag to indicate if datatype
 !				  is a variable string
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tis_variable_str_f(type_id, status, hdferr) 
+          SUBROUTINE h5tis_variable_str_f(type_id, status, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3198,18 +3198,18 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
             LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if datatype
                                                 ! is a variable string or not ( TRUE or
-                                                ! FALSE)  
+                                                ! FALSE)
             INTEGER, INTENT(OUT) :: hdferr      ! Error code
-            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C" 
+            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
 
 !            INTEGER, EXTERNAL :: h5tis_variable_str_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5tis_variable_str_c(type_id, flag) 
+              INTEGER FUNCTION h5tis_variable_str_c(type_id, flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TIS_VARIABLE_STR_C'::h5tis_variable_str_c
@@ -3222,18 +3222,18 @@ CONTAINS
             hdferr = h5tis_variable_str_c(type_id, flag)
             status = .TRUE.
             if (flag .EQ. 0) status = .FALSE.
- 
+
           END SUBROUTINE h5tis_variable_str_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_member_class_f 
+! Name:		h5tget_member_class_f
 !
 ! Purpose:      Returns datatype class of compound datatype member.
 !
-! Inputs:  
+! Inputs:
 !		type_id	-  	- datartpe identifier
 !               member_no       - index of compound datatype member
-! Outputs:  
+! Outputs:
 !               class           - class type for compound dadtype member
 !                                 Can be one of the follwoing classes:
 !                                 H5T_NO_CLASS_F (error)
@@ -3248,21 +3248,21 @@ CONTAINS
 !                                 H5T_ENUM_F
 !                                 H5T_VLEN_F
 !                                 H5T_ARRAY_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		April 6, 2005
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-          SUBROUTINE h5tget_member_class_f(type_id, member_no, class, hdferr) 
+          SUBROUTINE h5tget_member_class_f(type_id, member_no, class, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3271,7 +3271,7 @@ CONTAINS
 !
 
             IMPLICIT NONE
-            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier 
+            INTEGER(HID_T), INTENT(IN) :: type_id  ! Datatype identifier
             INTEGER, INTENT(IN)       :: member_no  ! Member number
             INTEGER, INTENT(OUT)     :: class      ! Member class
             INTEGER, INTENT(OUT) :: hdferr      ! Error code
@@ -3279,37 +3279,37 @@ CONTAINS
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class) 
+              INTEGER FUNCTION h5tget_member_class_c(type_id, member_no, class)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_MEMBER_CLASS_C'::h5tget_member_class_c
               !DEC$ ENDIF
               INTEGER(HID_T), INTENT(IN) :: type_id
-              INTEGER, INTENT(IN)       :: member_no 
-              INTEGER, INTENT(OUT)     :: class    
+              INTEGER, INTENT(IN)       :: member_no
+              INTEGER, INTENT(OUT)     :: class
               END FUNCTION h5tget_member_class_c
             END INTERFACE
 
             hdferr = h5tget_member_class_c(type_id, member_no, class)
- 
+
           END SUBROUTINE h5tget_member_class_f
 
 !----------------------------------------------------------------------
-! Name:		h5tcommit_anon_f 
+! Name:		h5tcommit_anon_f
 !
-! Purpose: 	Commits a transient datatype to a file, 
-!               creating a new named datatype, 
-!               but does not link it into the file structure.	
+! Purpose: 	Commits a transient datatype to a file,
+!               creating a new named datatype,
+!               but does not link it into the file structure.
 !
 ! Inputs:
-!        loc_id - A file or group identifier specifying the file 
+!        loc_id - A file or group identifier specifying the file
 !                 in which the new named datatype is to be created.
 !      dtype_id - A datatype identifier.
 !
 ! Outputs:
-!	hdferr: - error code		
+!	hdferr: - error code
 !			Success:  0
-!          		Failure: -1   
+!          		Failure: -1
 ! Optional parameters:
 !       tcpl_id - A datatype creation property list identifier.
 !                 (H5P_DEFAULT_F for the default property list.)
@@ -3321,10 +3321,10 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id) 
+  SUBROUTINE h5tcommit_anon_f(loc_id, dtype_id, hdferr, tcpl_id, tapl_id)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3332,12 +3332,12 @@ CONTAINS
 !DEC$endif
 !
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id  ! A file or group identifier specifying 
-                                          ! the file in which the new named datatype 
+    INTEGER(HID_T), INTENT(IN) :: loc_id  ! A file or group identifier specifying
+                                          ! the file in which the new named datatype
                                           ! is to be created.
-    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier 
+    INTEGER(HID_T), INTENT(IN) :: dtype_id  ! Datatype identifier
     INTEGER, INTENT(OUT) :: hdferr          ! Error code
-    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! A datatype creation property 
+    INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tcpl_id ! A datatype creation property
                                                     ! list identifier.
                                                     ! (H5P_DEFAULT_F for the default property list.)
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: tapl_id ! A datatype access property list identifier.
@@ -3366,14 +3366,14 @@ CONTAINS
 
     IF(PRESENT(tcpl_id)) tcpl_id_default = tcpl_id
     IF(PRESENT(tapl_id)) tapl_id_default = tapl_id
-    
-    hdferr = h5tcommit_anon_c(loc_id, dtype_id, & 
+
+    hdferr = h5tcommit_anon_c(loc_id, dtype_id, &
          tcpl_id_default, tapl_id_default )
 
   END SUBROUTINE h5tcommit_anon_f
 
 !----------------------------------------------------------------------
-! Name:      h5tcommitted_f 
+! Name:      h5tcommitted_f
 !
 ! Purpose:   Determines whether a datatype is a named type or a transient type.
 !
@@ -3383,9 +3383,9 @@ CONTAINS
 ! Outputs:
 !     committed - .TRUE., if the datatype has been committed
 !                .FALSE., if the datatype has not been committed.
-!	hdferr: - error code		
+!	hdferr: - error code
 !			Success:  0
-!          		Failure: -1   
+!          		Failure: -1
 ! Optional parameters: None
 !
 ! Programmer:	M.S. Breitenfeld
@@ -3393,10 +3393,10 @@ CONTAINS
 !
 ! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr) 
+  SUBROUTINE h5tcommitted_f(dtype_id, committed, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3407,9 +3407,9 @@ CONTAINS
     INTEGER(HID_T), INTENT(IN) :: dtype_id  ! A datatype identifier
     LOGICAL, INTENT(OUT) :: committed ! .TRUE., if the datatype has been committed
                                       !.FALSE., if the datatype has not been committed.
-    INTEGER, INTENT(OUT) :: hdferr     ! Error code:		
+    INTEGER, INTENT(OUT) :: hdferr     ! Error code:
 !			                   Success:  0
-!          		                   Failure: -1  
+!          		                   Failure: -1
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
@@ -3434,7 +3434,7 @@ CONTAINS
     ELSE
        hdferr = -1
     ENDIF
-       
+
 
   END SUBROUTINE h5tcommitted_f
 
@@ -3442,11 +3442,11 @@ CONTAINS
 ! Name:		H5Tdecode_f
 !
 ! Purpose:	Decode a binary object description of data type and return a new object handle.
-! Inputs:  
+! Inputs:
 !		buf -  Buffer for the data space object to be decoded.
 !            obj_id - Object ID
 ! Outputs:
-!           hdferr: - error code		
+!           hdferr: - error code
 !			Success:  0
 !			Failure: -1
 !
@@ -3455,12 +3455,12 @@ CONTAINS
 ! Programmer:	M.S. Breitenfeld
 !		April 9, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tdecode_f(buf, obj_id, hdferr) 
+  SUBROUTINE h5tdecode_f(buf, obj_id, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3484,7 +3484,7 @@ CONTAINS
     END INTERFACE
 
     hdferr = h5tdecode_c(buf, obj_id)
-    
+
   END SUBROUTINE h5tdecode_f
 
 !----------------------------------------------------------------------
@@ -3498,7 +3498,7 @@ CONTAINS
 !            nalloc - The size of the allocated buffer.
 ! Outputs:
 !            nalloc - The size of the buffer needed.
-!           hdferr: - error code		
+!           hdferr: - error code
 !	                Success:  0
 !		        Failure: -1
 !
@@ -3507,12 +3507,12 @@ CONTAINS
 ! Programmer:	M.S. Breitenfeld
 !		April 9, 2008
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr) 
+  SUBROUTINE h5tencode_f(obj_id, buf, nalloc, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3537,34 +3537,34 @@ CONTAINS
          INTEGER(SIZE_T), INTENT(INOUT) :: nalloc
        END FUNCTION h5tencode_c
     END INTERFACE
-    
+
     hdferr = h5tencode_c(buf, obj_id, nalloc)
 
   END SUBROUTINE h5tencode_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_create_plist_f 
+! Name:		h5tget_create_plist_f
 !
 ! Purpose:  	Returns a copy of a datatype creation property list.
-!		
-! Inputs:  
+!
+! Inputs:
 !		dtype_id   - Datatype identifier
-! Outputs:  
+! Outputs:
 !               dtpl_id    - Datatype property list identifier
-!		hdferr:    - Error code		
+!		hdferr:    - Error code
 !				 Success:  0
-!				 Failure: -1   
+!				 Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M.S. Breitenfeld
-!		April 9, 2008	
+!		April 9, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr) 
+  SUBROUTINE h5tget_create_plist_f(dtype_id, dtpl_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5tget_create_plist_f
@@ -3587,34 +3587,34 @@ CONTAINS
          INTEGER(HID_T), INTENT(OUT) :: dtpl_id
        END FUNCTION h5tget_create_plist_c
     END INTERFACE
-    
+
     hdferr = h5tget_create_plist_c(dtype_id, dtpl_id)
   END SUBROUTINE h5tget_create_plist_f
 
 !----------------------------------------------------------------------
-! Name:		h5tcompiler_conv_f 
+! Name:		h5tcompiler_conv_f
 !
 ! Purpose:  	Check whether the library’s default conversion is hard conversion.R
-!		
-! Inputs:  
+!
+! Inputs:
 !           src_id - Identifier for the source datatype.
 !           dst_id - Identifier for the destination datatype.
-! Outputs:  
+! Outputs:
 !           flag - TRUE for compiler conversion, FALSE for library conversion
-!          hdferr: - Error code		
+!          hdferr: - Error code
 !			Success:  0
-!			Failure: -1   
+!			Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M.S. Breitenfeld
-!		April 9, 2008	
+!		April 9, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tcompiler_conv_f( src_id, dst_id, flag, hdferr) 
+  SUBROUTINE h5tcompiler_conv_f( src_id, dst_id, flag, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5tcompiler_conv_f
@@ -3638,7 +3638,7 @@ CONTAINS
          INTEGER :: c_flag
        END FUNCTION h5tcompiler_conv_c
     END INTERFACE
-    
+
     hdferr = h5tcompiler_conv_c(src_id, dst_id, c_flag)
 
     flag = .FALSE.
@@ -3647,35 +3647,35 @@ CONTAINS
   END SUBROUTINE h5tcompiler_conv_f
 
 !----------------------------------------------------------------------
-! Name:		h5tget_native_type_f 
+! Name:		h5tget_native_type_f
 !
 ! Purpose:  	Returns the native datatype of a specified datatype.
-!		
-! Inputs:  
+!
+! Inputs:
 !		dtype_id   - Datatype identifier for the dataset datatype.
 !                        *
-!               direction  - Direction of search: 
+!               direction  - Direction of search:
 !                    H5T_DIR_DEFAULT     = 0,    /*default direction is inscendent */
 !                    H5T_DIR_ASCEND      = 1,    /*in inscendent order             */
 !                    H5T_DIR_DESCEND     = 2     /*in descendent order             */
 !               * NOTE: In C it is defined as a structure: H5T_direction_t
 !
-! Outputs:  
+! Outputs:
 !               native_dtype_id  - The native datatype identifier for the specified dataset datatype
-!		hdferr:          - Error code		
+!		hdferr:          - Error code
 !				     Success:  0
-!				     Failure: -1   
+!				     Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	M.S. Breitenfeld
-!		June 18, 2008	
+!		June 18, 2008
 !
 ! Modifications:  N/A
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr) 
+  SUBROUTINE h5tget_native_type_f(dtype_id, direction, native_dtype_id, hdferr)
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5tget_native_type_f
@@ -3694,12 +3694,12 @@ CONTAINS
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TGET_NATIVE_TYPE_C'::h5tget_native_type_c
          !DEC$ ENDIF
-         INTEGER(HID_T), INTENT(IN) :: dtype_id 
+         INTEGER(HID_T), INTENT(IN) :: dtype_id
          INTEGER, INTENT(IN) :: direction
          INTEGER(HID_T), INTENT(OUT) :: native_dtype_id
        END FUNCTION h5tget_native_type_c
     END INTERFACE
-    
+
     hdferr = h5tget_native_type_c(dtype_id, direction, native_dtype_id)
   END SUBROUTINE h5tget_native_type_f
 
diff --git a/fortran/src/H5Zff.f90 b/fortran/src/H5Zff.f90
index d821670..1a74f00 100644
--- a/fortran/src/H5Zff.f90
+++ b/fortran/src/H5Zff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5I functions
@@ -19,7 +19,7 @@
       MODULE H5Z
 
         USE H5GLOBAL
-      
+
       CONTAINS
 
 !----------------------------------------------------------------------
@@ -28,24 +28,24 @@
 ! Purpose:	Unregisters specified filetr
 !
 ! Inputs: 	filter	        - filter; may have one of the following values:
-!                                 H5Z_FILTER_DEFLATE_F 
-!                                 H5Z_FILTER_SHUFFLE_F 
-!                                 H5Z_FILTER_FLETCHER32_F 
-! Outputs:  
-!		hdferr:		- error code		
+!                                 H5Z_FILTER_DEFLATE_F
+!                                 H5Z_FILTER_SHUFFLE_F
+!                                 H5Z_FILTER_FLETCHER32_F
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
 !				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
 !
-! Modifications: 	
+! Modifications:
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
-          SUBROUTINE h5zunregister_f(filter, hdferr) 
+          SUBROUTINE h5zunregister_f(filter, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -73,26 +73,26 @@
 !----------------------------------------------------------------------
 ! Name:		h5zfilter_avail_f
 !
-! Purpose:      Queries if filter is available	
+! Purpose:      Queries if filter is available
 !
-! Inputs:  
+! Inputs:
 !		filter		- filter
-! Outputs:  
-!		status		- status; .TRUE. if filter is available, 
+! Outputs:
+!		status		- status; .TRUE. if filter is available,
 !                                 .FALSE. otherwise
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
 !		March 12, 2003
 !
-! Modifications: 	
+! Modifications:
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5zfilter_avail_f(filter, status, hdferr) 
+          SUBROUTINE h5zfilter_avail_f(filter, status, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -102,20 +102,20 @@
 
             IMPLICIT NONE
             INTEGER, INTENT(IN)  :: filter      ! Filter; may be one of the following:
-                                                ! H5Z_FILTER_DEFLATE_F                  
-                                                ! H5Z_FILTER_SHUFFLE_F                  
-                                                ! H5Z_FILTER_FLETCHER32_F                  
+                                                ! H5Z_FILTER_DEFLATE_F
+                                                ! H5Z_FILTER_SHUFFLE_F
+                                                ! H5Z_FILTER_FLETCHER32_F
             LOGICAL, INTENT(OUT) :: status      ! Flag, idicates if filter
                                                 ! is availble  not ( TRUE or
-                                                ! FALSE)  
+                                                ! FALSE)
             INTEGER, INTENT(OUT) :: hdferr      ! Error code
-            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C" 
+            INTEGER :: flag                     ! "TRUE/FALSE/ERROR from C"
 
 !            INTEGER, EXTERNAL :: h5zfilter_avail_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5zfilter_avail_c(filter, flag) 
+              INTEGER FUNCTION h5zfilter_avail_c(filter, flag)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ZFILTER_AVAIL_C'::h5zfilter_avail_c
@@ -128,35 +128,35 @@
             hdferr = h5zfilter_avail_c(filter, flag)
             status = .TRUE.
             if (flag .EQ. 0) status = .FALSE.
- 
+
           END SUBROUTINE h5zfilter_avail_f
 
 !----------------------------------------------------------------------
 ! Name:		h5zget_filter_info_f
 !
-! Purpose:      Queries if filter has its encoder and/or decoder 
-!               available	
+! Purpose:      Queries if filter has its encoder and/or decoder
+!               available
 !
-! Inputs:  
+! Inputs:
 !		filter		- filter
-! Outputs:  
+! Outputs:
 !		config_flags	- Bit vector possibly containing the
 !                         following values:
 !                            H5Z_FILTER_ENCODE_ENABLED_F
 !                            H5Z_FILTER_DECODE_ENABLED_F
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Nat Furrer and James Laird
 !		June 16, 2004
 !
-! Modifications: 	
+! Modifications:
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5zget_filter_info_f(filter, config_flags, hdferr) 
+          SUBROUTINE h5zget_filter_info_f(filter, config_flags, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -166,20 +166,20 @@
 
             IMPLICIT NONE
             INTEGER, INTENT(IN)  :: filter      ! Filter; may be one of the following:
-                                                ! H5Z_FILTER_DEFLATE_F                  
-                                                ! H5Z_FILTER_SHUFFLE_F                  
+                                                ! H5Z_FILTER_DEFLATE_F
+                                                ! H5Z_FILTER_SHUFFLE_F
                                                 ! H5Z_FILTER_FLETCHER32_F
-                                                ! H5Z_FILTER_SZIP_F                  
+                                                ! H5Z_FILTER_SZIP_F
             INTEGER, INTENT(OUT) :: config_flags! Flag, indicates if filter
                                                 ! has its encoder and/or decoder
-                                                ! available  
-            INTEGER, INTENT(OUT) :: hdferr      ! Error code 
+                                                ! available
+            INTEGER, INTENT(OUT) :: hdferr      ! Error code
 
 !            INTEGER, EXTERNAL :: h5zget_filter_info_c
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
             INTERFACE
-              INTEGER FUNCTION h5zget_filter_info_c(filter, config_flags) 
+              INTEGER FUNCTION h5zget_filter_info_c(filter, config_flags)
               USE H5GLOBAL
               !DEC$ IF DEFINED(HDF5F90_WINDOWS)
               !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5ZGET_FILTER_INFO_C'::h5zget_filter_info_c
@@ -190,12 +190,12 @@
             END INTERFACE
 
             hdferr = h5zget_filter_info_c(filter, config_flags)
- 
+
           END SUBROUTINE h5zget_filter_info_f
 
       END MODULE H5Z
-            
 
-                                     
+
+
 
 
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index efc478d..8a81010 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -218,7 +218,7 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *                                  EIP, April 9, 2005
  *                    Added Generic flags introduced in version 1.8
  *                                  MSB, January, 2008
- *                    Added types in lines h5*_flags = ( )variable to match input 
+ *                    Added types in lines h5*_flags = ( )variable to match input
  *---------------------------------------------------------------------------*/
 int_f
 nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
@@ -272,7 +272,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
     h5f_flags[15] = (int_f)H5F_OBJ_ALL;
     h5f_flags[16] = (int_f)H5F_LIBVER_EARLIEST;
     h5f_flags[17] = (int_f)H5F_LIBVER_LATEST;
-                           
+
 /*
  *  H5FD flags
  */
@@ -309,7 +309,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
     h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE;
 /* This value can no longer be returned and all these flags should be updated
  *      to reflect the refinements between links and objects. -QAK */
-/*      h5g_flags[4] = H5G_LINK; */    
+/*      h5g_flags[4] = H5G_LINK; */
     h5g_flags[5] = (int_f)H5L_TYPE_ERROR;
     h5g_flags[6] = (int_f)H5L_TYPE_HARD;
     h5g_flags[7] = (int_f)H5L_TYPE_SOFT;
@@ -339,7 +339,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
     h5l_flags[3] = (int_f)H5L_TYPE_EXTERNAL;
     h5l_flags[4] = (int_f)H5L_SAME_LOC; /* Macro to indicate operation occurs on same location */
     h5l_flags[5] = (int_f)H5L_LINK_CLASS_T_VERS; /* Current version of the H5L_class_t struct */
- 
+
 /*
  *  H5O flags
  */
@@ -374,7 +374,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
       h5o_flags[16] = (int_f)H5O_HDR_ATTR_CRT_ORDER_INDEXED; /* Attribute creation order has index */
       h5o_flags[17] = (int_f)H5O_HDR_ATTR_STORE_PHASE_CHANGE; /* Non-default attribute storage phase change values stored */
       h5o_flags[18] = (int_f)H5O_HDR_STORE_TIMES; /* Store access, modification, change & birth times for object */
-      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS; 
+      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS;
 
 /* Maximum shared message values.  Number of indexes is 8 to allow room to add
  * new types of messages.
@@ -519,8 +519,8 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
       h5_generic_flags[1] = (int_f)H5_INDEX_NAME;      /* Index on names 			*/
       h5_generic_flags[2] = (int_f)H5_INDEX_CRT_ORDER; /* Index on creation order 		*/
       h5_generic_flags[3] = (int_f)H5_INDEX_N;         /* Index on creation order 		*/
-      
-      
+
+
       /* H5_iter_order_t enum struct */
 
       h5_generic_flags[4] = (int_f)H5_ITER_UNKNOWN;       /* Unknown order */
diff --git a/fortran/src/H5_ff.f90 b/fortran/src/H5_ff.f90
index 53bc113..3791aef 100644
--- a/fortran/src/H5_ff.f90
+++ b/fortran/src/H5_ff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,32 +11,32 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 MODULE H5LIB
 
 CONTAINS
 !----------------------------------------------------------------------
-! Name:		h5open_f 
+! Name:		h5open_f
 !
-! Purpose:	Initializes the HDF5 library and Fortran90 interface.   	
+! Purpose:	Initializes the HDF5 library and Fortran90 interface.
 !
-! Inputs:  
-! Outputs:  
-!		error:		- error code		
+! Inputs:
+! Outputs:
+!		error:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
   SUBROUTINE h5open_f(error)
 !
@@ -54,7 +54,7 @@ CONTAINS
 !        INTEGER, EXTERNAL :: h5init_flags_c
 !        INTEGER, EXTERNAL :: h5init1_flags_c
 !        INTEGER, EXTERNAL :: h5open_c
-        
+
 !
 ! MS FORTRAN needs explicit interfaces for C functions called here.
 !
@@ -70,7 +70,7 @@ CONTAINS
          USE H5GLOBAL
          INTEGER(HID_T), DIMENSION(PREDEF_TYPES_LEN) :: p_types
          INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: f_types
-         INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types   
+         INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: i_types
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5INIT_TYPES_C'::h5init_types_c
          !DEC$ ENDIF
@@ -89,7 +89,7 @@ CONTAINS
             i_H5P_flags_int, &
             i_H5R_flags, &
             i_H5S_flags, &
-            i_H5T_flags, &               
+            i_H5T_flags, &
             i_H5Z_flags, &
             i_H5generic_flags)
          USE H5GLOBAL
@@ -144,26 +144,26 @@ CONTAINS
   END SUBROUTINE h5open_f
 
 !----------------------------------------------------------------------
-! Name:		h5close_f 
+! Name:		h5close_f
 !
-! Purpose:	Closes the HDF5 library and Fortran90 interface.   	
+! Purpose:	Closes the HDF5 library and Fortran90 interface.
 !
-! Inputs:  
-! Outputs:  
-!		error:		- error code		
+! Inputs:
+! Outputs:
+!		error:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
-!		August 12, 1999	
+!		August 12, 1999
 !
-! Modifications: 	Explicit Fortran interfaces were added for 
+! Modifications: 	Explicit Fortran interfaces were added for
 !			called C functions (it is needed for Windows
-!			port).  February 28, 2001 
+!			port).  February 28, 2001
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5close_f(error)
@@ -196,7 +196,7 @@ CONTAINS
          INTEGER I_TYPES_LEN
          INTEGER(HID_T), DIMENSION(P_TYPES_LEN) :: p_types
          INTEGER(HID_T), DIMENSION(F_TYPES_LEN) :: f_types
-         INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types   
+         INTEGER(HID_T), DIMENSION(I_TYPES_LEN) :: i_types
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5CLOSE_TYPES_C'::h5close_types_c
          !DEC$ ENDIF
@@ -209,27 +209,27 @@ CONTAINS
     error = error_1 + error_2
 
   END SUBROUTINE h5close_f
-        
+
 !----------------------------------------------------------------------
-! Name:		h5get_libversion_f 
+! Name:		h5get_libversion_f
 !
 ! Purpose:	Returns the HDF5 LIbrary release number
 !
-! Inputs:  
-! Outputs:  
+! Inputs:
+! Outputs:
 !		majnum:		- major version of the library
 !		minum:		- minor version of the library
 !		relnum:		- release version of the library
-!		error:		- error code		
+!		error:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 24, 2002
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5get_libversion_f(majnum, minnum, relnum, error)
@@ -240,7 +240,7 @@ CONTAINS
 !DEC$endif
 !
     USE H5GLOBAL
-    
+
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: majnum, minnum, relnum, error
     INTERFACE
@@ -251,31 +251,31 @@ CONTAINS
          INTEGER, INTENT(OUT) :: majnum, minnum, relnum
        END FUNCTION h5get_libversion_c
     END INTERFACE
-    
+
     error = h5get_libversion_c(majnum, minnum, relnum)
-    
+
   END SUBROUTINE h5get_libversion_f
 
 !----------------------------------------------------------------------
-! Name:		h5check_version_f 
+! Name:		h5check_version_f
 !
 ! Purpose:	Verifies that library versions are consistent.
 !
-! Inputs:  
+! Inputs:
 !		majnum:		- major version of the library
 !		minum:		- minor version of the library
 !		relnum:		- release version of the library
-! Outputs:  
-!		error:		- error code		
+! Outputs:
+!		error:		- error code
 !				 	Success:  0
 !				 	Failure:  application aborts
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 24, 2002
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5check_version_f(majnum, minnum, relnum, error)
@@ -286,7 +286,7 @@ CONTAINS
 !DEC$endif
 !
     USE H5GLOBAL
-    
+
     IMPLICIT NONE
     INTEGER, INTENT(IN) :: majnum, minnum, relnum
     INTEGER, INTENT(OUT) :: error
@@ -298,29 +298,29 @@ CONTAINS
          INTEGER, INTENT(IN) :: majnum, minnum, relnum
        END FUNCTION h5check_version_c
     END INTERFACE
-    
+
     error = h5check_version_c(majnum, minnum, relnum)
-    
+
   END SUBROUTINE h5check_version_f
 
 !----------------------------------------------------------------------
-! Name:		h5garbage_collect_f 
+! Name:		h5garbage_collect_f
 !
 ! Purpose:	Garbage collects on all free-lists of all types.
 !
-! Inputs:  
-! Outputs:  
-!		error:		- error code		
+! Inputs:
+! Outputs:
+!		error:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 24, 2002
 !
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5garbage_collect_f(error)
@@ -331,7 +331,7 @@ CONTAINS
 !DEC$endif
 !
     USE H5GLOBAL
-    
+
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: error
     INTERFACE
@@ -341,29 +341,29 @@ CONTAINS
          !DEC$ ENDIF
        END FUNCTION h5garbage_collect_c
     END INTERFACE
-    
+
     error = h5garbage_collect_c()
 
   END SUBROUTINE h5garbage_collect_f
 
 !----------------------------------------------------------------------
-! Name:		h5dont_atexit_f 
+! Name:		h5dont_atexit_f
 !
-! Purpose:	Instructs library not to install atexit cleanup routine. 
+! Purpose:	Instructs library not to install atexit cleanup routine.
 !
-! Inputs:  
-! Outputs:  
-!		error:		- error code		
+! Inputs:
+! Outputs:
+!		error:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 ! Optional parameters:
-!				NONE			
+!				NONE
 !
 ! Programmer:	Elena Pourmal
 !		September 24, 2002
 !
 !
-! Comment:		
+! Comment:
 !----------------------------------------------------------------------
 
   SUBROUTINE h5dont_atexit_f(error)
@@ -374,7 +374,7 @@ CONTAINS
 !DEC$endif
 !
     USE H5GLOBAL
-    
+
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: error
     INTERFACE
@@ -384,8 +384,8 @@ CONTAINS
          !DEC$ ENDIF
        END FUNCTION h5dont_atexit_c
     END INTERFACE
-    
+
     error = h5dont_atexit_c()
-    
+
   END SUBROUTINE h5dont_atexit_f
 END MODULE H5LIB
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index bf2d715..4263d76 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,33 +11,33 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     MODULE H5GLOBAL
       USE H5FORTRAN_TYPES
-! 
+!
 !
 ! Definitions for reference datatypes.
 ! If you change the value of these parameters, do not forget to change corresponding
-! values in the H5f90.h file. 
-      INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3 
+! values in the H5f90.h file.
+      INTEGER, PARAMETER :: REF_REG_BUF_LEN = 3
 
       TYPE hobj_ref_t_f
          INTEGER(HADDR_T) ref
       END TYPE hobj_ref_t_f
 
       TYPE hdset_reg_ref_t_f
-         INTEGER ref(REF_REG_BUF_LEN) 
+         INTEGER ref(REF_REG_BUF_LEN)
       END TYPE hdset_reg_ref_t_f
 
       INTEGER, PARAMETER :: PREDEF_TYPES_LEN = 6 ! Do not forget to change this
                                                  ! value when new predefined
                                                  ! datatypes are added
-      ! Do not forget to change the following line when new predefined 
+      ! Do not forget to change the following line when new predefined
       ! floating data types are added
       INTEGER, PARAMETER :: FLOATING_TYPES_LEN = 4
 
-      ! Do not forget to change the following line when new predefined 
+      ! Do not forget to change the following line when new predefined
       ! integer data types are added
       INTEGER, PARAMETER :: INTEGER_TYPES_LEN = 17
 
@@ -77,13 +77,13 @@
       EQUIVALENCE (predef_types(4), H5T_NATIVE_CHARACTER)
       EQUIVALENCE (predef_types(5), H5T_STD_REF_OBJ)
       EQUIVALENCE (predef_types(6), H5T_STD_REF_DSETREG)
-      
+
       INTEGER(HID_T), DIMENSION(FLOATING_TYPES_LEN) :: floating_types
       EQUIVALENCE (floating_types(1), H5T_IEEE_F32BE )
       EQUIVALENCE (floating_types(2), H5T_IEEE_F32LE)
       EQUIVALENCE (floating_types(3), H5T_IEEE_F64BE)
       EQUIVALENCE (floating_types(4), H5T_IEEE_F64LE)
-      
+
       INTEGER(HID_T), DIMENSION(INTEGER_TYPES_LEN) :: integer_types
       EQUIVALENCE (integer_types(1), H5T_STD_I8BE )
       EQUIVALENCE (integer_types(2), H5T_STD_I8LE)
@@ -122,7 +122,7 @@
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /FLOATING_TYPES/
 !DEC$endif
-      COMMON /FLOATING_TYPES/ floating_types 
+      COMMON /FLOATING_TYPES/ floating_types
 !
 !      COMMON /INTEGER_TYPES/ H5T_STD_I8BE,  &
 !                             H5T_STD_I8LE,    &
@@ -159,7 +159,7 @@
 !DEC$endif
       COMMON /H5F_FLAGS/ H5F_flags
 
-      INTEGER :: H5F_ACC_RDWR_F 
+      INTEGER :: H5F_ACC_RDWR_F
       INTEGER :: H5F_ACC_RDONLY_F
       INTEGER :: H5F_ACC_TRUNC_F
       INTEGER :: H5F_ACC_EXCL_F
@@ -213,7 +213,7 @@
       INTEGER :: H5_ITER_UNKNOWN_F
       INTEGER :: H5_ITER_INC_F
       INTEGER :: H5_ITER_DEC_F
-      INTEGER :: H5_ITER_NATIVE_F 
+      INTEGER :: H5_ITER_NATIVE_F
       INTEGER :: H5_ITER_N_F
 
       EQUIVALENCE(H5generic_flags(1), H5_INDEX_UNKNOWN_F)
@@ -221,7 +221,7 @@
       EQUIVALENCE(H5generic_flags(3), H5_INDEX_CRT_ORDER_F)
       EQUIVALENCE(H5generic_flags(4), H5_INDEX_N_F)
       EQUIVALENCE(H5generic_flags(5), H5_ITER_UNKNOWN_F)
-      EQUIVALENCE(H5generic_flags(6), H5_ITER_INC_F)     
+      EQUIVALENCE(H5generic_flags(6), H5_ITER_INC_F)
       EQUIVALENCE(H5generic_flags(7), H5_ITER_DEC_F)
       EQUIVALENCE(H5generic_flags(8), H5_ITER_NATIVE_F)
       EQUIVALENCE(H5generic_flags(9), H5_ITER_N_F)
@@ -254,7 +254,7 @@
       EQUIVALENCE(H5G_flags(1), H5G_UNKNOWN_F)
       EQUIVALENCE(H5G_flags(2), H5G_GROUP_F)
       EQUIVALENCE(H5G_flags(3), H5G_DATASET_F)
-      EQUIVALENCE(H5G_flags(4), H5G_TYPE_F) 
+      EQUIVALENCE(H5G_flags(4), H5G_TYPE_F)
 ! XXX: Fix problems with H5G_LINK_F! - QAK ! these are really H5L values -MSB-
       EQUIVALENCE(H5G_flags(5), H5G_LINK_F)
       EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F)
@@ -262,22 +262,22 @@
       EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F)
 ! XXX
 
-      EQUIVALENCE(H5G_flags(9), H5G_STORAGE_TYPE_UNKNOWN_F ) 
-      EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F) 
-      EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F)  
-      EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F) 
+      EQUIVALENCE(H5G_flags(9), H5G_STORAGE_TYPE_UNKNOWN_F )
+      EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F)
+      EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F)
+      EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F)
 !
 ! H5D flags declaration
 !
 
-      INTEGER, PARAMETER :: H5D_FLAGS_LEN = 19 
+      INTEGER, PARAMETER :: H5D_FLAGS_LEN = 19
       INTEGER H5D_flags(H5D_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5D_FLAGS/
 !DEC$endif
       COMMON /H5D_FLAGS/ H5D_flags
 
-      INTEGER :: H5D_COMPACT_F  
+      INTEGER :: H5D_COMPACT_F
       INTEGER :: H5D_CONTIGUOUS_F
       INTEGER :: H5D_CHUNKED_F
 
@@ -334,8 +334,8 @@
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5FD_FLAGS/
 !DEC$endif
       COMMON /H5FD_FLAGS/ H5FD_flags
-      
-      INTEGER :: H5FD_MPIO_INDEPENDENT_F 
+
+      INTEGER :: H5FD_MPIO_INDEPENDENT_F
       INTEGER :: H5FD_MPIO_COLLECTIVE_F
       INTEGER :: H5FD_MEM_NOLIST_F
       INTEGER :: H5FD_MEM_DEFAULT_F
@@ -346,7 +346,7 @@
       INTEGER :: H5FD_MEM_LHEAP_F
       INTEGER :: H5FD_MEM_OHDR_F
       INTEGER :: H5FD_MEM_NTYPES_F
- 
+
       EQUIVALENCE(H5FD_flags(1), H5FD_MPIO_INDEPENDENT_F)
       EQUIVALENCE(H5FD_flags(2), H5FD_MPIO_COLLECTIVE_F)
       EQUIVALENCE(H5FD_flags(3), H5FD_MEM_NOLIST_F)
@@ -367,7 +367,7 @@
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5FD_HID_FLAGS/
 !DEC$endif
       COMMON /H5FD_HID_FLAGS/ H5FD_hid_flags
-      
+
       INTEGER(HID_T) :: H5FD_CORE_F
       INTEGER(HID_T) :: H5FD_FAMILY_F
       INTEGER(HID_T) :: H5FD_LOG_F
@@ -447,7 +447,7 @@
       INTEGER :: H5O_COPY_EXPAND_SOFT_LINK_F ! NOT MATCH THE C VARIABLE
       INTEGER :: H5O_COPY_EXPAND_EXT_LINK_F !  IN ORDER
       INTEGER :: H5O_COPY_EXPAND_REFERENCE_F ! TO STAY UNDER THE
-      INTEGER :: H5O_COPY_WITHOUT_ATTR_FLAG_F 
+      INTEGER :: H5O_COPY_WITHOUT_ATTR_FLAG_F
       INTEGER :: H5O_COPY_PRESERVE_NULL_FLAG_F
       INTEGER :: H5O_COPY_ALL_F
       INTEGER :: H5O_SHMESG_NONE_FLAG_F
@@ -485,27 +485,27 @@
       EQUIVALENCE(h5o_flags(17) , H5O_HDR_ATTR_CRT_ORDER_INDEX_F)
       EQUIVALENCE(h5o_flags(18) , H5O_HDR_ATTR_STORE_PHASE_CHA_F)
       EQUIVALENCE(h5o_flags(19) , H5O_HDR_STORE_TIMES_F)
-      EQUIVALENCE(h5o_flags(20) , H5O_HDR_ALL_FLAGS_F) 
+      EQUIVALENCE(h5o_flags(20) , H5O_HDR_ALL_FLAGS_F)
       EQUIVALENCE(h5o_flags(21) , H5O_SHMESG_MAX_NINDEXES_F)
       EQUIVALENCE(h5o_flags(22) , H5O_SHMESG_MAX_LIST_SIZE_F)
 
 !
 ! H5P flags declaration
 !
-      INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18 
+      INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18
       INTEGER(HID_T) H5P_flags(H5P_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5P_FLAGS/
 !DEC$endif
       COMMON /H5P_FLAGS/ H5P_flags
 
-      INTEGER(HID_T) :: H5P_FILE_CREATE_F 
-      INTEGER(HID_T) :: H5P_FILE_ACCESS_F 
+      INTEGER(HID_T) :: H5P_FILE_CREATE_F
+      INTEGER(HID_T) :: H5P_FILE_ACCESS_F
       INTEGER(HID_T) :: H5P_DATASET_CREATE_F
-      INTEGER(HID_T) :: H5P_DATASET_XFER_F 
-      INTEGER(HID_T) :: H5P_FILE_MOUNT_F 
-      INTEGER(HID_T) :: H5P_DEFAULT_F 
-      INTEGER(HID_T) :: H5P_ROOT_F  
+      INTEGER(HID_T) :: H5P_DATASET_XFER_F
+      INTEGER(HID_T) :: H5P_FILE_MOUNT_F
+      INTEGER(HID_T) :: H5P_DEFAULT_F
+      INTEGER(HID_T) :: H5P_ROOT_F
       INTEGER(HID_T) :: H5P_OBJECT_CREATE_F
       INTEGER(HID_T) :: H5P_DATASET_ACCESS_F
       INTEGER(HID_T) :: H5P_GROUP_CREATE_F
@@ -540,14 +540,14 @@
 !
 ! H5P intgere flags declaration
 !
-      INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2 
+      INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2
       INTEGER  H5P_flags_int(H5P_FLAGS_INT_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5P_FLAGS_INT/
 !DEC$endif
       COMMON /H5P_FLAGS_INT/ H5P_flags_int
-      INTEGER :: H5P_CRT_ORDER_INDEXED_F 
-      INTEGER :: H5P_CRT_ORDER_TRACKED_F 
+      INTEGER :: H5P_CRT_ORDER_INDEXED_F
+      INTEGER :: H5P_CRT_ORDER_TRACKED_F
       EQUIVALENCE(H5P_flags_int(1), H5P_CRT_ORDER_INDEXED_F)
       EQUIVALENCE(H5P_flags_int(2), H5P_CRT_ORDER_TRACKED_F)
 !
@@ -559,7 +559,7 @@
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5R_FLAGS/
 !DEC$endif
       COMMON /H5R_FLAGS/ H5R_flags
-      
+
       INTEGER :: H5R_OBJECT_F
       INTEGER :: H5R_DATASET_REGION_F
 
@@ -569,16 +569,16 @@
 !
 ! H5S flags declaration
 !
-      INTEGER, PARAMETER :: H5S_FLAGS_LEN = 20 
+      INTEGER, PARAMETER :: H5S_FLAGS_LEN = 20
       INTEGER H5S_flags(H5S_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5S_FLAGS/
 !DEC$endif
       COMMON /H5S_FLAGS/ H5S_flags
 
-      INTEGER :: H5S_SCALAR_F 
-      INTEGER :: H5S_SIMPLE_F 
-      INTEGER :: H5S_NULL_F 
+      INTEGER :: H5S_SCALAR_F
+      INTEGER :: H5S_SIMPLE_F
+      INTEGER :: H5S_NULL_F
 
       INTEGER :: H5S_UNLIMITED_F
       INTEGER :: H5S_ALL_F
@@ -586,13 +586,13 @@
       INTEGER :: H5S_SELECT_NOOP_F
       INTEGER :: H5S_SELECT_SET_F
       INTEGER :: H5S_SELECT_OR_F
-      INTEGER :: H5S_SELECT_AND_F 
-      INTEGER :: H5S_SELECT_XOR_F 
-      INTEGER :: H5S_SELECT_NOTB_F 
-      INTEGER :: H5S_SELECT_NOTA_F 
-      INTEGER :: H5S_SELECT_APPEND_F 
-      INTEGER :: H5S_SELECT_PREPEND_F 
-      INTEGER :: H5S_SELECT_INVALID_F 
+      INTEGER :: H5S_SELECT_AND_F
+      INTEGER :: H5S_SELECT_XOR_F
+      INTEGER :: H5S_SELECT_NOTB_F
+      INTEGER :: H5S_SELECT_NOTA_F
+      INTEGER :: H5S_SELECT_APPEND_F
+      INTEGER :: H5S_SELECT_PREPEND_F
+      INTEGER :: H5S_SELECT_INVALID_F
 
 
       INTEGER :: H5S_SEL_ERROR_F
@@ -610,12 +610,12 @@
       EQUIVALENCE(H5S_flags(7), H5S_ALL_F)
 
       EQUIVALENCE(H5S_flags(8), H5S_SELECT_NOOP_F)
-      EQUIVALENCE(H5S_flags(9), H5S_SELECT_AND_F) 
+      EQUIVALENCE(H5S_flags(9), H5S_SELECT_AND_F)
       EQUIVALENCE(H5S_flags(10), H5S_SELECT_XOR_F)
       EQUIVALENCE(H5S_flags(11), H5S_SELECT_NOTB_F)
       EQUIVALENCE(H5S_flags(12), H5S_SELECT_NOTA_F)
-      EQUIVALENCE(H5S_flags(13), H5S_SELECT_APPEND_F) 
-      EQUIVALENCE(H5S_flags(14), H5S_SELECT_PREPEND_F) 
+      EQUIVALENCE(H5S_flags(13), H5S_SELECT_APPEND_F)
+      EQUIVALENCE(H5S_flags(14), H5S_SELECT_PREPEND_F)
       EQUIVALENCE(H5S_flags(15), H5S_SELECT_INVALID_F)
 
 
@@ -635,40 +635,40 @@
 !DEC$endif
       COMMON /H5T_FLAGS/ H5T_flags
 
-      INTEGER ::  H5T_NO_CLASS_F 
-      INTEGER ::  H5T_INTEGER_F 
-      INTEGER ::  H5T_FLOAT_F  
-      INTEGER ::  H5T_TIME_F 
-      INTEGER ::  H5T_STRING_F 
+      INTEGER ::  H5T_NO_CLASS_F
+      INTEGER ::  H5T_INTEGER_F
+      INTEGER ::  H5T_FLOAT_F
+      INTEGER ::  H5T_TIME_F
+      INTEGER ::  H5T_STRING_F
       INTEGER ::  H5T_BITFIELD_F
-      INTEGER ::  H5T_OPAQUE_F 
-      INTEGER ::  H5T_COMPOUND_F 
+      INTEGER ::  H5T_OPAQUE_F
+      INTEGER ::  H5T_COMPOUND_F
       INTEGER ::  H5T_REFERENCE_F
-      INTEGER ::  H5T_ENUM_F 
+      INTEGER ::  H5T_ENUM_F
       INTEGER ::  H5T_VLEN_F
       INTEGER ::  H5T_ARRAY_F
-      INTEGER ::  H5T_ORDER_LE_F 
+      INTEGER ::  H5T_ORDER_LE_F
       INTEGER ::  H5T_ORDER_BE_F
       INTEGER ::  H5T_ORDER_VAX_F
       INTEGER ::  H5T_PAD_ZERO_F
       INTEGER ::  H5T_PAD_ONE_F
       INTEGER ::  H5T_PAD_BACKGROUND_F
-      INTEGER ::  H5T_PAD_ERROR_F    
-      INTEGER ::  H5T_SGN_NONE_F   
-      INTEGER ::  H5T_SGN_2_F     
+      INTEGER ::  H5T_PAD_ERROR_F
+      INTEGER ::  H5T_SGN_NONE_F
+      INTEGER ::  H5T_SGN_2_F
       INTEGER ::  H5T_SGN_ERROR_F
       INTEGER ::  H5T_NORM_IMPLIED_F
       INTEGER ::  H5T_NORM_MSBSET_F
-      INTEGER ::  H5T_NORM_NONE_F 
+      INTEGER ::  H5T_NORM_NONE_F
       INTEGER ::  H5T_CSET_ASCII_F
       INTEGER ::  H5T_CSET_UTF8_F
-      INTEGER ::  H5T_STR_NULLTERM_F 
-      INTEGER ::  H5T_STR_NULLPAD_F 
+      INTEGER ::  H5T_STR_NULLTERM_F
+      INTEGER ::  H5T_STR_NULLPAD_F
       INTEGER ::  H5T_STR_SPACEPAD_F
       INTEGER ::  H5T_STR_ERROR_F
       INTEGER ::  H5T_DIR_ASCEND_F
       INTEGER ::  H5T_DIR_DESCEND_F
-       
+
       EQUIVALENCE(H5T_flags(1), H5T_NO_CLASS_F)
       EQUIVALENCE(H5T_flags(2), H5T_INTEGER_F)
       EQUIVALENCE(H5T_flags(3), H5T_FLOAT_F)
@@ -713,13 +713,13 @@
 !DEC$endif
       COMMON /H5Z_FLAGS/ H5Z_flags
 
-      INTEGER :: H5Z_FILTER_ERROR_F 
-      INTEGER :: H5Z_FILTER_NONE_F 
+      INTEGER :: H5Z_FILTER_ERROR_F
+      INTEGER :: H5Z_FILTER_NONE_F
       INTEGER :: H5Z_FILTER_ALL_F
-      INTEGER :: H5Z_FILTER_DEFLATE_F 
-      INTEGER :: H5Z_FILTER_SHUFFLE_F 
-      INTEGER :: H5Z_FILTER_FLETCHER32_F 
-      INTEGER :: H5Z_FILTER_SZIP_F 
+      INTEGER :: H5Z_FILTER_DEFLATE_F
+      INTEGER :: H5Z_FILTER_SHUFFLE_F
+      INTEGER :: H5Z_FILTER_FLETCHER32_F
+      INTEGER :: H5Z_FILTER_SZIP_F
       INTEGER :: H5Z_ERROR_EDC_F
       INTEGER :: H5Z_DISABLE_EDC_F
       INTEGER :: H5Z_ENABLE_EDC_F
@@ -748,7 +748,7 @@
 ! H5 Library flags declaration
 !
      INTEGER, PARAMETER :: H5LIB_FLAGS_LEN =  2
-     INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN) 
+     INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$ ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/
 !DEC$endif
@@ -776,4 +776,4 @@
 !!$      EQUIVALENCE(H5F_flags(2), H5F_SCOPE_LOCAL_F)
 
    END MODULE H5GLOBAL
-      
+
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index af86372..f812b29 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -231,7 +231,7 @@ H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid
 #   define nh5dcreate_anon_c      H5_FC_FUNC_(h5dcreate_anon_c, H5DCREATE_ANON_C)
 
 
-H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, 
+H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
 			     hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f nh5dclose_c ( hid_t_f *dset_id );
@@ -338,8 +338,8 @@ H5_FCDLL int_f nh5dfill_integer_c(void * fill_value, hid_t_f *fill_type_id, hid_
 H5_FCDLL int_f nh5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dfill_double_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
-H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, 
-				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id); 
+H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
+				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
 
 /*
  * Functions from H5Gf.c
@@ -378,14 +378,14 @@ H5_FCDLL int_f nh5gmove2_c (hid_t_f *src_loc_id, _fcd src_name, int_f *src_namel
 H5_FCDLL int_f nh5gget_linkval_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size, _fcd value );
 H5_FCDLL int_f nh5gset_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment, int_f *commentlen);
 H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment);
-H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id); 
-H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id ); 
-H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted); 
-H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-				     int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, 
-				     int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted); 
-H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, 
-				      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted); 
+H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id);
+H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id );
+H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
+H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+				     int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
+				     int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
+H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
+				      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
 
 /*
  * Functions from H5Af.c
@@ -467,23 +467,23 @@ H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f
 #   define nh5aget_type_c    H5_FC_FUNC_(h5aget_type_c, H5AGET_TYPE_C)
 #   define nh5aget_num_attrs_c H5_FC_FUNC_(h5aget_num_attrs_c, H5AGET_NUM_ATTRS_C)
 #   define nh5adelete_c      H5_FC_FUNC_(h5adelete_c, H5ADELETE_C)
-#   define nh5aget_storage_size_c H5_FC_FUNC_(h5aget_storage_size_c, H5AGET_STORAGE_SIZE_C) 
-#   define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C) 
-#   define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C) 
-#   define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C) 
-#   define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C) 
-#   define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C) 
-#   define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C) 
-#   define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C) 
-#   define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C) 
-#   define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C) 
-#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) 
-#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) 
-#   define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C) 
-#   define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C) 
-#   define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C) 
-#   define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C) 
-#   define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C) 
+#   define nh5aget_storage_size_c H5_FC_FUNC_(h5aget_storage_size_c, H5AGET_STORAGE_SIZE_C)
+#   define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C)
+#   define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C)
+#   define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C)
+#   define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C)
+#   define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C)
+#   define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C)
+#   define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C)
+#   define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C)
+#   define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C)
+#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C)
+#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C)
+#   define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C)
+#   define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C)
+#   define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C)
+#   define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C)
+#   define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C)
 
 H5_FCDLL int_f nh5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl,  hid_t_f *attr_id);
 H5_FCDLL int_f nh5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id);
@@ -562,45 +562,45 @@ H5_FCDLL int_f nh5aget_space_c (hid_t_f *attr_id, hid_t_f *space_id);
 H5_FCDLL int_f nh5aget_type_c (hid_t_f *attr_id, hid_t_f *type_id);
 H5_FCDLL int_f nh5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num);
 H5_FCDLL int_f nh5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
-H5_FCDLL int_f nh5aget_storage_size_c ( hid_t_f *attr_id, hsize_t_f *size ); 
-H5_FCDLL int_f nh5arename_by_name_c ( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+H5_FCDLL int_f nh5aget_storage_size_c ( hid_t_f *attr_id, hsize_t_f *size );
+H5_FCDLL int_f nh5arename_by_name_c ( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				      _fcd old_attr_name, size_t_f *old_attr_namelen,
-				      _fcd new_attr_name, size_t_f *new_attr_namelen, 
-				      hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5aopen_c ( hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, 
-			    hid_t_f *aapl_id, hid_t_f *attr_id); 
-H5_FCDLL int_f nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				     _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				    int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				      int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name, 
-				      size_t_f *size, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id ); 
-H5_FCDLL int_f nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id); 
-H5_FCDLL int_f nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder, 
-			       int_f *cset, hsize_t_f *data_size ); 
-H5_FCDLL int_f nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				      _fcd new_attr_name, size_t_f *new_attr_namelen,
+				      hid_t_f *lapl_id );
+H5_FCDLL int_f nh5aopen_c ( hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen,
+			    hid_t_f *aapl_id, hid_t_f *attr_id);
+H5_FCDLL int_f nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				     _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				    int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				      int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
+				      size_t_f *size, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id );
+H5_FCDLL int_f nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
+H5_FCDLL int_f nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
+			       int_f *cset, hsize_t_f *data_size );
+H5_FCDLL int_f nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				      int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-				      int_f *corder_valid, int_f *corder, 
-				      int_f *cset, hsize_t_f *data_size ); 
+				      int_f *corder_valid, int_f *corder,
+				      int_f *cset, hsize_t_f *data_size );
 H5_FCDLL int_f nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				       _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
-				       int_f *corder_valid, int_f *corder, 
-				       int_f *cset, hsize_t_f *data_size ); 
+				       int_f *corder_valid, int_f *corder,
+				       int_f *cset, hsize_t_f *data_size );
 H5_FCDLL int_f nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				    _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
 				    hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
-				    hid_t_f *lapl_id, hid_t_f *attr_id ); 
-H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists); 
-H5_FCDLL int_f nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
-		      hid_t_f *lapl_id, int_f *attr_exists); 
-H5_FCDLL int_f nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
-				   hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id); 
+				    hid_t_f *lapl_id, hid_t_f *attr_id );
+H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists);
+H5_FCDLL int_f nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
+		      hid_t_f *lapl_id, int_f *attr_exists);
+H5_FCDLL int_f nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
+				   hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
 H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen); 
+		      _fcd new_attr_name, size_t_f *new_attr_namelen);
 
 /*
  * Functions form H5Tf.c file
@@ -869,37 +869,37 @@ H5_FCDLL int_f nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, s
 #   define nh5pset_fapl_multi_sc          H5_FC_FUNC_(h5pset_fapl_multi_sc, H5PSET_FAPL_MULTI_SC)
 #   define nh5pset_szip_c                 H5_FC_FUNC_(h5pset_szip_c, H5PSET_SZIP_C)
 #   define nh5pall_filters_avail_c        H5_FC_FUNC_(h5pall_filters_avail_c, H5PALL_FILTERS_AVAIL_C)
-#   define nh5pget_attr_phase_change_c    H5_FC_FUNC_(h5pget_attr_phase_change_c, H5PGET_ATTR_PHASE_CHANGE_C) 
-#   define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C) 
-#   define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C) 
-#   define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C) 
-#   define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C) 
-#   define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C) 
-#   define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C) 
-#   define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C) 
-#   define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C) 
-#   define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C) 
-#   define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C) 
-#   define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C) 
-#   define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C) 
-#   define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C) 
-#   define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C) 
-#   define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C) 
-#   define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C) 
-#   define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C) 
-#   define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C) 
-#   define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C) 
-#   define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C) 
-#   define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C) 
-#   define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C) 
-#   define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C) 
-#   define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C) 
-#   define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C) 
-#   define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C) 
-#   define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C) 
-#   define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C) 
-#   define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C) 
-#   define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C) 
+#   define nh5pget_attr_phase_change_c    H5_FC_FUNC_(h5pget_attr_phase_change_c, H5PGET_ATTR_PHASE_CHANGE_C)
+#   define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C)
+#   define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C)
+#   define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C)
+#   define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C)
+#   define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C)
+#   define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C)
+#   define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C)
+#   define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C)
+#   define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C)
+#   define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C)
+#   define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C)
+#   define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C)
+#   define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C)
+#   define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C)
+#   define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C)
+#   define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C)
+#   define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C)
+#   define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C)
+#   define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C)
+#   define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C)
+#   define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C)
+#   define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C)
+#   define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C)
+#   define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C)
+#   define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C)
+#   define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C)
+#   define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C)
+#   define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C)
+#   define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C)
+#   define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C)
 
 H5_FCDLL int_f nh5pcreate_c ( hid_t_f *class, hid_t_f *prp_id );
 H5_FCDLL int_f nh5pclose_c ( hid_t_f *prp_id );
@@ -1025,37 +1025,37 @@ H5_FCDLL int_f nh5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag);
 H5_FCDLL int_f nh5pset_szip_c ( hid_t_f *prp_id , int_f *options_mask, int_f *pixels_per_block);
 H5_FCDLL int_f nh5pall_filters_avail_c ( hid_t_f *prp_id , int_f *status);
 H5_FCDLL int_f nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag);
-H5_FCDLL int_f nh5pget_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags ); 
-H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes ); 
-H5_FCDLL int_f nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size); 
-H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags); 
-H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high); 
-H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); 
-H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag); 
-H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag); 
-H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); 
-H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); 
-H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); 
-H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding); 
-H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding); 
-H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); 
-H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); 
-H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size); 
-H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len); 
-H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); 
-H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); 
-H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); 
-H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); 
-H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size ); 
-H5_FCDLL int_f nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size ); 
-H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id ); 
-H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor ); 
-H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); 
-H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); 
+H5_FCDLL int_f nh5pget_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags );
+H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes );
+H5_FCDLL int_f nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size);
+H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high);
+H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
+H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
+H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
+H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
+H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
+H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
+H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
+H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
+H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size);
+H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len);
+H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
+H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
+H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
+H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
+H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size );
+H5_FCDLL int_f nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size );
+H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id );
+H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor );
+H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
+H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
 /*
  * Functions frome H5Rf.c
  */
@@ -1158,52 +1158,52 @@ H5_FCDLL int_f nh5zget_filter_info_c (int_f *filter, int_f *flag);
 /*
  * Functions from H5Lf.c
  */
-# define nh5lcopy_c H5_FC_FUNC_(h5lcopy_c, H5LCOPY_C) 
-# define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C) 
-# define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C) 
-# define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C) 
-# define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C) 
-# define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C) 
-# define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C) 
-# define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C) 
-# define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C) 
-# define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C) 
-# define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C) 
-# define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C) 
+# define nh5lcopy_c H5_FC_FUNC_(h5lcopy_c, H5LCOPY_C)
+# define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C)
+# define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C)
+# define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C)
+# define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C)
+# define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C)
+# define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C)
+# define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C)
+# define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C)
+# define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C)
+# define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C)
+# define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C)
 # define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C)
 
-H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, 
+H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
 			  _fcd dest_name, size_t_f *dest_namelen,
-			  hid_t_f *lcpl_id, hid_t_f *lapl_id); 
+			  hid_t_f *lcpl_id, hid_t_f *lapl_id);
 H5_FCDLL int_f nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
-				     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, 
-				     hid_t_f *lcpl_id, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				 hid_t_f *link_loc_id, 
-				 _fcd link_name, size_t_f *link_namelen, 
-				 hid_t_f *lcpl_id, hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, 
-				 hid_t_f *link_loc_id, 
-				 _fcd link_name, size_t_f *link_name_len, 
-				 hid_t_f *lcpl_id, hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-				    int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists); 
+				     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
+				     hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				 hid_t_f *link_loc_id,
+				 _fcd link_name, size_t_f *link_namelen,
+				 hid_t_f *lcpl_id, hid_t_f *lapl_id );
+H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
+				 hid_t_f *link_loc_id,
+				 _fcd link_name, size_t_f *link_name_len,
+				 hid_t_f *lcpl_id, hid_t_f *lapl_id );
+H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id );
+H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+				    int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists);
 H5_FCDLL int_f nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
+			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type,
 			       int_f *address, hsize_t_f *link_len,
-			       hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-				     int_f *index_field, int_f *order, hsize_t_f *n, 
-				     int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id); 
+			       hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+				     int_f *index_field, int_f *order, hsize_t_f *n,
+				     int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id);
 H5_FCDLL int_f nh5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
-			  _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+			  _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 				     int_f *index_field, int_f *order, hsize_t_f *n,
-				     size_t_f *size, _fcd name, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, 
+				     size_t_f *size, _fcd name, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
 			     void *linkval_buff, hid_t_f *lapl_id) ;
 
 #endif /* _H5f90proto_H */
diff --git a/fortran/src/H5fortran_flags.f90 b/fortran/src/H5fortran_flags.f90
index 80122cd..adab853 100644
--- a/fortran/src/H5fortran_flags.f90
+++ b/fortran/src/H5fortran_flags.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,16 +11,16 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
       MODULE H5FORTRAN_FLAGS
 !
-!  H5E interface related fortran flags: 
+!  H5E interface related fortran flags:
 !
          !Turn on automatic printing of errors
          INTEGER, PARAMETER :: PRINTON = 1
-         
-         !Turn off automatic printing of errors  
+
+         !Turn off automatic printing of errors
          INTEGER, PARAMETER :: PRINTOFF = 0
-         
+
       END MODULE H5FORTRAN_FLAGS
diff --git a/fortran/src/H5test_kind.f90 b/fortran/src/H5test_kind.f90
index db7178e..09e4ceb 100644
--- a/fortran/src/H5test_kind.f90
+++ b/fortran/src/H5test_kind.f90
@@ -15,7 +15,7 @@
 ! H5test_kind.f90
 !
 ! This fortran program generates H5fortran_detect.f90
-! 
+!
 !
          PROGRAM test_kind
          INTEGER :: i, j, ii, last, kind_numbers(10)
@@ -72,7 +72,7 @@
              WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_16"" "
              WRITE(*,*)"   endif"
              WRITE(*,*)"   return"
-             WRITE(*,*)"   end subroutine"    
+             WRITE(*,*)"   end subroutine"
               jr = 0
              WRITE(*, "("" subroutine r"", i2.2,""()"")") j
              WRITE(*,*)"   implicit none"
@@ -98,7 +98,7 @@
              WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_16"" "
              WRITE(*,*)"   endif"
              WRITE(*,*)"   return"
-             WRITE(*,*)"   end subroutine"    
+             WRITE(*,*)"   end subroutine"
               jd = 0
              WRITE(*, "("" subroutine d"", i2.2,""()"")") jd
              WRITE(*,*)"   implicit none"
@@ -115,7 +115,7 @@
              WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_DOUBLE_NATIVE_16"" "
              WRITE(*,*)"   endif"
              WRITE(*,*)"   return"
-             WRITE(*,*)"   end subroutine"    
+             WRITE(*,*)"   end subroutine"
           DO i = 1, ii
               j = kind_numbers(i)
              WRITE(*, "("" subroutine i"", i2.2,""()"")") j
@@ -139,9 +139,9 @@
              WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_16"" "
              WRITE(*,*)"   endif"
              WRITE(*,*)"   return"
-             WRITE(*,*)"   end subroutine"    
+             WRITE(*,*)"   end subroutine"
           ENDDO
           END PROGRAM
-              
-            
+
+
 
diff --git a/fortran/src/HDF5.f90 b/fortran/src/HDF5.f90
index 04ad33d..f1f1876 100644
--- a/fortran/src/HDF5.f90
+++ b/fortran/src/HDF5.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 MODULE HDF5
   USE H5GLOBAL
diff --git a/fortran/src/HDF5mpio.f90 b/fortran/src/HDF5mpio.f90
index 59ec309..e959b37 100644
--- a/fortran/src/HDF5mpio.f90
+++ b/fortran/src/HDF5mpio.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     MODULE HDF5
        USE H5GLOBAL
diff --git a/fortran/test/fflush1.f90 b/fortran/test/fflush1.f90
index f42ae6e..8767e55 100644
--- a/fortran/test/fflush1.f90
+++ b/fortran/test/fflush1.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,23 +11,23 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! Purpose:	This is the first half of a two-part test that makes sure
 !		that a file can be read after an application crashes as long
-!		as the file was flushed first.  We simulate by exit the 
+!		as the file was flushed first.  We simulate by exit the
 !              the program using stop statement
 !
 
      PROGRAM FFLUSH1EXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      !
-     !the respective filename is "fflush1.h5" 
+     !the respective filename is "fflush1.h5"
      !
      CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
      CHARACTER(LEN=80) :: fix_filename
@@ -42,40 +42,40 @@
      !
      ! File identifiers
      !
-     INTEGER(HID_T) :: file_id 
-     
+     INTEGER(HID_T) :: file_id
+
      !
      ! Group identifier
      !
-     INTEGER(HID_T) :: gid 
+     INTEGER(HID_T) :: gid
 
      !
      ! dataset identifier
      !
      INTEGER(HID_T) :: dset_id
- 
+
      !
      ! data space identifier
      !
      INTEGER(HID_T) :: dataspace
-     ! 
+     !
      !The dimensions for the dataset.
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
 
      !
-     !flag to check operation success 
-     !         
+     !flag to check operation success
+     !
      INTEGER     ::   error
 
      !
-     !general purpose integer 
-     !         
+     !general purpose integer
+     !
      INTEGER     ::   i, j, total_error = 0
 
      !
-     !data buffers 
-     !         
+     !data buffers
+     !
      INTEGER, DIMENSION(NX,NY) :: data_in
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
      data_dims(1) = NX
@@ -84,7 +84,7 @@
      !
      !Initialize FORTRAN predifined datatypes
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
           CALL check("h5open_f",error,total_error)
 
      !
@@ -98,7 +98,7 @@
 
      !
      !Create file "fflush1.h5" using default properties.
-     ! 
+     !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -109,29 +109,29 @@
 
      !
      !Create group "/G" inside file "fflush1.h5".
-     ! 
+     !
      CALL h5gcreate_f(file_id, "/G", gid, error)
           CALL check("h5gcreate_f",error,total_error)
 
      !
-     !Create data space for the dataset. 
+     !Create data space for the dataset.
      !
      CALL h5screate_simple_f(RANK, dims, dataspace, error)
           CALL check("h5screate_simple_f",error,total_error)
 
      !
      !Create dataset "/D" inside file "fflush1.h5".
-     ! 
+     !
      CALL h5dcreate_f(file_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
                       dset_id, error)
           CALL check("h5dcreate_f",error,total_error)
- 
+
      !
      ! Write data_in to the dataset
      !
      CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data_in, data_dims, error)
           CALL check("h5dwrite_f",error,total_error)
-  
+
      !
      !flush and exit without closing the library
      !
diff --git a/fortran/test/fflush2.f90 b/fortran/test/fflush2.f90
index 38a2bd7..a4710e2 100644
--- a/fortran/test/fflush2.f90
+++ b/fortran/test/fflush2.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! Purpose:	This is the second half of a two-part test that makes sure
@@ -22,8 +22,8 @@
 
      PROGRAM FFLUSH2EXAMPLE
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
@@ -39,37 +39,37 @@
      !
      ! File identifiers
      !
-     INTEGER(HID_T) :: file_id 
-     
+     INTEGER(HID_T) :: file_id
+
      !
      ! Group identifier
      !
-     INTEGER(HID_T) :: gid 
+     INTEGER(HID_T) :: gid
 
      !
      ! dataset identifier
      !
      INTEGER(HID_T) :: dset_id
 
- 
+
      !
      ! data type identifier
      !
      INTEGER(HID_T) :: dtype_id
 
      !
-     !flag to check operation success 
-     !         
+     !flag to check operation success
+     !
      INTEGER     ::   error
 
      !
-     !general purpose integer 
-     !         
+     !general purpose integer
+     !
      INTEGER     ::   i, j, total_error = 0
 
      !
-     !data buffers 
-     !         
+     !data buffers
+     !
      INTEGER, DIMENSION(NX,NY) :: data_out
      INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
      data_dims(1) = NX
@@ -78,7 +78,7 @@
      !
      !Initialize FORTRAN predifined datatypes
      !
-     CALL h5open_f(error) 
+     CALL h5open_f(error)
           CALL check("h5open_f",error,total_error)
 
      !
@@ -95,13 +95,13 @@
 
      !
      !Open the dataset
-     ! 
+     !
      CALL h5dopen_f(file_id, "/D", dset_id, error)
           CALL check("h5dopen_f",error,total_error)
 
      !
      !Get dataset's data type.
-     ! 
+     !
      CALL h5dget_type_f(dset_id, dtype_id, error)
           CALL check("h5dget_type_f",error,total_error)
 
@@ -128,14 +128,14 @@
      !
      !Open the group.
      !
-     CALL h5gopen_f(file_id, "G", gid, error)     
+     CALL h5gopen_f(file_id, "G", gid, error)
           CALL check("h5gopen_f",error,total_error)
-    
+
      !
      !In case error happens, exit.
      !
      IF (error == -1) CALL h5_exit_f (1)
-    
+
      !
      !Close the datatype
      !
@@ -166,7 +166,7 @@
      CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
      CALL h5close_f(error)
          CALL check("h5close_types_f",error,total_error)
-     
+
      ! if errors detected, exit with non-zero code.
      IF (total_error .ne. 0) CALL h5_exit_f (1)
 
diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90
index 6141f37..9102cf9 100644
--- a/fortran/test/fortranlib_test.f90
+++ b/fortran/test/fortranlib_test.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,16 +11,16 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing Fortran functionality.
 !
 PROGRAM fortranlibtest
-  
+
   USE HDF5
-  
+
   IMPLICIT NONE
   INTEGER :: total_error = 0
   INTEGER :: error
@@ -30,7 +30,7 @@ PROGRAM fortranlibtest
   LOGICAL :: szip_flag
   INTEGER :: ret_total_error
 
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
   WRITE(*,*) '                       ==========================                            '
   WRITE(*,*) '                              FORTRAN tests '
   WRITE(*,*) '                       ==========================                            '
@@ -39,7 +39,7 @@ PROGRAM fortranlibtest
 
      WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
      WRITE(*, '(I1)', advance="NO") majnum
-     WRITE(*, '(".")', advance="NO") 
+     WRITE(*, '(".")', advance="NO")
      WRITE(*, '(I1)', advance="NO") minnum
      WRITE(*, '(" release ")', advance="NO")
      WRITE(*, '(I3)') relnum
@@ -51,12 +51,12 @@ PROGRAM fortranlibtest
 !     write(*,*) '========================================='
 !     write(*,*) 'Testing FILE Interface                   '
 !     write(*,*) '========================================='
-     
+
 
   ret_total_error = 0
   CALL mountingtest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Mounting test', total_error)
-  
+
   ret_total_error = 0
   CALL reopentest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Reopen test', total_error)
@@ -82,7 +82,7 @@ PROGRAM fortranlibtest
   ret_total_error = 0
   CALL datasettest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Dataset test', total_error)
-  
+
   ret_total_error = 0
   CALL extenddsettest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Extendible dataset test', total_error)
@@ -104,7 +104,7 @@ PROGRAM fortranlibtest
   ret_total_error = 0
   CALL refobjtest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Reference to object test', total_error)
-  
+
   ret_total_error = 0
   CALL refregtest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Reference to dataset region test', total_error)
@@ -122,7 +122,7 @@ PROGRAM fortranlibtest
   ret_total_error = 0
   CALL test_select_hyperslab( cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Hyperslab selection test', total_error)
-  
+
   ret_total_error = 0
   CALL test_select_element(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Element selection test', total_error)
@@ -138,14 +138,14 @@ PROGRAM fortranlibtest
   ret_total_error = 0
   CALL compoundtest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Compound datatype test', total_error)
- 
+
   ret_total_error = 0
   CALL enumtest(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Enum datatype test', total_error)
 
 !     write(*,*)
 !     write(*,*) '========================================='
-!     write(*,*) 'Testing PROPERTY interface               ' 
+!     write(*,*) 'Testing PROPERTY interface               '
 !     write(*,*) '========================================='
 
   ret_total_error = 0
@@ -162,7 +162,7 @@ PROGRAM fortranlibtest
 
 !     write(*,*)
 !     write(*,*) '========================================='
-!     write(*,*) 'Testing ATTRIBUTE interface              ' 
+!     write(*,*) 'Testing ATTRIBUTE interface              '
 !     write(*,*) '========================================='
 
   ret_total_error = 0
@@ -184,7 +184,7 @@ PROGRAM fortranlibtest
 
   ret_total_error = 0
   CALL szip_test(szip_flag, cleanup, ret_total_error)
-  
+
   IF (.NOT. szip_flag) THEN ! test not available
      CALL write_test_status(-1, ' SZIP filter test', total_error)
   ELSE
@@ -209,7 +209,7 @@ PROGRAM fortranlibtest
   CALL vl_test_real(cleanup, ret_total_error)
   CALL vl_test_string(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' VL test', total_error)
-  
+
   WRITE(*,*)
 
   WRITE(*,*) '                  ============================================  '
@@ -217,7 +217,7 @@ PROGRAM fortranlibtest
   WRITE(*, fmt = '(i4)', advance='NO') total_error
   WRITE(*, fmt = '(12a)' ) ' error(s) ! '
   WRITE(*,*) '                  ============================================  '
-  
+
   CALL h5close_f(error)
 
   ! if errors detected, exit with non-zero code.
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
index 4ff3e0f..2662f8f 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,10 +11,10 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing Fortran wrappers introduced in 1.8 release.
 !
 PROGRAM fortranlibtest
@@ -29,7 +29,7 @@ PROGRAM fortranlibtest
   LOGICAL :: cleanup = .TRUE.
 !       LOGICAL :: cleanup = .FALSE.
 
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
   WRITE(*,*) '                       ==========================                            '
   WRITE(*,*) '                              FORTRAN 1.8 tests '
   WRITE(*,*) '                       ==========================                            '
@@ -37,7 +37,7 @@ PROGRAM fortranlibtest
   IF(total_error .EQ. 0) THEN
      WRITE(*, '(" FORTRANLIB_TEST is linked with HDF5 Library version ")', advance="NO")
      WRITE(*, '(I1)', advance="NO") majnum
-     WRITE(*, '(".")', advance="NO") 
+     WRITE(*, '(".")', advance="NO")
      WRITE(*, '(I1)', advance="NO") minnum
      WRITE(*, '(" release ")', advance="NO")
      WRITE(*, '(I3)') relnum
@@ -106,15 +106,15 @@ PROGRAM fortranlibtest
 END PROGRAM fortranlibtest
 
 SUBROUTINE dtransform(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(INOUT) :: total_error
 
   INTEGER(HID_T) :: dxpl_id_c_to_f
   INTEGER(HID_T) :: file_id
-  
+
   CHARACTER(LEN=15), PARAMETER :: c_to_f = "(9/5.0)*x + 123"
   INTEGER :: error
   CHARACTER(LEN=15) :: ptrgetTest
@@ -129,7 +129,7 @@ SUBROUTINE dtransform(cleanup, total_error)
 
   CALL H5Pcreate_f(H5P_DATASET_XFER_F, dxpl_id_c_to_f, error)
   CALL check("dtransform.H5Pcreate_f", error, total_error)
-  
+
   CALL H5Pset_data_transform_f(dxpl_id_c_to_f, c_to_f, error)
   CALL check("dtransform.H5Pset_data_transform_f", error, total_error)
 
@@ -171,8 +171,8 @@ END SUBROUTINE dtransform
 
 SUBROUTINE test_genprop_basic_class(cleanup, total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(INOUT) :: total_error
@@ -204,8 +204,8 @@ SUBROUTINE test_genprop_basic_class(cleanup, total_error)
   IF(error.NE.0)THEN
      WRITE(*,*) 'Class names do not match! name=',name, 'CLASS1_NAME=',CLASS1_NAME
      total_error = total_error + 1
-  ENDIF  
-  
+  ENDIF
+
   ! /* Check class name smaller buffer*/
   CALL H5Pget_class_name_f(cid1, name_small, size, error)
   CALL check("H5Pget_class_name", error, total_error)
@@ -260,8 +260,8 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
 !**
 !****************************************************************/
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(INOUT) :: total_error
@@ -290,7 +290,7 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
 !    H5S_sel_type        sel_type;
 !    hssize_t            nblocks;
   !
-  !Dataset dimensions 
+  !Dataset dimensions
   !
   INTEGER, PARAMETER :: SPACE1_DIM1= 3,  SPACE1_DIM2=15, SPACE1_DIM3=13
 
@@ -305,15 +305,15 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
   ! * Test encoding and decoding of simple dataspace and hyperslab selection.
   ! *-------------------------------------------------------------------------
   ! */
-  
+
   CALL H5Screate_simple_f(SPACE1_RANK, dims1, sid1, error)
   CALL check("H5Screate_simple", error, total_error)
-  
+
   CALL h5sselect_hyperslab_f(sid1, H5S_SELECT_SET_F, &
-       start, count, error, stride=stride, BLOCK=BLOCK) 
+       start, count, error, stride=stride, BLOCK=BLOCK)
   CALL check("h5sselect_hyperslab_f", error, total_error)
-  
-  
+
+
   !/* Encode simple data space in a buffer */
 
   !         First find the buffer size
@@ -363,9 +363,9 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
   !
   CALL h5sclose_f(sid1, error)
   CALL check("h5sclose_f", error, total_error)
- 
+
   CALL h5sclose_f(decoded_sid1, error)
-  CALL check("h5sclose_f", error, total_error)    
+  CALL check("h5sclose_f", error, total_error)
 
   ! /*-------------------------------------------------------------------------
   !  * Test encoding and decoding of scalar dataspace.
@@ -411,7 +411,7 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
 
   CALL h5sclose_f(sid3, error)
   CALL check("h5sclose_f", error, total_error)
- 
+
   CALL h5sclose_f(decoded_sid3, error)
   CALL check("h5sclose_f", error, total_error)
 
diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90
index b73dd8a..dd6cbb1 100644
--- a/fortran/test/tH5A.f90
+++ b/fortran/test/tH5A.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,23 +11,23 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE attribute_test(cleanup, total_error)
 
-!   This subroutine tests following functionalities: 
+!   This subroutine tests following functionalities:
 !   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
 !   h5aget_name_f,h5aget_space_f, h5aget_type_f,
-! 
+!
+
+     USE HDF5 ! This module contains all necessary modules
 
-     USE HDF5 ! This module contains all necessary modules 
-        
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
      CHARACTER(LEN=5), PARAMETER :: filename = "atest"    !File name
-     CHARACTER(LEN=80) :: fix_filename 
+     CHARACTER(LEN=80) :: fix_filename
      CHARACTER(LEN=9), PARAMETER :: dsetname = "atestdset"        !Dataset name
      CHARACTER(LEN=11), PARAMETER :: aname = "attr_string"   !String Attribute name
      CHARACTER(LEN=14), PARAMETER :: aname2 = "attr_character"!Character Attribute name
@@ -35,7 +35,7 @@
      CHARACTER(LEN=9), PARAMETER :: aname4 = "attr_real"      !Real Attribute name
      CHARACTER(LEN=12), PARAMETER :: aname5 = "attr_integer"  !Integer Attribute name
      CHARACTER(LEN=9), PARAMETER :: aname6 = "attr_null"     !Null Attribute name
-    
+
      !
      !data space rank and dimensions
      !
@@ -45,44 +45,44 @@
 
 
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-     INTEGER(HID_T) :: dataspace     ! Dataspace identifier for dataset 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
+     INTEGER(HID_T) :: dataspace     ! Dataspace identifier for dataset
 
-     INTEGER(HID_T) :: attr_id        !String Attribute identifier 
-     INTEGER(HID_T) :: attr2_id       !Character Attribute identifier 
-     INTEGER(HID_T) :: attr3_id       !Double Attribute identifier 
-     INTEGER(HID_T) :: attr4_id       !Real Attribute identifier 
-     INTEGER(HID_T) :: attr5_id       !Integer Attribute identifier 
-     INTEGER(HID_T) :: attr6_id       !Null Attribute identifier 
-     INTEGER(HID_T) :: aspace_id      !String Attribute Dataspace identifier 
+     INTEGER(HID_T) :: attr_id        !String Attribute identifier
+     INTEGER(HID_T) :: attr2_id       !Character Attribute identifier
+     INTEGER(HID_T) :: attr3_id       !Double Attribute identifier
+     INTEGER(HID_T) :: attr4_id       !Real Attribute identifier
+     INTEGER(HID_T) :: attr5_id       !Integer Attribute identifier
+     INTEGER(HID_T) :: attr6_id       !Null Attribute identifier
+     INTEGER(HID_T) :: aspace_id      !String Attribute Dataspace identifier
      INTEGER(HID_T) :: aspace2_id     !Character Attribute Dataspace identifier
-     INTEGER(HID_T) :: aspace6_id     !Null Attribute Dataspace identifier 
-     INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier 
-     INTEGER(HID_T) :: atype2_id      !Character Attribute Datatype identifier 
-     INTEGER(HID_T) :: atype3_id      !Double Attribute Datatype identifier 
-     INTEGER(HID_T) :: atype4_id      !Real Attribute Datatype identifier 
-     INTEGER(HID_T) :: atype5_id      !Integer Attribute Datatype identifier 
+     INTEGER(HID_T) :: aspace6_id     !Null Attribute Dataspace identifier
+     INTEGER(HID_T) :: atype_id       !String Attribute Datatype identifier
+     INTEGER(HID_T) :: atype2_id      !Character Attribute Datatype identifier
+     INTEGER(HID_T) :: atype3_id      !Double Attribute Datatype identifier
+     INTEGER(HID_T) :: atype4_id      !Real Attribute Datatype identifier
+     INTEGER(HID_T) :: atype5_id      !Integer Attribute Datatype identifier
      INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
      INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
      INTEGER     ::   arank = 1                      ! Attribure rank
      INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
 
-     INTEGER(HID_T) :: attr_space     !Returned String Attribute Space identifier 
-     INTEGER(HID_T) :: attr2_space    !Returned other Attribute Space identifier 
+     INTEGER(HID_T) :: attr_space     !Returned String Attribute Space identifier
+     INTEGER(HID_T) :: attr2_space    !Returned other Attribute Space identifier
      INTEGER(HID_T) :: attr_type      !Returned Attribute Datatype identifier
      INTEGER(HID_T) :: attr2_type      !Returned CHARACTER Attribute Datatype identifier
      INTEGER(HID_T) :: attr3_type      !Returned DOUBLE Attribute Datatype identifier
      INTEGER(HID_T) :: attr4_type      !Returned REAL Attribute Datatype identifier
      INTEGER(HID_T) :: attr5_type      !Returned INTEGER Attribute Datatype identifier
      INTEGER(HID_T) :: attr6_type      !Returned NULL Attribute Datatype identifier
-     INTEGER        :: num_attrs      !number of attributes  
+     INTEGER        :: num_attrs      !number of attributes
      INTEGER(HSIZE_T) :: attr_storage   ! attributes storage requirements .MSB.
      CHARACTER(LEN=256) :: attr_name    !buffer to put attr_name
      INTEGER(SIZE_T)    ::  name_size = 80 !attribute name length
 
      CHARACTER(LEN=35), DIMENSION(2) ::  attr_data  ! String attribute data
-     CHARACTER(LEN=35), DIMENSION(2) ::  aread_data ! Buffer to put read back 
+     CHARACTER(LEN=35), DIMENSION(2) ::  aread_data ! Buffer to put read back
                                                ! string attr data
      CHARACTER ::  attr_character_data = 'A'
      DOUBLE PRECISION,  DIMENSION(1) ::  attr_double_data = 3.459
@@ -90,7 +90,7 @@
      INTEGER,      DIMENSION(1) ::  attr_integer_data = 5
      INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
 
-     
+
      CHARACTER :: aread_character_data ! variable to put read back Character attr data
      INTEGER, DIMENSION(1)  :: aread_integer_data ! variable to put read back integer attr data
      INTEGER, DIMENSION(1)  :: aread_null_data = 7 ! variable to put read back null attr data
@@ -98,19 +98,19 @@
      REAL, DIMENSION(1)  :: aread_real_data ! variable to put read back real attr data
 
      !
-     !general purpose integer 
-     !         
+     !general purpose integer
+     !
      INTEGER     ::   i, j
      INTEGER     ::   error ! Error flag
-     
-     ! 
+
+     !
      !The dimensions for the dataset.
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
 
      !
-     !data buffers 
-     !         
+     !data buffers
+     !
      INTEGER, DIMENSION(NX,NY) :: data_in
 
 
@@ -126,9 +126,9 @@
      ! Initialize attribute's data
      !
      attr_data(1) = 'Dataset character attribute'
-     attr_data(2) = 'Some other string here     ' 
-     attrlen = LEN(attr_data(1)) 
-    
+     attr_data(2) = 'Some other string here     '
+     attrlen = LEN(attr_data(1))
+
      !
      ! Create the file.
      !
@@ -141,13 +141,13 @@
      CALL check("h5fcreate_f",error,total_error)
 
      !
-     !Create data space for the dataset. 
+     !Create data space for the dataset.
      !
      CALL h5screate_simple_f(RANK, dims, dataspace, error)
      CALL check("h5screate_simple_f",error,total_error)
 
      !
-     ! create dataset in the file. 
+     ! create dataset in the file.
      !
      CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
                dset_id, error)
@@ -162,17 +162,17 @@
      CALL check("h5dwrite_f",error,total_error)
 
      !
-     ! Create scalar data space for the String attribute. 
+     ! Create scalar data space for the String attribute.
      !
      CALL h5screate_simple_f(arank, adims, aspace_id, error)
      CALL check("h5screate_simple_f",error,total_error)
      !
-     ! Create scalar data space for all other attributes. 
+     ! Create scalar data space for all other attributes.
      !
      CALL h5screate_simple_f(arank, adims2, aspace2_id, error)
      CALL check("h5screate_simple_f",error,total_error)
      !
-     ! Create null data space for null attributes. 
+     ! Create null data space for null attributes.
      !
      CALL h5screate_f(H5S_NULL_F, aspace6_id, error)
      CALL check("h5screate_f",error,total_error)
@@ -222,7 +222,7 @@
      CALL h5acreate_f(dset_id, aname2, atype2_id, aspace2_id, &
                       attr2_id, error)
      CALL check("h5acreate_f",error,total_error)
-     
+
 
      !
      ! Create dataset DOUBLE attribute.
@@ -250,7 +250,7 @@
                       attr6_id, error)
 
      CALL check("h5acreate_f",error,total_error)
-    
+
      !
      ! Write the String attribute data.
      !
@@ -265,20 +265,20 @@
      !
      ! Write the DOUBLE attribute data.
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5awrite_f(attr3_id, atype3_id, attr_double_data, data_dims, error)
      CALL check("h5awrite_f",error,total_error)
      !
      ! Write the Real attribute data.
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5awrite_f(attr4_id, atype4_id, attr_real_data, data_dims, error)
      CALL check("h5awrite_f",error,total_error)
 
      !
      ! Write the Integer attribute data.
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5awrite_f(attr5_id, atype5_id, attr_integer_data, data_dims, error)
      CALL check("h5awrite_f",error,total_error)
 
@@ -310,9 +310,9 @@
      CALL check("h5aget_storage_size_f",error,total_error)
 !     CALL verify("h5aget_storage_size_f",attr_storage,0,total_error)
 
-   
+
      !
-     ! Close the attribute. 
+     ! Close the attribute.
      !
      CALL h5aclose_f(attr_id, error)
      CALL check("h5aclose_f",error,total_error)
@@ -394,7 +394,7 @@
      !
      CALL h5aopen_name_f(dset_id, aname5, attr5_id, error)
      CALL check("h5aopen_idx_f",error,total_error)
-     
+
      !
      !open the NULL attrbute by name
      !
@@ -412,7 +412,7 @@
      IF (error .NE. 12) THEN
        total_error = total_error + 1
      END IF
-       
+
      !
      !get the STRING attrbute space
      !
@@ -449,7 +449,7 @@
      !
      CALL h5aget_type_f(attr5_id, attr5_type, error)
      CALL check("h5aget_type_f",error,total_error)
-     
+
      !
      !get the null attrbute datatype
      !
@@ -483,9 +483,9 @@
 
      IF ( (aread_data(1) .NE. attr_data(1)) .OR. (aread_data(2) .NE. attr_data(2)) ) THEN
          WRITE(*,*) "Read back string attrbute is wrong", aread_data(1), aread_data(2)
-         total_error = total_error + 1  
+         total_error = total_error + 1
      END IF
-     
+
      !
      !read the CHARACTER attribute data back to memory
      !
@@ -493,51 +493,51 @@
      CALL check("h5aread_f",error,total_error)
      IF (aread_character_data .NE. 'A' ) THEN
          WRITE(*,*) "Read back character attrbute is wrong ",aread_character_data
-         total_error = total_error + 1  
+         total_error = total_error + 1
      END IF
      !
      !read the double attribute data back to memory
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5aread_f(attr3_id, H5T_NATIVE_DOUBLE, aread_double_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_double_data(1) .NE. 3.459 ) THEN
          WRITE(*,*) "Read back double attrbute is wrong", aread_double_data(1)
          total_error = total_error + 1
-     END IF  
+     END IF
      !
      !read the real attribute data back to memory
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5aread_f(attr4_id, H5T_NATIVE_REAL, aread_real_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_real_data(1) .NE. 4.0 ) THEN
          WRITE(*,*) "Read back real attrbute is wrong ", aread_real_data
-         total_error = total_error + 1 
-     END IF 
+         total_error = total_error + 1
+     END IF
      !
      !read the Integer attribute data back to memory
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5aread_f(attr5_id, H5T_NATIVE_INTEGER, aread_integer_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_integer_data(1) .NE. 5 ) THEN
          WRITE(*,*) "Read back integer attrbute is wrong ", aread_integer_data
-         total_error = total_error + 1 
-     END IF 
+         total_error = total_error + 1
+     END IF
      !
      !read the null attribute data. nothing can be read.
      !
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5aread_f(attr6_id, H5T_NATIVE_INTEGER, aread_null_data, data_dims, error)
      CALL check("h5aread_f",error,total_error)
      IF (aread_null_data(1) .NE. 7 ) THEN
          WRITE(*,*) "Read back null attrbute is wrong ", aread_null_data
-         total_error = total_error + 1 
-     END IF 
-    
+         total_error = total_error + 1
+     END IF
+
      !
-     ! Close the attribute. 
+     ! Close the attribute.
      !
      CALL h5aclose_f(attr_id, error)
      CALL check("h5aclose_f",error,total_error)
@@ -553,9 +553,9 @@
      CALL check("h5aclose_f",error,total_error)
 
      !
-     ! Delete the attribute from the Dataset. 
+     ! Delete the attribute from the Dataset.
      !
-     CALL h5adelete_f(dset_id, aname, error)     
+     CALL h5adelete_f(dset_id, aname, error)
      CALL check("h5adelete_f",error,total_error)
 
      !
@@ -591,13 +591,13 @@
      CALL h5tclose_f(attr6_type, error)
      CALL check("h5tclose_f",error,total_error)
 
-     !   
+     !
      ! End access to the dataset and release resources used by it.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
      CALL check("h5dclose_f",error,total_error)
 
-     ! 
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90
index 58408ee..223877c 100644
--- a/fortran/test/tH5A_1_8.f90
+++ b/fortran/test/tH5A_1_8.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,22 +11,22 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-SUBROUTINE attribute_test_1_8(cleanup, total_error) 
+SUBROUTINE attribute_test_1_8(cleanup, total_error)
 
 !   This subroutine tests following 1.8 functionalities:
 !   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
 !   h5aget_name_f,h5aget_space_f, h5aget_type_f, H5Pset_shared_mesg_nindexes_f,
 !   H5Pset_shared_mesg_index_f
-! 
+!
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(INOUT) :: total_error 
-  
+  INTEGER, INTENT(INOUT) :: total_error
+
   CHARACTER(LEN=5), PARAMETER :: filename = "atest"    !File name
   CHARACTER(LEN=9), PARAMETER :: dsetname = "atestdset"        !Dataset name
   CHARACTER(LEN=11), PARAMETER :: aname = "attr_string"   !String Attribute name
@@ -35,7 +35,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
   CHARACTER(LEN=9), PARAMETER :: aname4 = "attr_real"      !Real Attribute name
   CHARACTER(LEN=12), PARAMETER :: aname5 = "attr_integer"  !Integer Attribute name
   CHARACTER(LEN=9), PARAMETER :: aname6 = "attr_null"     !Null Attribute name
-  
+
   !
   !data space rank and dimensions
   !
@@ -44,11 +44,11 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
   INTEGER, PARAMETER :: NY = 5
 
   !
-  !general purpose integer 
-  !         
+  !general purpose integer
+  !
   INTEGER     ::   i, j
   INTEGER     ::   error ! Error flag
-  
+
   ! NEW STARTS HERE
   INTEGER(HID_T) :: fapl = -1, fapl2 = -1
   INTEGER(HID_T) :: fcpl = -1, fcpl2 = -1
@@ -63,7 +63,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
 ! ********************
 
 !  WRITE(*,*) "TESTING ATTRIBUTES"
-  
+
   CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl,error)
   CALL check("h5Pcreate_f",error,total_error)
   CALL h5pcopy_f(fapl, fapl2, error)
@@ -71,7 +71,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
 
   CALL H5Pcreate_f(H5P_FILE_CREATE_F,fcpl,error)
   CALL check("h5Pcreate_f",error,total_error)
-  
+
   CALL h5pcopy_f(fcpl, fcpl2, error)
   CALL check("h5pcopy_f",error,total_error)
 
@@ -118,13 +118,13 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
               my_fcpl = fcpl
            END IF
 !!$              CALL test_attr_dense_create(my_fcpl, my_fapl)
-           
+
            ret_total_error = 0
            CALL test_attr_dense_open(my_fcpl, my_fapl, ret_total_error)
            CALL write_test_status(ret_total_error, &
                 '   - Testing INT attributes on both datasets and groups', &
                 total_error)
-           
+
 !!$              CALL test_attr_dense_delete(my_fcpl, my_fapl)
 !!$              CALL test_attr_dense_rename(my_fcpl, my_fapl)
 !!$              CALL test_attr_dense_unlink(my_fcpl, my_fapl)
@@ -147,7 +147,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
            CALL write_test_status(ret_total_error, &
                 '   - Testing creating objects with attribute creation order', &
                 total_error)
-           
+
            ret_total_error = 0
            CALL test_attr_corder_create_compact(my_fcpl, my_fapl, ret_total_error)
            CALL write_test_status(ret_total_error, &
@@ -162,13 +162,13 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
            CALL write_test_status(ret_total_error, &
                 '   - Testing querying attribute info by index', &
                 total_error)
-           
+
            ret_total_error = 0
            CALL test_attr_delete_by_idx(new_format, my_fcpl, my_fapl, ret_total_error)
            CALL write_test_status(ret_total_error, &
                 '   - Testing deleting attribute by index', &
                 total_error)
-           
+
 !!$              CALL test_attr_iterate2(new_format, my_fcpl, my_fapl)
 !!$              CALL test_attr_open_by_idx(new_format, my_fcpl, my_fapl)
 !!$              CALL test_attr_open_by_name(new_format, my_fcpl, my_fapl)
@@ -192,7 +192,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
               CALL write_test_status(ret_total_error,&
                    '   - Testing deleting shared attributes in "compact" & "dense" storage', &
                    total_error)
-              
+
 
 !!$                 CALL test_attr_shared_unlink(my_fcpl, my_fapl)
            END IF
@@ -264,16 +264,16 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
   INTEGER(HID_T) :: my_dataset
 
   INTEGER :: u
-  
+
   INTEGER :: max_compact ! Maximum # of links to store in group compactly
   INTEGER :: min_dense   ! Minimum # of links to store in group "densely"
 
   CHARACTER(LEN=7) :: attrname
   CHARACTER(LEN=2) :: chr2
-  INTEGER(HID_T) :: attr        !String Attribute identifier 
+  INTEGER(HID_T) :: attr        !String Attribute identifier
   INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
 
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
@@ -330,7 +330,7 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
        CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error)
        CALL check("h5acreate_f",error,total_error)
 
-       data_dims(1) = 1 
+       data_dims(1) = 1
        CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
        CALL check("h5awrite_f",error,total_error)
 
@@ -354,7 +354,7 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
   CALL check("h5dclose_f",error,total_error)
   CALL h5dclose_f(dset3, error)
   CALL check("h5dclose_f",error,total_error)
-  
+
   !   /* Close file */
   CALL h5fclose_f(fid, error)
   CALL check("h5fclose_f",error,total_error)
@@ -404,7 +404,7 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
              f_corder_valid, corder, cset, data_size, error, lapl_id = H5P_DEFAULT_F ) !with optional
 
         CALL check("H5Aget_info_by_name_f", error, total_error)
-        
+
         ! /* Verify creation order of attribute */
 
         CALL verifyLogical("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
@@ -417,7 +417,7 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
              f_corder_valid, corder, cset, data_size, error) ! without optional
 
         CALL check("H5Aget_info_by_name_f", error, total_error)
-        
+
         ! /* Verify creation order of attribute */
 
         CALL verifyLogical("H5Aget_info_by_name_f", f_corder_valid, .TRUE., total_error)
@@ -432,7 +432,7 @@ SUBROUTINE test_attr_corder_create_compact(fcpl,fapl, total_error)
   CALL check("h5dclose_f",error,total_error)
   CALL h5dclose_f(dset3, error)
   CALL check("h5dclose_f",error,total_error)
-  
+
   !   /* Close file */
   CALL h5fclose_f(fid, error)
   CALL check("h5fclose_f",error,total_error)
@@ -463,24 +463,24 @@ SUBROUTINE test_attr_null_space(fcpl, fapl, total_error)
 
 
   INTEGER :: error
-  
+
   INTEGER :: value_scalar
   INTEGER, DIMENSION(1) :: value
-  INTEGER(HID_T) :: attr        !String Attribute identifier 
+  INTEGER(HID_T) :: attr        !String Attribute identifier
   INTEGER(HID_T) :: attr_sid
   INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
 
-  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements 
+  INTEGER(HSIZE_T) :: storage_size   ! attributes storage requirements
 
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
-  
+
   LOGICAL :: equal
 
   ! test: H5Sextent_equal_f
-  
+
   data_dims = 0
 
   ! /* Output message about test being performed */
@@ -532,7 +532,7 @@ SUBROUTINE test_attr_null_space(fcpl, fapl, total_error)
   CALL H5Sextent_equal_f(attr_sid, null_sid, equal, error)
   CALL check("H5Sextent_equal_f",error,total_error)
   CALL Verifylogical("H5Sextent_equal_f",equal,.TRUE.,total_error)
-  
+
 !!$  ret = H5Sclose(attr_sid)
 !!$  CALL CHECK(ret, FAIL, "H5Sclose")
 
@@ -586,7 +586,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
   IMPLICIT NONE
 
   INTEGER(SIZE_T), PARAMETER :: NAME_BUF_SIZE = 7
-  LOGICAL :: new_format 
+  LOGICAL :: new_format
   INTEGER(HID_T), INTENT(IN) :: fcpl
   INTEGER(HID_T), INTENT(IN) :: fapl
   INTEGER, INTENT(INOUT) :: total_error
@@ -616,7 +616,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
 
 
   CHARACTER(LEN=2) :: chr2
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) 
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
   INTEGER :: Input1
   INTEGER :: i
 
@@ -666,10 +666,10 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
 
      CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl_id=dcpl )
      CALL check("h5dcreate_f2",error,total_error)
-     
+
      CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl_id=dcpl )
      CALL check("h5dcreate_f3",error,total_error)
-     
+
      CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl_id=dcpl )
      CALL check("h5dcreate_f4",error,total_error)
 
@@ -704,12 +704,12 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
            WRITE(chr2,'(I2.2)') u
            attrname = 'attr '//chr2
            CALL H5Acreate_by_name_f(fid, dsetname, attrname, H5T_NATIVE_INTEGER, sid, &
-                attr, error, lapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F) 
+                attr, error, lapl_id=H5P_DEFAULT_F, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
            CALL check("H5Acreate_by_name_f",error,total_error)
-           
+
            ! /* Write data into the attribute */
 
-           data_dims(1) = 1 
+           data_dims(1) = 1
            CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
            CALL check("h5awrite_f",error,total_error)
 
@@ -751,7 +751,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
            my_dataset = dset3
            dsetname = DSET3_NAME
         END SELECT
-        
+
         ! /* Create more attributes, to push into dense form */
         DO u = max_compact, max_compact* 2 - 1
 
@@ -763,7 +763,7 @@ SUBROUTINE test_attr_create_by_name(new_format,fcpl,fapl, total_error)
            CALL check("H5Acreate_by_name",error,total_error)
 
            ! /* Write data into the attribute */
-           data_dims(1) = 1 
+           data_dims(1) = 1
            CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
            CALL check("h5awrite_f",error,total_error)
 
@@ -867,7 +867,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
   INTEGER(HID_T) :: attr        !String Attribute identifier
   INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
 
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
@@ -895,7 +895,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
   data_dims = 0
 
   ! /* Create dataspace for dataset & attributes */
-  
+
   CALL h5screate_f(H5S_SCALAR_F, sid, error)
   CALL check("h5screate_f",error,total_error)
 
@@ -911,7 +911,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
   CALL check("H5Pget_attr_phase_change_f",error,total_error)
 
   !  /* Loop over using index for creation order value */
-    
+
   DO i = 1, 2
 
      ! /* Output message about test being performed */
@@ -937,18 +937,18 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
      ENDIF
 
      ! /* Create datasets */
-     
+
      CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error )
      CALL check("h5dcreate_f",error,total_error)
-     
+
      CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error )
      CALL check("h5dcreate_f",error,total_error)
-     
+
      CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error )
      CALL check("h5dcreate_f",error,total_error)
 
      ! /* Work on all the datasets */
-     
+
      DO curr_dset = 0,NUM_DSETS-1
 
         SELECT CASE (curr_dset)
@@ -974,7 +974,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
 
         ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
 
-        ! 1) call by passing an integer with the _hsize_t declaration 
+        ! 1) call by passing an integer with the _hsize_t declaration
 
         CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, 0_hsize_t, &
              f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
@@ -986,13 +986,13 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
              f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
         CALL VERIFY("h5aget_info_by_idx_f",error,minusone,total_error)
 
-        
+
         ! 3) call by passing a variable with the attribute hsize_t
 
         CALL h5aget_info_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, hzero, &
              f_corder_valid, corder, cset, data_size, error, lapl_id=H5P_DEFAULT_F)
         CALL VERIFY("h5aget_info_by_idx_f",error,minusone,total_error)
-        
+
         CALL h5aget_name_by_idx_f(my_dataset, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, &
              hzero, tmpname,  error, size, lapl_id=H5P_DEFAULT_F)
         CALL VERIFY("h5aget_name_by_idx_f",error,minusone,total_error)
@@ -1009,7 +1009,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
            ! check with the optional information create2 specs.
            CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
            CALL check("h5acreate_f",error,total_error)
-           
+
            ! /* Write data into the attribute */
 
            attr_integer_data(1) = j
@@ -1023,7 +1023,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
            CALL check("h5aclose_f",error,total_error)
 
            ! /* Verify information for new attribute */
-              
+
 !EP        CALL attr_info_by_idx_check(my_dataset, attrname, INT(j,HSIZE_T), use_index(i), total_error )
            htmp = j
            CALL attr_info_by_idx_check(my_dataset, attrname, htmp, use_index(i), total_error )
@@ -1045,7 +1045,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
      !   /* Close file */
      CALL h5fclose_f(fid, error)
      CALL check("h5fclose_f",error,total_error)
-    
+
   END DO
 
   ! /* Close property list */
@@ -1071,7 +1071,7 @@ SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
   CHARACTER(LEN=*) :: attrname
   INTEGER(HSIZE_T) :: n
   LOGICAL :: use_index
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
@@ -1084,7 +1084,7 @@ SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
   ! /* Verify the information for first attribute, in increasing creation order */
   CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, hzero, &
        f_corder_valid, corder, cset, data_size, error)
-  
+
   CALL check("h5aget_info_by_idx_f",error,total_error)
   CALL verify("h5aget_info_by_idx_f",corder,0,total_error)
   ! /* Verify the information for new attribute, in increasing creation order */
@@ -1143,25 +1143,25 @@ SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error )
        f_corder_valid, corder, cset, data_size, error)
   CALL check("h5aget_info_by_idx_f",error,total_error)
   CALL VERIFY("h5aget_info_by_idx_f",corder,0,total_error)
-  
+
 !EP  CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
 
   ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
 
-  ! 1) call by passing an integer with the _hsize_t declaration 
+  ! 1) call by passing an integer with the _hsize_t declaration
 
   CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, 0_HSIZE_T, &
        f_corder_valid, corder, cset, data_size, error)
   CALL check("h5aget_info_by_idx_f",error,total_error)
   CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
-  
+
   ! 2) call by passing an integer with the INT(,hsize_t) declaration
 
   CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, INT(0,HSIZE_T), &
        f_corder_valid, corder, cset, data_size, error)
   CALL check("h5aget_info_by_idx_f",error,total_error)
-  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)  
-  
+  CALL VERIFY("h5aget_info_by_idx_f",corder,INT(n),total_error)
+
   ! 3) call by passing a variable with the attribute hsize_t
 
   CALL h5aget_info_by_idx_f(obj_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_DEC_F, hzero, &
@@ -1244,7 +1244,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
   CHARACTER(LEN=11) :: attrname2
 
   CHARACTER(LEN=1), PARAMETER :: chr1 = '.'
- 
+
   INTEGER :: u
   INTEGER, PARAMETER :: SPACE1_RANK = 3
   INTEGER, PARAMETER :: NX = 20
@@ -1301,7 +1301,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
         CALL H5Pset_shared_mesg_nindexes_f(my_fcpl,3,error)
 
         ! /* Make attributes > 500 bytes shared */
-        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error) 
+        CALL H5Pset_shared_mesg_index_f(my_fcpl, 0, H5O_SHMESG_ATTR_FLAG_F, 500,error)
         ! /* Make datatypes & dataspaces > 1 byte shared (i.e. all of them :-) */
         CALL H5Pset_shared_mesg_index_f(my_fcpl, 1, H5O_SHMESG_DTYPE_FLAG_F, 1,error)
         CALL H5Pset_shared_mesg_index_f(my_fcpl, 2,  H5O_SHMESG_SDSPACE_FLAG_F, 1,error)
@@ -1321,7 +1321,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
      ! /* Re-open file */
      CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error,fapl)
      CALL check("h5open_f",error,total_error)
-     
+
      ! /* Commit datatype to file */
      IF(test_shared.EQ.2) THEN
         CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F)
@@ -1366,16 +1366,16 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 !!$        is_dense = H5O_is_attr_dense_test(dataset2);
 !!$        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
      ! /* Add attributes to each dataset, until after converting to dense storage */
-     
+
 
      DO u = 0, (max_compact * 2) - 1
 
         ! /* Create attribute name */
         WRITE(chr2,'(I2.2)') u
         attrname = 'attr '//chr2
-        
+
         ! /* Alternate between creating "small" & "big" attributes */
- 
+
         IF(MOD(u+1,2).EQ.0)THEN
            ! /* Create "small" attribute on first dataset */
 
@@ -1412,13 +1412,13 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
            attr_integer_data(1) = u + 1
            CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
            CALL check("h5awrite_f",error,total_error)
-           
+
            !  Check refcount for attribute */
 !!$                ret = H5A_get_shared_rc_test(attr, &shared_refcount);
 !!$                CHECK(ret, FAIL, "H5A_get_shared_rc_test");
 !!$                VERIFY(shared_refcount, 1, "H5A_get_shared_rc_test");
         ENDIF
-  
+
         ! /* Close attribute */
         CALL h5aclose_f(attr, error)
         CALL check("h5aclose_f",error,total_error)
@@ -1444,7 +1444,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 !!$                VERIFY(is_shared, FALSE, "H5A_is_shared_test");
 !!$
            ! /* Write data into the attribute */
-           
+
            attr_integer_data(1) = u + 1
            data_dims(1) = 1
            CALL h5awrite_f(attr, attr_tid, attr_integer_data, data_dims, error)
@@ -1452,7 +1452,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
         ELSE
 
            ! /* Create "big" attribute on second dataset */
-           
+
            CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
            CALL check("h5acreate_f",error,total_error)
 
@@ -1467,7 +1467,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 !!$
 ! /* Write data into the attribute */
 
-           
+
            attr_integer_data(1) = u + 1
            data_dims(1) = 1
 !           CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
@@ -1493,7 +1493,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 
 
         ! /* Create new attribute name */
-        
+
         WRITE(chr2,'(I2.2)') u
         attrname2 = 'new attr '//chr2
 
@@ -1556,7 +1556,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 
 
         ! /* Change second dataset's attribute's name back to original */
-        
+
         CALL H5Arename_by_name_f(fid, DSET2_NAME, attrname2, attrname, error)
         CALL check("H5Arename_by_name_f",error,total_error)
 
@@ -1611,7 +1611,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
         ! /* Close attribute */
         CALL h5aclose_f(attr, error)
         CALL check("h5aclose_f",error,total_error)
-     
+
      ENDDO
 
      ! /* Close attribute's datatype */
@@ -1696,7 +1696,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   LOGICAL, INTENT(IN) :: new_format
@@ -1723,7 +1723,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
   INTEGER(HID_T) :: attr        !String Attribute identifier
   INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
 
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
@@ -1742,14 +1742,14 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
   INTEGER(SIZE_T) :: size
   CHARACTER(LEN=8) :: tmpname
   CHARACTER(LEN=1), PARAMETER :: chr1 = '.'
-  
+
   INTEGER :: idx_type
   INTEGER :: order
   INTEGER :: u     ! /* Local index variable */
   INTEGER :: Input1
   INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
   INTEGER :: minusone = -1
-  
+
   data_dims = 0
 
   ! /* Create dataspace for dataset & attributes */
@@ -1770,10 +1770,10 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
 
      ! /* Loop over operating in different orders */
      DO order = H5_ITER_INC_F, H5_ITER_DEC_F
-        
+
         ! /* Loop over using index for creation order value */
         DO i = 1, 2
-           
+
            ! /* Print appropriate test message */
 !!$           IF(idx_type .EQ. H5_INDEX_CRT_ORDER_F)THEN
 !!$              IF(order .EQ. H5_ITER_INC_F) THEN
@@ -1828,18 +1828,18 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
            ENDIF
 
            ! /* Create datasets */
-           
+
            CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dset1, error, dcpl )
            CALL check("h5dcreate_f2",error,total_error)
-           
+
            CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dset2, error, dcpl )
            CALL check("h5dcreate_f3",error,total_error)
-           
+
            CALL h5dcreate_f(fid, DSET3_NAME, H5T_NATIVE_CHARACTER, sid, dset3, error, dcpl )
            CALL check("h5dcreate_f4",error,total_error)
-           
+
            !   /* Work on all the datasets */
-           
+
            DO curr_dset = 0,NUM_DSETS-1
               SELECT CASE (curr_dset)
               CASE (0)
@@ -1851,44 +1851,44 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                  !     CASE DEFAULT
                  !        CALL HDassert(0.AND."Toomanydatasets!")
               END SELECT
-              
+
               ! /* Check on dataset's attribute storage status */
 !!$                is_empty = H5O_is_attr_empty_test(my_dataset);
 !!$                VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
 !!$                is_dense = H5O_is_attr_dense_test(my_dataset);
 !!$                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
-              
+
               ! /* Check for deleting non-existant attribute */
 !EP              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, 0_HSIZE_T,error, lapl_id=H5P_DEFAULT_F)
               CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, hzero,error, lapl_id=H5P_DEFAULT_F)
               CALL VERIFY("H5Adelete_by_idx_f",error,minusone,total_error)
-              
+
               !    /* Create attributes, up to limit of compact form */
               DO u = 0, max_compact - 1
                  ! /* Create attribute */
                  WRITE(chr2,'(I2.2)') u
                  attrname = 'attr '//chr2
-                 
+
                  CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
                  CALL check("h5acreate_f",error,total_error)
-                 
+
                  ! /* Write data into the attribute */
                  attr_integer_data(1) = u
                  data_dims(1) = 1
                  CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_integer_data, data_dims, error)
                  CALL check("h5awrite_f",error,total_error)
-                 
+
                  ! /* Close attribute */
                  CALL h5aclose_f(attr, error)
                  CALL check("h5aclose_f",error,total_error)
 
                  ! /* Verify information for new attribute */
                  CALL attr_info_by_idx_check(my_dataset, attrname, INT(u,HSIZE_T), use_index(i), total_error )
-                 
+
               ENDDO
 
 
-              
+
               !  /* Verify state of object */
 
 !!$                ret = H5O_num_attrs_test(my_dataset, &nattrs);
@@ -1902,7 +1902,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
               !/* Check for out of bound deletions */
               CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(u,HSIZE_T), error, lapl_id=H5P_DEFAULT_F)
               CALL VERIFY("H5Adelete_by_idx_f",error,minusone,total_error)
-               
+
            ENDDO
 
 
@@ -1917,18 +1917,18 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                  !     CASE DEFAULT
                  !        CALL HDassert(0.AND."Toomanydatasets!")
               END SELECT
-              
+
               ! /* Delete attributes from compact storage */
-              
+
               DO u = 0, max_compact - 2
-                 
+
                  ! /* Delete first attribute in appropriate order */
-                 
-                 
+
+
 !EP                 CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, error)
                  CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, hzero, error)
                  CALL check("H5Adelete_by_idx_f",error,total_error)
-                 
+
 
                  ! /* Verify the attribute information for first attribute in appropriate order */
                  ! HDmemset(&ainfo, 0, sizeof(ainfo));
@@ -1936,7 +1936,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
 !EP                 CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, 0_HSIZE_T, &
                  CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, hzero, &
                       f_corder_valid, corder, cset, data_size, error)
-                 
+
                  IF(new_format)THEN
                     IF(order.EQ.H5_ITER_INC_F)THEN
                        CALL VERIFY("H5Aget_info_by_idx_f",corder,u + 1,total_error)
@@ -1944,7 +1944,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                  ELSE
                     CALL VERIFY("H5Aget_info_by_idx_f",corder, max_compact-(u + 2),total_error)
                  ENDIF
-                 
+
                    ! /* Verify the name for first attribute in appropriate order */
                    ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
 
@@ -1969,14 +1969,14 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
               CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, hzero, error)
               CALL check("H5Adelete_by_idx_f",error,total_error)
 
-                
+
               ! /* Verify state of attribute storage (empty) */
 !!$                is_empty = H5O_is_attr_empty_test(my_dataset);
 !!$                VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
            ENDDO
 
 !   /* Work on all the datasets */
-           
+
            DO curr_dset = 0,NUM_DSETS-1
               SELECT CASE (curr_dset)
               CASE (0)
@@ -1996,7 +1996,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                  ! /* Create attribute */
                  WRITE(chr2,'(I2.2)') u
                  attrname = 'attr '//chr2
-                 
+
                  CALL h5acreate_f(my_dataset, attrname, H5T_NATIVE_INTEGER, sid, attr, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
                  CALL check("h5acreate_f",error,total_error)
 
@@ -2067,7 +2067,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                  CALL H5Adelete_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), error)
                  CALL check("H5Adelete_by_idx_f",error,total_error)
                  ! /* Verify the attribute information for first attribute in appropriate order */
-                 
+
                  CALL h5aget_info_by_idx_f(my_dataset, ".", idx_type, order, INT(0,HSIZE_T), &
                       f_corder_valid, corder, cset, data_size, error)
                  IF(new_format)THEN
@@ -2081,7 +2081,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                  ! /* Verify the name for first attribute in appropriate order */
                  ! HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE);
 
-                 size = 7 ! *CHECK* if not the correct size 
+                 size = 7 ! *CHECK* if not the correct size
                  CALL h5aget_name_by_idx_f(my_dataset, ".", idx_type, order,INT(0,hsize_t), &
                       tmpname, error, size)
 
@@ -2089,12 +2089,12 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
                     WRITE(chr2,'(I2.2)') u + 1
                     attrname = 'attr '//chr2
                  ELSE
-                    WRITE(chr2,'(I2.2)') max_compact * 2 - (u + 2) 
+                    WRITE(chr2,'(I2.2)') max_compact * 2 - (u + 2)
                     attrname = 'attr '//chr2
                  ENDIF
                  IF(TRIM(attrname).NE.TRIM(tmpname)) error = -1
                  CALL VERIFY("h5aget_name_by_idx_f",error,0,total_error)
-                 
+
 
               ENDDO
               ! /* Delete last attribute */
@@ -2117,7 +2117,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
            CALL check("h5dclose_f",error,total_error)
            CALL h5dclose_f(dset3, error)
            CALL check("h5dclose_f",error,total_error)
-           
+
            !   /* Close file */
            CALL h5fclose_f(fid, error)
            CALL check("h5fclose_f",error,total_error)
@@ -2145,7 +2145,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   INTEGER(HID_T), INTENT(IN) :: fcpl
@@ -2179,7 +2179,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
   CHARACTER(LEN=7) :: attrname
 
   CHARACTER(LEN=1), PARAMETER :: chr1 = '.'
-  
+
   INTEGER :: u
   INTEGER, PARAMETER :: SPACE1_RANK = 3
   INTEGER, PARAMETER :: NX = 20
@@ -2209,7 +2209,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
   ! /* Loop over type of shared components */
 
   DO test_shared = 0, 2
-     
+
      ! /* Make copy of file creation property list */
 
      CALL H5Pcopy_f(fcpl, my_fcpl, error)
@@ -2271,7 +2271,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 
      CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, dcpl_id=dcpl )
      CALL check("h5dcreate_f",error,total_error)
-           
+
      CALL h5dcreate_f(fid, DSET2_NAME, H5T_NATIVE_CHARACTER, sid, dataset2, error, dcpl_id=dcpl )
      CALL check("h5dcreate_f",error,total_error)
 
@@ -2303,13 +2303,13 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 !!$        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
 !!$
      ! /* Add attributes to each dataset, until after converting to dense storage */
-     
+
      DO u = 0, (max_compact * 2) - 1
 
         ! /* Create attribute name */
         WRITE(chr2,'(I2.2)') u
         attrname = 'attr '//chr2
-        
+
         ! /* Alternate between creating "small" & "big" attributes */
 
         IF(MOD(u+1,2).EQ.0)THEN
@@ -2387,7 +2387,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
         ELSE
 
            ! /* Create "big" attribute on second dataset */
-           
+
            CALL h5acreate_f(dataset2, attrname, attr_tid, big_sid, attr, error, acpl_id=H5P_DEFAULT_F, aapl_id=H5P_DEFAULT_F)
            CALL check("h5acreate_f",error,total_error)
 
@@ -2402,7 +2402,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 !!$
 ! /* Write data into the attribute */
 
-           
+
            attr_integer_data(1) = u + 1
            data_dims(1) = 1
            CALL h5awrite_f(attr,  attr_tid, attr_integer_data, data_dims, error)
@@ -2469,7 +2469,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
      ENDDO
 
      ! /* Close attribute's datatype */
-     
+
      CALL h5tclose_f(attr_tid, error)
      CALL check("h5tclose_f",error,total_error)
 
@@ -2556,7 +2556,7 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 !****************************************************************/
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   INTEGER(HID_T), INTENT(IN) :: fcpl
@@ -2618,7 +2618,7 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
   CALL check("H5Pset_attr_creation_order",error,total_error)
 
   ! /* Create a dataset */
-     
+
   CALL h5dcreate_f(fid, DSET1_NAME, H5T_NATIVE_CHARACTER, sid, dataset, error, &
        lcpl_id=H5P_DEFAULT_F, dcpl_id=dcpl, dapl_id=H5P_DEFAULT_F)
   CALL check("h5dcreate_f",error,total_error)
@@ -2647,7 +2647,7 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 
      ! /* Write data into the attribute */
 
-     data_dims(1) = 1 
+     data_dims(1) = 1
      CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
      CALL check("h5awrite_f",error,total_error)
 
@@ -2666,7 +2666,7 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 
 !    /* Add one more attribute, to push into "dense" storage */
 !    /* Create attribute */
-  
+
   WRITE(chr2,'(I2.2)') u
   attrname = 'attr '//chr2
 
@@ -2677,9 +2677,9 @@ SUBROUTINE test_attr_dense_open( fcpl, fapl, total_error)
 !!$    is_dense = H5O_is_attr_dense_test(dataset);
 !!$    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
 
-  
+
   ! /* Write data into the attribute */
-  data_dims(1) = 1 
+  data_dims(1) = 1
   CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, u, data_dims, error)
   CALL check("h5awrite_f",error,total_error)
 
@@ -2724,7 +2724,7 @@ END SUBROUTINE test_attr_dense_open
 SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   INTEGER(HID_T), INTENT(IN) :: loc_id
@@ -2739,7 +2739,7 @@ SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
   CHARACTER(LEN=ATTR_NAME_LEN) :: check_name
   INTEGER(HSIZE_T), DIMENSION(7) :: data_dims
 
-  INTEGER(HID_T) :: attr        !String Attribute identifier 
+  INTEGER(HID_T) :: attr        !String Attribute identifier
   INTEGER :: error
   INTEGER :: value
 
@@ -2785,7 +2785,7 @@ SUBROUTINE test_attr_dense_verify(loc_id, max_attr, total_error)
           attr, error, aapl_id=H5P_DEFAULT_F)
 
      ! /* Verify Name */
-     
+
      WRITE(chr2,'(I2.2)') u
      attrname = 'attr '//chr2
 
@@ -2819,7 +2819,7 @@ END SUBROUTINE test_attr_dense_verify
 SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   INTEGER(HID_T), INTENT(IN) :: fcpl
@@ -2849,7 +2849,7 @@ SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
   ! /* Create dataset creation property list */
   CALL H5Pcreate_f(H5P_DATASET_CREATE_F,dcpl,error)
   CALL check("h5Pcreate_f",error,total_error)
-  
+
   ! /* Get creation order indexing on object */
   CALL H5Pget_attr_creation_order_f(dcpl, crt_order_flags, error)
   CALL check("H5Pget_attr_creation_order_f",error,total_error)
@@ -2919,11 +2919,11 @@ SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
   ! /* Close property list */
   CALL h5pclose_f(dcpl, error)
   CALL check("h5pclose_f",error,total_error)
-  
+
   ! /* Close Dataset */
   CALL h5dclose_f(dataset, error)
   CALL check("h5dclose_f",error,total_error)
-  
+
   ! /* Close file */
   CALL h5fclose_f(fid, error)
   CALL check("h5fclose_f",error,total_error)
@@ -2941,7 +2941,7 @@ END SUBROUTINE test_attr_corder_create_basic
 SUBROUTINE test_attr_basic_write(fapl, total_error)
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   INTEGER(HID_T), INTENT(IN) :: fapl
@@ -2962,11 +2962,11 @@ SUBROUTINE test_attr_basic_write(fapl, total_error)
   CHARACTER(LEN=25) :: check_name
   CHARACTER(LEN=18) :: chr_exact_size
 
-  INTEGER, PARAMETER :: SPACE1_RANK = 2 
+  INTEGER, PARAMETER :: SPACE1_RANK = 2
 
   CHARACTER(LEN=5), PARAMETER ::  ATTR1_NAME="Attr1"
-  INTEGER, PARAMETER :: ATTR1_RANK = 1 
-  INTEGER, PARAMETER ::  ATTR1_DIM1 = 3 
+  INTEGER, PARAMETER :: ATTR1_RANK = 1
+  INTEGER, PARAMETER ::  ATTR1_DIM1 = 3
   CHARACTER(LEN=7), PARAMETER :: ATTR1A_NAME ="Attr1_a"
   CHARACTER(LEN=18), PARAMETER :: ATTR_TMP_NAME = "Attr1_a-1234567890"
   INTEGER, DIMENSION(ATTR1_DIM1) :: attr_data1
@@ -3021,7 +3021,7 @@ SUBROUTINE test_attr_basic_write(fapl, total_error)
   CALL H5Gopen_f(fid1, "/", group, error, H5P_DEFAULT_F)
   CALL check("H5Gopen_f",error,total_error)
 
-  ! /* Open attribute again */  
+  ! /* Open attribute again */
   CALL h5aopen_f(group,  ATTR1_NAME, attr, error)
   CALL check("h5aopen_f",error,total_error)
 
@@ -3038,7 +3038,7 @@ SUBROUTINE test_attr_basic_write(fapl, total_error)
   CALL check("h5acreate_f",error,total_error)
 
   ! /* Write attribute information */
-  
+
   CALL h5awrite_f(attr, H5T_NATIVE_INTEGER, attr_data1, dimsa, error)
   CALL check("h5awrite_f",error,total_error)
 
@@ -3144,7 +3144,7 @@ END SUBROUTINE test_attr_basic_write
 SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error)
 
   USE HDF5
-  
+
   IMPLICIT NONE
 
   LOGICAL, INTENT(IN) :: new_format
@@ -3188,7 +3188,7 @@ SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error)
 
   ! /* Create group for attributes */
 
-  CALL H5Gcreate_f(fid, GROUP1_NAME, gid, error) 
+  CALL H5Gcreate_f(fid, GROUP1_NAME, gid, error)
   CALL check("H5Gcreate_f", error, total_error)
 
   ! /* Create many attributes */
@@ -3266,7 +3266,7 @@ END SUBROUTINE test_attr_many
 SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
 
   USE HDF5
-  
+
   IMPLICIT NONE
   INTEGER(HID_T), INTENT(IN) :: fid
   CHARACTER(LEN=*), INTENT(IN) :: dsetname
@@ -3278,7 +3278,7 @@ SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
   CHARACTER (LEN=8) :: attrname
   INTEGER, PARAMETER :: NUM_DSETS = 3
   INTEGER :: error
-  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! indicates the size, in the number of characters
@@ -3293,14 +3293,14 @@ SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
 
      WRITE(chr2,'(I2.2)') u
      attrname = 'attr '//chr2
-     
-     
+
+
      CALL h5aopen_f(obj_id, attrname, attr_id, error)
      CALL check("h5aopen_f",error,total_error)
 
 
      ! /* Get the attribute's information */
-     
+
      CALL h5aget_info_f(attr_id, f_corder_valid, corder, cset, data_size,  error)
      CALL check("h5aget_info_f",error,total_error)
 
@@ -3310,7 +3310,7 @@ SUBROUTINE attr_open_check(fid, dsetname, obj_id, max_attrs, total_error )
      CALL VERIFY("h5aget_info_f.cset", cset, H5T_CSET_ASCII_F, total_error)
      CALL h5aget_storage_size_f(attr_id, storage_size, error)
      CALL check("h5aget_storage_size_f",error,total_error)
-     
+
      CALL VERIFY("h5aget_info_f.data_size", INT(data_size), INT(storage_size), total_error)
 
 
diff --git a/fortran/test/tH5D.f90 b/fortran/test/tH5D.f90
index e704db2..56e82f4 100644
--- a/fortran/test/tH5D.f90
+++ b/fortran/test/tH5D.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,10 +11,10 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing Dataset Interface functionality.
 !
 !
@@ -23,20 +23,20 @@
 !    h5dread_f, and h5dwrite_f
 !
         SUBROUTINE datasettest(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           CHARACTER(LEN=5), PARAMETER :: filename = "dsetf" ! File name
-          CHARACTER(LEN=80) :: fix_filename 
+          CHARACTER(LEN=80) :: fix_filename
           CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
           CHARACTER(LEN=9), PARAMETER :: null_dsetname = "null_dset"     ! Dataset name
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-          INTEGER(HID_T) :: null_dset     ! Null dataset identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
+          INTEGER(HID_T) :: null_dset     ! Null dataset identifier
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
           INTEGER(HID_T) :: null_dspace   ! Null dataspace identifier
           INTEGER(HID_T) :: dtype_id      ! Datatype identifier
@@ -65,7 +65,7 @@
 
           !
           ! Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -75,12 +75,12 @@
               CALL check("h5fcreate_f", error, total_error)
 
 
-          ! 
+          !
           ! Create the dataspace.
           !
           CALL h5screate_simple_f(rank, dims, dspace_id, error)
               CALL check("h5screate_simple_f", error, total_error)
-          ! 
+          !
           ! Create null dataspace.
           !
           CALL h5screate_f(H5S_NULL_F, null_dspace, error)
@@ -94,7 +94,7 @@
                            dset_id, error)
               CALL check("h5dcreate_f", error, total_error)
           !
-          ! Create the null dataset. 
+          ! Create the null dataset.
           !
           CALL h5dcreate_f(file_id, null_dsetname, H5T_NATIVE_INTEGER, null_dspace, &
                            null_dset, error)
@@ -104,20 +104,20 @@
           ! Write the dataset.
           !
           data_dims(1) = 4
-          data_dims(2) = 6 
+          data_dims(2) = 6
           CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
               CALL check("h5dwrite_f", error, total_error)
           !
           ! Write null dataset.  Nothing can be written.
-          !    
-          null_data_dim(1) = 1 
+          !
+          null_data_dim(1) = 1
           CALL h5dwrite_f(null_dset, H5T_NATIVE_INTEGER, null_dset_data, null_data_dim, error)
               CALL check("h5dwrite_f", error, total_error)
 
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
           CALL h5dclose_f(null_dset, error)
@@ -131,7 +131,7 @@
           CALL h5sclose_f(null_dspace, error)
               CALL check("h5sclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
@@ -144,7 +144,7 @@
               CALL check("h5fopen_f", error, total_error)
 
           !
-          ! Open the existing dataset. 
+          ! Open the existing dataset.
           !
           CALL h5dopen_f(file_id, dsetname, dset_id, error)
               CALL check("h5dopen_f", error, total_error)
@@ -152,13 +152,13 @@
               CALL check("h5dopen_f", error, total_error)
 
           !
-          ! Get the dataset type. 
+          ! Get the dataset type.
           !
           CALL h5dget_type_f(dset_id, dtype_id, error)
               CALL check("h5dget_type_f", error, total_error)
 
           !
-          ! Get the data space. 
+          ! Get the data space.
           !
           CALL h5dget_space_f(dset_id, dspace_id, error)
               CALL check("h5dget_space_f", error, total_error)
@@ -176,26 +176,26 @@
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, 4
               do j = 1, 6
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN 
+                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
                       write(*, *) "dataset test error occured"
                       write(*,*) "data read is not the same as the data writen"
                   END IF
-              end do    
+              end do
           end do
 
           !
           ! Check if no change to null_dset_data
           !
-          IF (null_dset_data .NE. 1) THEN 
+          IF (null_dset_data .NE. 1) THEN
               write(*, *) "null dataset test error occured"
           END IF
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
           CALL h5dclose_f(null_dset, error)
@@ -212,14 +212,14 @@
           !
           CALL h5tclose_f(dtype_id, error)
               CALL check("h5tclose_f", error, total_error)
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f", error, total_error)
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
-     
+
           RETURN
         END SUBROUTINE datasettest
 
@@ -228,11 +228,11 @@
 !
 
         SUBROUTINE extenddsettest(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           !
           !the dataset is stored in file "extf.h5"
@@ -250,11 +250,11 @@
           !
           INTEGER :: RANK = 2
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-          INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-          INTEGER(HID_T) :: memspace      ! memory Dataspace identifier 
-          INTEGER(HID_T) :: crp_list        ! dataset creatation property identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
+          INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+          INTEGER(HID_T) :: memspace      ! memory Dataspace identifier
+          INTEGER(HID_T) :: crp_list        ! dataset creatation property identifier
 
           !
           !dataset dimensions at creation time
@@ -262,44 +262,44 @@
           INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/3,3/)
 
           !
-          !data dimensions 
+          !data dimensions
           !
           INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/10,3/)
 
           !
           !Maximum dimensions
           !
-          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims 
+          INTEGER(HSIZE_T), DIMENSION(2) :: maxdims
 
           !
-          !data arrays for reading and writing 
+          !data arrays for reading and writing
           !
           INTEGER, DIMENSION(10,3) :: data_in, data_out
 
           !
-          !Size of data in the file 
+          !Size of data in the file
           !
           INTEGER(HSIZE_T), DIMENSION(2) :: size
 
           !
-          !general purpose integer 
+          !general purpose integer
           !
           INTEGER :: i, j
 
           !
-          !flag to check operation success 
+          !flag to check operation success
           !
-          INTEGER :: error 
+          INTEGER :: error
 
           !
           !Variables used in reading data back
-          !  
+          !
           INTEGER(HSIZE_T), DIMENSION(2) :: dimsr, maxdimsr
           INTEGER :: rankr
           INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
 
           !
-          !data initialization 
+          !data initialization
           !
           do i = 1, 10
              do j = 1, 3
@@ -310,12 +310,12 @@
           !
           !Initialize FORTRAN predifined datatypes
           !
-!          CALL h5init_types_f(error) 
+!          CALL h5init_types_f(error)
 !               CALL check("h5init_types_f",error,total_error)
 
           !
           !Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -361,8 +361,8 @@
           !
           !Extend the dataset. Dataset becomes 10 x 3.
           !
-          size(1)   = 10;  
-          size(2)   = 3; 
+          size(1)   = 10;
+          size(2)   = 3;
           CALL h5dextend_f(dset_id, size, error)
               CALL check("h5dextend_f",error,total_error)
 
@@ -451,7 +451,7 @@
               CALL check("h5screate_simple_f",error,total_error)
 
           !
-          !Read data 
+          !Read data
           !
           CALL H5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
                     memspace, dataspace)
@@ -460,14 +460,14 @@
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, dims1(1)
               do j = 1, dims1(2)
-                  IF (data_out(i,j) .NE. data_in(i, j)) THEN 
+                  IF (data_out(i,j) .NE. data_in(i, j)) THEN
                       write(*, *) "extend dataset test error occured"
                       write(*, *) "read value is not the same as the written values"
                   END IF
-              end do    
+              end do
           end do
 
           !
@@ -503,6 +503,6 @@
               CALL check("h5_cleanup_f", error, total_error)
 
           RETURN
-        END SUBROUTINE extenddsettest 
+        END SUBROUTINE extenddsettest
 
 
diff --git a/fortran/test/tH5E.f90 b/fortran/test/tH5E.f90
index 7bd2402..a4912bd 100644
--- a/fortran/test/tH5E.f90
+++ b/fortran/test/tH5E.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,35 +11,35 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE error_report_test(cleanup, total_error)
 
 !   This subroutine tests following functionalities: h5eprint_f
 
-   USE HDF5 ! This module contains all necessary modules 
+   USE HDF5 ! This module contains all necessary modules
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
      CHARACTER(LEN=6), PARAMETER :: filename = "etestf" ! File name
      CHARACTER(LEN=80) :: fix_filename
      CHARACTER(LEN=8), PARAMETER :: err_filename = "err_file"! Error output file
      CHARACTER(LEN=80)  :: fix_err_filename
-          
-          
+
+
 
      INTEGER(HID_T) :: file_id       ! File identifier
      INTEGER(HID_T) :: grp_id        ! Group identifier
      INTEGER :: error, tmp_error, err_flag
-      
-     err_flag = 0 
+
+     err_flag = 0
      CALL h5eset_auto_f(err_flag, error)
      CALL check("h5eprint_f",error, total_error)
      !
      ! Create a new file using default properties.
-     ! 
+     !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -47,7 +47,7 @@
           endif
      CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL check("h5fcreate_f",error,total_error)
-     
+
      !
      ! Try to open non-existing group in the file.
      ! Error message should go to the err_file_name file.
@@ -61,8 +61,8 @@
      CALL h5eprint_f(error, fix_err_filename)
      CALL h5gopen_f(file_id, "Doesnotexist2", grp_id, tmp_error)
      CALL h5eprint_f(error, fix_err_filename)
-    
-     ! 
+
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90
index 859d66e..4787799 100644
--- a/fortran/test/tH5F.f90
+++ b/fortran/test/tH5F.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,27 +11,27 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing File Interface functionality.
 !
-!    In the mountingtest subroutine we create one file with a group in it, 
+!    In the mountingtest subroutine we create one file with a group in it,
 !    and another file with a dataset. Mounting is used to
-!    access the dataset from the second file as a member of a group 
-!    in the first file. 
+!    access the dataset from the second file as a member of a group
+!    in the first file.
 !
         SUBROUTINE mountingtest(cleanup, total_error)
         USE HDF5  ! This module contains all necessary modules
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           !
           !the respective filename is "mount1.h5" and "mount2.h5"
           !
-          CHARACTER(LEN=6)  :: filename1 
+          CHARACTER(LEN=6)  :: filename1
           CHARACTER(LEN=6)  :: filename2
           CHARACTER(LEN=80) :: fix_filename1
           CHARACTER(LEN=80) :: fix_filename2
@@ -46,12 +46,12 @@
           !
           ! File identifiers
           !
-          INTEGER(HID_T) :: file1_id, file2_id  
+          INTEGER(HID_T) :: file1_id, file2_id
 
           !
           ! Group identifier
           !
-          INTEGER(HID_T) :: gid 
+          INTEGER(HID_T) :: gid
 
           !
           ! dataset identifier
@@ -68,29 +68,29 @@
           !
           INTEGER(HID_T) :: dtype_id
 
-          ! 
+          !
           !The dimensions for the dataset.
           !
           INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
-   
+
           !
           !return value for testing whether a file is in hdf5 format
           !
           LOGICAL     ::  status
 
           !
-          !flag to check operation success 
-          !         
+          !flag to check operation success
+          !
           INTEGER     ::   error
 
           !
-          !general purpose integer 
-          !         
+          !general purpose integer
+          !
           INTEGER     ::   i, j
 
           !
-          !data buffers 
-          !         
+          !data buffers
+          !
           INTEGER, DIMENSION(NX,NY) :: data_in, data_out
 
           INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
@@ -114,26 +114,26 @@
           ! Fix names of the files
           !
           CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
-          if(error .ne. 0) stop 
+          if(error .ne. 0) stop
           CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
-          if(error .ne. 0) stop 
+          if(error .ne. 0) stop
 
           !
           !Create first file "mount1.h5" using default properties.
-          ! 
+          !
           CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
                CALL check("h5fcreate_f",error,total_error)
-        
+
 
           !
           !Create group "/G" inside file "mount1.h5".
-          ! 
+          !
           CALL h5gcreate_f(file1_id, "/G", gid, error)
                CALL check("h5gcreate_f",error,total_error)
 
           !
           !close file and group identifiers.
-          ! 
+          !
           CALL h5gclose_f(gid, error)
                CALL check("h5gclose_f",error,total_error)
           CALL h5fclose_f(file1_id, error)
@@ -141,19 +141,19 @@
 
           !
           !Create second file "mount2.h5" using default properties.
-          ! 
+          !
           CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
                CALL check("h5fcreate_f",error,total_error)
 
           !
-          !Create data space for the dataset. 
+          !Create data space for the dataset.
           !
           CALL h5screate_simple_f(RANK, dims, dataspace, error)
                CALL check("h5screate_simple_f",error,total_error)
 
           !
           !Create dataset "/D" inside file "mount2.h5".
-          ! 
+          !
           CALL h5dcreate_f(file2_id, "/D", H5T_NATIVE_INTEGER, dataspace, &
                dset_id, error)
               CALL check("h5dcreate_f",error,total_error)
@@ -168,7 +168,7 @@
 
           !
           !close file, dataset and dataspace identifiers.
-          ! 
+          !
           CALL h5sclose_f(dataspace, error)
               CALL check("h5sclose_f",error,total_error)
           CALL h5dclose_f(dset_id, error)
@@ -195,7 +195,7 @@
 
           !
           !reopen both files.
-          ! 
+          !
           CALL h5fopen_f (fix_filename1, H5F_ACC_RDWR_F, file1_id, error)
               CALL check("hfopen_f",error,total_error)
           CALL h5fopen_f (fix_filename2, H5F_ACC_RDWR_F, file2_id, error)
@@ -203,44 +203,44 @@
 
           !
           !mount the second file under the first file's "/G" group.
-          ! 
+          !
           CALL h5fmount_f (file1_id, "/G", file2_id, error)
               CALL check("h5fmount_f",error,total_error)
 
 
           !
           !Access dataset D in the first file under /G/D name.
-          ! 
+          !
           CALL h5dopen_f(file1_id, "/G/D", dset_id, error)
               CALL check("h5dopen_f",error,total_error)
 
           !
           !Get dataset's data type.
-          ! 
+          !
           CALL h5dget_type_f(dset_id, dtype_id, error)
               CALL check("h5dget_type_f",error,total_error)
 
           !
           !Read the dataset.
-          ! 
+          !
           CALL h5dread_f(dset_id, dtype_id, data_out, data_dims, error)
               CALL check("h5dread_f",error,total_error)
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, NX
               do j = 1, NY
-                  IF (data_out(i,j) .NE. data_in(i, j)) THEN 
+                  IF (data_out(i,j) .NE. data_in(i, j)) THEN
                       write(*, *) "mounting test error occured"
                   END IF
-              end do    
+              end do
           end do
 
 
           !
           !Close dset_id and dtype_id.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f",error,total_error)
           CALL h5tclose_f(dtype_id, error)
@@ -248,13 +248,13 @@
 
           !
           !unmount the second file.
-          ! 
+          !
           CALL h5funmount_f(file1_id, "/G", error);
               CALL check("h5funmount_f",error,total_error)
 
           !
           !Close both files.
-          ! 
+          !
           CALL h5fclose_f(file1_id, error)
               CALL check("h5fclose_f",error,total_error)
           CALL h5fclose_f(file2_id, error)
@@ -269,27 +269,27 @@
 
 !
 !    The following subroutine tests h5freopen_f.
-!    It creates the file which has name "reopen.h5" and 
+!    It creates the file which has name "reopen.h5" and
 !    the "/dset" dataset inside the file.
 !    writes the data to the file, close the dataset.
-!    Reopen the file based upon the file_id, open the 
-!    dataset use the reopen_id then reads the 
+!    Reopen the file based upon the file_id, open the
+!    dataset use the reopen_id then reads the
 !    dataset back to memory to test whether the data
-!    read is identical to the data written  
+!    read is identical to the data written
 !
 
         SUBROUTINE reopentest(cleanup, total_error)
         USE HDF5  ! This module contains all necessary modules
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
-     
+          INTEGER, INTENT(OUT) :: total_error
+
           !
           CHARACTER(LEN=6), PARAMETER :: filename = "reopen"
-          CHARACTER(LEN=80)  :: fix_filename 
+          CHARACTER(LEN=80)  :: fix_filename
 
-          INTEGER(HID_T) :: file_id, reopen_id  ! File identifiers 
-          INTEGER(HID_T) :: dset_id             ! Dataset identifier 
+          INTEGER(HID_T) :: file_id, reopen_id  ! File identifiers
+          INTEGER(HID_T) :: dset_id             ! Dataset identifier
 
           !
           !dataset name is "dset"
@@ -308,30 +308,30 @@
           !
           INTEGER(HID_T) :: dataspace
 
-          ! 
+          !
           !The dimensions for the dataset.
           !
           INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/NX,NY/)
 
           !
           !flag to check operation success
-          !          
+          !
           INTEGER     ::   error
 
           !
           !general purpose integer
-          !          
+          !
           INTEGER     ::  i, j
 
           !
-          !array to store data 
+          !array to store data
           !
           INTEGER, DIMENSION(4,6) :: dset_data, data_out
           INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
           INTEGER(HSIZE_T)  :: file_size
           CHARACTER(LEN=80) :: file_name
           INTEGER(SIZE_T) :: name_size
-     
+
           !
           !initialize the dset_data array which will be written to the "/dset"
           !
@@ -344,13 +344,13 @@
           !
           !Initialize FORTRAN predifined datatypes
           !
-!          CALL h5init_types_f(error) 
+!          CALL h5init_types_f(error)
 !               CALL check("h5init_types_f",error,total_error)
 
 
           !
           !Create file "reopen.h5" using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -360,14 +360,14 @@
                CALL check("h5fcreate_f",error,total_error)
 
           !
-          !Create data space for the dataset. 
+          !Create data space for the dataset.
           !
           CALL h5screate_simple_f(RANK, dims, dataspace, error)
                CALL check("h5screate_simple_f",error,total_error)
 
           !
           !Create dataset "/dset" inside the file .
-          ! 
+          !
           CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
                dset_id, error)
               CALL check("h5dcreate_f",error,total_error)
@@ -393,7 +393,7 @@
               CALL check("h5sclose_f",error,total_error)
 
          !
-         !Reopen file dsetf.h5. 
+         !Reopen file dsetf.h5.
          !
          CALL h5freopen_f(file_id, reopen_id, error)
               CALL check("h5freopen_f",error,total_error)
@@ -404,7 +404,7 @@
               CALL check("h5fget_filesize_f",error,total_error)
 
          !
-         !Open the dataset based on the reopen_id. 
+         !Open the dataset based on the reopen_id.
          !
          CALL h5dopen_f(reopen_id, dsetname, dset_id, error)
               CALL check("h5dopen_f",error,total_error)
@@ -415,7 +415,7 @@
               CALL check("h5fget_name_f",error,total_error)
               IF(file_name(1:name_size) .NE. fix_filename(1:name_size)) THEN
                  write(*,*) "file name obtained from the dataset id is incorrect"
-              END IF 
+              END IF
 
          !
          !Read the dataset.
@@ -425,13 +425,13 @@
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, NX
               do j = 1, NY
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN 
+                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
                       write(*, *) "reopen test error occured"
                   END IF
-              end do    
+              end do
           end do
 
 
@@ -448,7 +448,7 @@
               CALL check("h5fclose_f",error,total_error)
          CALL h5fclose_f(reopen_id, error)
               CALL check("h5fclose_f",error,total_error)
-     
+
 
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
@@ -462,13 +462,13 @@
 !    We first create a file using the default creation and access property
 !    list. Then, the file was closed and reopened. We then get the
 !    creation and access property lists of the first file. The second file is
-!    created using the got property lists 
+!    created using the got property lists
 
         SUBROUTINE plisttest(cleanup, total_error)
          USE HDF5  ! This module contains all necessary modules
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           !
           !file names are "plist1.h5" and "plist2.h5"
@@ -482,12 +482,12 @@
           INTEGER(HID_T) :: prop_id    ! File creation property list identifier
           INTEGER(HID_T) :: access_id  ! File Access property list identifier
 
-          !flag to check operation success          
+          !flag to check operation success
           INTEGER     ::   error
 
           !
           !Create a file1 using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify file name"
@@ -540,7 +540,7 @@
               CALL check("h5pclose_f",error,total_error)
           CALL h5pclose_f(access_id, error)
               CALL check("h5pclose_f",error,total_error)
-          
+
           !
           !Terminate access to the files.
           !
@@ -557,8 +557,8 @@
           RETURN
 
         END SUBROUTINE plisttest
-              
-     
+
+
 !
 !    The following subroutine tests h5pget(set)_fclose_degree_f
 !
@@ -567,21 +567,21 @@
         USE HDF5  ! This module contains all necessary modules
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
           INTEGER              :: error
-     
+
           !
           CHARACTER(LEN=10), PARAMETER :: filename = "file_close"
-          CHARACTER(LEN=80)  :: fix_filename 
+          CHARACTER(LEN=80)  :: fix_filename
 
-          INTEGER(HID_T) :: fid, fid_d, fid1, fid2, fid3  ! File identifiers 
+          INTEGER(HID_T) :: fid, fid_d, fid1, fid2, fid3  ! File identifiers
           INTEGER(HID_T) :: fapl, fapl1, fapl2, fapl3 ! File access identifiers
           INTEGER(HID_T) :: fid_d_fapl, fid1_fapl     ! File access identifiers
           LOGICAL        :: flag
           INTEGER        :: obj_count, obj_countf
           INTEGER(HID_T), ALLOCATABLE, DIMENSION(:) :: obj_ids
           INTEGER        :: i
-          
+
           CALL h5eset_auto_f(0, error)
 
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
@@ -652,7 +652,7 @@
                  total_error = total_error + 1
                  write(*,*) "Wrong number of open objects reported, error"
                endif
-          allocate(obj_ids(obj_countf), stat = error) 
+          allocate(obj_ids(obj_countf), stat = error)
           CALL h5fget_obj_ids_f(fid, H5F_OBJ_FILE_F, obj_countf, obj_ids, error)
                CALL check("h5fget_obj_ids_f",error,total_error)
           if(error .eq. 0) then
@@ -661,22 +661,22 @@
                          CALL check("h5fclose_f",error,total_error)
              enddo
           endif
-          
+
           CALL h5fclose_f(fid, error)
               if(error .eq. 0) then
                  total_error = total_error + 1
                  write(*,*) "File should be closed at this point, error"
-              endif 
+              endif
           CALL h5fclose_f(fid1, error)
               if(error .eq. 0) then
                  total_error = total_error + 1
                  write(*,*) "File should be closed at this point, error"
-              endif 
+              endif
           CALL h5fclose_f(fid_d, error)
               if(error .eq. 0) then
                  total_error = total_error + 1
                  write(*,*) "File should be closed at this point, error"
-              endif 
+              endif
 
           if(cleanup) then
               CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
@@ -685,7 +685,7 @@
           deallocate(obj_ids)
           RETURN
 
-        END SUBROUTINE file_close 
+        END SUBROUTINE file_close
 
 !
 !    The following subroutine tests h5fget_freespace_f
@@ -695,18 +695,18 @@
         USE HDF5  ! This module contains all necessary modules
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
           INTEGER              :: error
-     
+
           !
           CHARACTER(LEN=10), PARAMETER :: filename = "file_space"
           CHARACTER(LEN=3), PARAMETER :: grpname = "grp"
-          CHARACTER(LEN=80)  :: fix_filename 
+          CHARACTER(LEN=80)  :: fix_filename
 
-          INTEGER(HID_T) :: fid ! File identifiers 
+          INTEGER(HID_T) :: fid ! File identifiers
           INTEGER(HSSIZE_T) :: free_space
-          INTEGER(HID_T) :: group_id      ! Group identifier 
-          
+          INTEGER(HID_T) :: group_id      ! Group identifier
+
           CALL h5eset_auto_f(0, error)
 
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
@@ -731,7 +731,7 @@
           ! Close group
           CALL h5gclose_f(group_id, error)
           CALL check("h5gclose_f", error, total_error)
-          
+
           ! Check the free space now
           CALL h5fget_freespace_f(fid, free_space, error)
                CALL check("h5fget_freespace_f",error,total_error)
@@ -759,7 +759,7 @@
               CALL check("h5_cleanup_f", error, total_error)
           RETURN
 
-        END SUBROUTINE file_space 
+        END SUBROUTINE file_space
 
 
 
diff --git a/fortran/test/tH5G.f90 b/fortran/test/tH5G.f90
index e0270a9..300e538 100644
--- a/fortran/test/tH5G.f90
+++ b/fortran/test/tH5G.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,46 +11,46 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE group_test(cleanup, total_error)
 
-!   This subroutine tests following functionalities: 
+!   This subroutine tests following functionalities:
 !   h5gcreate_f, h5gopen_f, h5gclose_f, (?)h5gget_obj_info_idx_f,  h5gn_members_f
 !   h5glink(2)_f, h5gunlink_f, h5gmove(2)_f,  h5gget_linkval_f, h5gset_comment_f,
-!   h5gget_comment_f 
+!   h5gget_comment_f
+
+     USE HDF5 ! This module contains all necessary modules
 
-     USE HDF5 ! This module contains all necessary modules 
-        
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
      CHARACTER(LEN=5), PARAMETER :: filename = "gtest"    !File name
      CHARACTER(LEN=80) :: fix_filename
-     CHARACTER(LEN=33), PARAMETER :: comment = "Testing the group functionalities"  
+     CHARACTER(LEN=33), PARAMETER :: comment = "Testing the group functionalities"
                                               ! comment for this file
      CHARACTER(LEN=7), PARAMETER :: groupname1 = "MyGroup"  ! Group name
-     CHARACTER(LEN=16), PARAMETER :: groupname2 = "/MyGroup/Group_A" 
-     CHARACTER(LEN=9), PARAMETER :: linkname1 = "hardlink1" 
-     CHARACTER(LEN=9), PARAMETER :: linkname2 = "hardlink2" 
-     CHARACTER(LEN=9), PARAMETER :: linkname3 = "softlink1" 
-     CHARACTER(LEN=9), PARAMETER :: linkname4 = "softlink2" 
-     CHARACTER(LEN=12), PARAMETER :: linkname5 = "newsoftlink2" 
+     CHARACTER(LEN=16), PARAMETER :: groupname2 = "/MyGroup/Group_A"
+     CHARACTER(LEN=9), PARAMETER :: linkname1 = "hardlink1"
+     CHARACTER(LEN=9), PARAMETER :: linkname2 = "hardlink2"
+     CHARACTER(LEN=9), PARAMETER :: linkname3 = "softlink1"
+     CHARACTER(LEN=9), PARAMETER :: linkname4 = "softlink2"
+     CHARACTER(LEN=12), PARAMETER :: linkname5 = "newsoftlink2"
 
      CHARACTER(LEN=13), PARAMETER :: dsetname1 = "MyGroup/dset1" ! Dataset name
      CHARACTER(LEN=5),  PARAMETER :: dsetname2 = "dset2" ! dataset name
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: group1_id      ! Group identifier 
-     INTEGER(HID_T) :: group2_id      ! Group identifier 
-     INTEGER(HID_T) :: dset1_id    ! Dataset identifier 
-     INTEGER(HID_T) :: dset2_id    ! Dataset identifier 
-     INTEGER(HID_T) :: dsetnew_id    ! Dataset identifier 
-     INTEGER(HID_T) :: dspace_id  ! Data space identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: group1_id      ! Group identifier
+     INTEGER(HID_T) :: group2_id      ! Group identifier
+     INTEGER(HID_T) :: dset1_id    ! Dataset identifier
+     INTEGER(HID_T) :: dset2_id    ! Dataset identifier
+     INTEGER(HID_T) :: dsetnew_id    ! Dataset identifier
+     INTEGER(HID_T) :: dspace_id  ! Data space identifier
 
-     INTEGER, DIMENSION(1) :: dset1_data = 34 ! Data value      
-     INTEGER, DIMENSION(1) :: dset2_data = 98 ! Data value      
+     INTEGER, DIMENSION(1) :: dset1_data = 34 ! Data value
+     INTEGER, DIMENSION(1) :: dset2_data = 98 ! Data value
      INTEGER(HSIZE_T), DIMENSION(1) :: dims = 1 ! Datasets dimensions
      INTEGER     ::   rank = 1 ! Datasets rank
      INTEGER     ::   error ! Error flag
@@ -58,7 +58,7 @@
      CHARACTER(LEN=100) :: name !name to put symbolic object
      CHARACTER(LEN=100) :: commentout !comment to the file
      INTEGER     ::   nmembers
-     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims 
+     INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
      !
      ! Create the file.
      !
@@ -75,19 +75,19 @@
      !
      CALL h5gcreate_f(file_id, groupname1, group1_id, error)
      CALL check("h5gcreate_f",error,total_error)
-     
+
      !
      ! Create a group named "/MyGroup/Group_A" in the file.
      !
      CALL h5gcreate_f(file_id, groupname2, group2_id, error)
      CALL check("h5gcreate_f",error,total_error)
      !
-     !Create data space for the dataset. 
+     !Create data space for the dataset.
      !
      CALL h5screate_simple_f(rank, dims, dspace_id, error)
      CALL check("h5screate_simple_f",error,total_error)
      !
-     ! create dataset in the file. 
+     ! create dataset in the file.
      !
      CALL h5dcreate_f(file_id, dsetname1, H5T_NATIVE_INTEGER, dspace_id, &
                dset1_id, error)
@@ -101,7 +101,7 @@
      CALL check("h5dwrite_f",error,total_error)
 
      !
-     ! create dataset2 in the Group_A. 
+     ! create dataset2 in the Group_A.
      !
      CALL h5dcreate_f(group2_id, dsetname2, H5T_NATIVE_INTEGER, dspace_id, &
                dset2_id, error)
@@ -116,22 +116,22 @@
      !
      !Create a hard link to the group1
      !
-     CALL h5glink_f(file_id, H5G_LINK_HARD_F, groupname1, linkname1, error)   
+     CALL h5glink_f(file_id, H5G_LINK_HARD_F, groupname1, linkname1, error)
      CALL check("h5glink_f",error,total_error)
      !
      !Create a hard link to the group2
      !
-     CALL h5glink2_f(file_id, groupname2, H5G_LINK_HARD_F, file_id, linkname2, error)   
+     CALL h5glink2_f(file_id, groupname2, H5G_LINK_HARD_F, file_id, linkname2, error)
      CALL check("h5glink2_f",error,total_error)
      !
      !Create a soft link to  dataset11
      !
-     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname1, linkname3, error)   
+     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname1, linkname3, error)
      CALL check("h5glink_f",error,total_error)
      !
      !Create a soft link to  dataset2
      !
-     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname2, linkname4, error)   
+     CALL h5glink_f(file_id, H5G_LINK_SOFT_F, dsetname2, linkname4, error)
      CALL check("h5glink_f",error,total_error)
      !
      !close group1
@@ -147,7 +147,7 @@
      !get obj info of group1
      !
 !     CALL h5gget_obj_info_idx_f(file_id, linkname1, 2, name, obj_type, error)
-!     CALL check("h5gget_obj_info_idx_f", error, total_error) 
+!     CALL check("h5gget_obj_info_idx_f", error, total_error)
 ! XXX: Fix problems with H5G_LINK_F! - QAK
 !     if (obj_type .ne. H5G_LINK_F) then
 !         write(*,*)  "got object  ", name, " type error ", obj_type
@@ -202,7 +202,7 @@
      !get the comment of dataset1
      !
      CALL  h5gget_comment_f(file_id, dsetname1,namesize, commentout, error)
-     CALL check("h5gget_comment_f", error, total_error)  
+     CALL check("h5gget_comment_f", error, total_error)
      if ( commentout(1:33) .ne. comment) then
          write(*,*)  "got comment  ", commentout, " is wrong"
          total_error = total_error +1
@@ -211,10 +211,10 @@
      ! Move dataset1 to gourp2_id location
      !
      CALL h5dclose_f(dset1_id, error)
-     CALL check("h5dclose_f", error, total_error)   
+     CALL check("h5dclose_f", error, total_error)
 
-     CALL h5gmove2_f(file_id, dsetname1, group2_id, "dset1", error) 
-     CALL check("h5gmove2_f", error, total_error)  
+     CALL h5gmove2_f(file_id, dsetname1, group2_id, "dset1", error)
+     CALL check("h5gmove2_f", error, total_error)
      !
      ! Open dataset from the new location
      !
@@ -224,17 +224,17 @@
      !release all the resources
      !
      CALL h5fclose_f(file_id, error)
-     CALL check("h5fclose_f", error, total_error)   
+     CALL check("h5fclose_f", error, total_error)
      CALL h5gclose_f(group1_id, error)
-     CALL check("h5gclose_f", error, total_error)   
+     CALL check("h5gclose_f", error, total_error)
      CALL h5gclose_f(group2_id, error)
-     CALL check("h5gclose_f", error, total_error)   
+     CALL check("h5gclose_f", error, total_error)
      CALL h5dclose_f(dset2_id, error)
-     CALL check("h5dclose_f", error, total_error)   
+     CALL check("h5dclose_f", error, total_error)
      CALL h5dclose_f(dsetnew_id, error)
-     CALL check("h5dclose_f", error, total_error)   
+     CALL check("h5dclose_f", error, total_error)
      CALL h5sclose_f(dspace_id, error)
-     CALL check("h5sclose_f", error, total_error)   
+     CALL check("h5sclose_f", error, total_error)
 
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
diff --git a/fortran/test/tH5G_1_8.f90 b/fortran/test/tH5G_1_8.f90
index 8b5e5f2..e42f22a 100644
--- a/fortran/test/tH5G_1_8.f90
+++ b/fortran/test/tH5G_1_8.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,17 +11,17 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 SUBROUTINE group_test(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(OUT) :: total_error
 
   INTEGER(HID_T) :: fapl, fapl2, my_fapl ! /* File access property lists */
-  
+
   INTEGER :: error, ret_total_error
 
 !  WRITE(*,*) "TESTING GROUPS"
@@ -39,7 +39,7 @@ SUBROUTINE group_test(cleanup, total_error)
   ! /* Check for FAPL to USE */
   my_fapl = fapl2
 
-  
+
   ret_total_error = 0
   CALL mklinks(fapl2, ret_total_error)
   CALL write_test_status(ret_total_error, &
@@ -76,7 +76,7 @@ SUBROUTINE group_test(cleanup, total_error)
   CALL write_test_status(ret_total_error, &
        ' Testing deleting links by index', &
        total_error)
-  
+
   ret_total_error = 0
   CALL test_lcpl(cleanup, fapl, ret_total_error)
   CALL write_test_status(ret_total_error, &
@@ -119,15 +119,15 @@ END SUBROUTINE group_test
 
 SUBROUTINE group_info(cleanup, fapl, total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: fapl
 
   INTEGER(HID_T) :: gcpl_id ! /* Group creation property list ID */
 
-  INTEGER :: max_compact ! /* Maximum # of links to store in group compactly */ 
+  INTEGER :: max_compact ! /* Maximum # of links to store in group compactly */
   INTEGER :: min_dense ! /* Minimum # of links to store in group "densely" */
 
   INTEGER :: idx_type ! /* Type of index to operate on */
@@ -145,7 +145,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
                                           ! H5G_STORAGE_TYPE_DENSE: Indexed storage
                                           ! H5G_STORAGE_TYPE_SYMBOL_TABLE: Symbol tables, the original HDF5 structure
   INTEGER :: nlinks ! Number of links in group
-  INTEGER :: max_corder ! Current maximum creation order value for group 
+  INTEGER :: max_corder ! Current maximum creation order value for group
 
   INTEGER :: u,v  ! /* Local index variables */
   CHARACTER(LEN=2) :: chr2
@@ -349,7 +349,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
               ! /* Close group created */
               CALL H5Gclose_f(group_id2, error)
               CALL check("H5Gclose_f", error, total_error)
-              
+
               ! /* Retrieve main group's information */
               CALL H5Gget_info_f(group_id, storage_type, nlinks, max_corder, error)
               CALL check("H5Gget_info_f", error, total_error)
@@ -358,11 +358,11 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
               CALL VERIFY("H5Gget_info_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
               CALL VERIFY("H5Gget_info_f2", max_corder, u+1, total_error)
               CALL VERIFY("H5Gget_info_f", nlinks, u+1, total_error)
-              
+
               ! /* Retrieve main group's information, by name */
               CALL H5Gget_info_by_name_f(file_id, CORDER_GROUP_NAME, storage_type, nlinks, max_corder, error)
               CALL check("H5Gget_info_by_name_f", error, total_error)
-              
+
               ! /* Check main group's information */
               CALL VERIFY("H5Gget_info_by_name_f", storage_type, H5G_STORAGE_TYPE_COMPACT_F, total_error)
               CALL VERIFY("H5Gget_info_by_name_f", max_corder, u+1, total_error)
@@ -381,7 +381,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
               valname = CORDER_GROUP_NAME//objname
 
               CALL H5Lcreate_soft_f(valname, soft_group_id, objname, error, H5P_DEFAULT_F, H5P_DEFAULT_F)
-              
+
               ! /* Retrieve soft link group's information, by name */
               CALL H5Gget_info_f(soft_group_id, storage_type, nlinks, max_corder, error)
               CALL check("H5Gget_info_f", error, total_error)
@@ -398,7 +398,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
               CALL check("H5Gclose_f", error, total_error)
               CALL H5Gclose_f(soft_group_id, error)
               CALL check("H5Gclose_f", error, total_error)
-           
+
               ! /* Close the file */
               CALL H5Fclose_f(file_id, error)
               CALL check("H5Fclose_f", error, total_error)
@@ -431,8 +431,8 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 
    SUBROUTINE timestamps(cleanup, fapl, total_error)
 
-     USE HDF5 ! This module contains all necessary modules 
-     
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
      INTEGER, INTENT(OUT) :: total_error
      INTEGER(HID_T), INTENT(IN) :: fapl
@@ -442,7 +442,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      INTEGER(HID_T) :: group_id2 !/* Group ID */
      INTEGER(HID_T) :: gcpl_id !/* Group creation property list ID */
      INTEGER(HID_T) :: gcpl_id2 !/* Group creation property list ID */
-     
+
      CHARACTER(LEN=6), PARAMETER :: prefix = 'links9'
      CHARACTER(LEN=9), PARAMETER :: filename = prefix//'.h5'  ! /* File name */
      ! /* Timestamp macros */
@@ -480,7 +480,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 
      ! /* Create file */
      !h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-     
+
      CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
      CALL check("h5fcreate_f",error,total_error)
 
@@ -511,7 +511,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      CALL H5Pget_obj_track_times_f(gcpl_id2, track_times, error)
      CALL check("H5Pget_obj_track_times_f", error, total_error)
      CALL VerifyLogical("H5Pget_obj_track_times2",track_times,.TRUE.,total_error)
-     
+
 !    /* Query the object information for each group */
 !    if(H5Oget_info(group_id, &oinfo) < 0) TEST_ERROR
 !    if(H5Oget_info(group_id2, &oinfo2) < 0) TEST_ERROR
@@ -628,8 +628,8 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 
    SUBROUTINE mklinks(fapl, total_error)
 
-     USE HDF5 ! This module contains all necessary modules 
-     
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
      INTEGER, INTENT(OUT) :: total_error
      INTEGER(HID_T), INTENT(IN) :: fapl
@@ -649,7 +649,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      CALL check("mklinks.h5screate_simple_f",error,total_error)
 
      !/* Create a group */
-     CALL H5Gcreate_f(file, "grp1", grp, error) 
+     CALL H5Gcreate_f(file, "grp1", grp, error)
      CALL check("H5Gcreate_f", error, total_error)
      CALL H5Gclose_f(grp, error)
      CALL check("h5gclose_f",error,total_error)
@@ -663,7 +663,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      !/* Create a hard link */
      CALL H5Lcreate_hard_f(file, "d1", INT(H5L_SAME_LOC_F,HID_T), "grp1/hard", error)
      CALL check("H5Lcreate_hard_f", error, total_error)
-     
+
      !/* Create a symbolic link */
      CALL H5Lcreate_soft_f("/d1", file, "grp1/soft",error)
      CALL check("H5Lcreate_soft_f", error, total_error)
@@ -699,8 +699,8 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 
   SUBROUTINE test_move_preserves(fapl_id, total_error)
 
-    USE HDF5 ! This module contains all necessary modules 
-    
+    USE HDF5 ! This module contains all necessary modules
+
     IMPLICIT NONE
     INTEGER, INTENT(OUT) :: total_error
     INTEGER(HID_T), INTENT(IN) :: fapl_id
@@ -723,7 +723,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
     INTEGER :: crt_order_flags ! /* Status of creation order info for GCPL */
     CHARACTER(LEN=12), PARAMETER :: filename = 'TestLinks.h5'
 
-    INTEGER :: cset ! Indicates the character set used for the link’s name. 
+    INTEGER :: cset ! Indicates the character set used for the link’s name.
     INTEGER :: corder ! Specifies the link’s creation order position.
     LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
     INTEGER :: link_type ! Specifies the link class:
@@ -748,17 +748,17 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
     CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
     CALL check("H5Pget_link_creation_order_f",error, total_error)
     CALL VERIFY("H5Pget_link_creation_order_f",crt_order_flags,0, total_error)
-    
+
     CALL H5Pset_link_creation_order_f(fcpl_id, H5P_CRT_ORDER_TRACKED_F, error)
     CALL check("H5Pset_link_creation_order_f", error, total_error)
- 
+
     CALL H5Pget_link_creation_order_f(fcpl_id, crt_order_flags, error)
     CALL check("H5Pget_link_creation_order_f",error, total_error)
     CALL VERIFY("H5Pget_link_creation_order_f",crt_order_flags, H5P_CRT_ORDER_TRACKED_F, total_error)
 
     !/* Create file */
     !/* (with creation order tracking for the root group) */
-    
+
     CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file_id, error, fcpl_id, fapl_id)
     CALL check("h5fcreate_f",error,total_error)
 
@@ -770,7 +770,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
     CALL check("H5Pset_char_encoding_f",error, total_error)
 
     !/* Create a group with that lcpl */
-    CALL H5Gcreate_f(file_id, "group", group_id, error,lcpl_id=lcpl_id, gcpl_id=H5P_DEFAULT_F, gapl_id=H5P_DEFAULT_F) 
+    CALL H5Gcreate_f(file_id, "group", group_id, error,lcpl_id=lcpl_id, gcpl_id=H5P_DEFAULT_F, gapl_id=H5P_DEFAULT_F)
     CALL check("H5Gcreate_f", error, total_error)
     CALL H5Gclose_f(group_id, error)
     CALL check("H5Gclose_f", error, total_error)
@@ -799,7 +799,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 !    /* Close the file and reopen it */
     CALL H5Fclose_f(file_id, error)
     CALL check("H5Fclose_f", error, total_error)
-    
+
 !!$    if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id)) < 0) TEST_ERROR
 !!$
 !!$    /* Get the link's character set & modification time .  They should be unchanged */
@@ -882,7 +882,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      CALL check("H5Pclose_f", error, total_error)
      CALL H5Pclose_f(lcpl_id, error)
      CALL check("H5Pclose_f", error, total_error)
-    
+
     ! if(H5Fclose(file_id) < 0) TEST_ERROR
 
    END SUBROUTINE test_move_preserves
@@ -906,8 +906,8 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
 SUBROUTINE lifecycle(cleanup, fapl2, total_error)
 
 
-  USE HDF5 ! This module contains all necessary modules 
-    
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: fapl2
@@ -959,7 +959,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
   ! /* Set up group creation property list */
   CALL H5Pcreate_f(H5P_GROUP_CREATE_F,gcpl,error)
   CALL check("H5Pcreate_f",error,total_error)
-  
+
 
   ! /* Query default group creation property settings */
   CALL H5Pget_local_heap_size_hint_f(gcpl, lheap_size_hint, error)
@@ -976,7 +976,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
   CALL check("H5Pget_est_link_info_f", error, total_error)
   CALL verify("H5Pget_est_link_info_f", est_num_entries, H5G_CRT_GINFO_EST_NUM_ENTRIES,total_error)
   CALL verify("H5Pget_est_link_info_f", est_name_len, H5G_CRT_GINFO_EST_NAME_LEN,total_error)
-  
+
 
   !/* Set GCPL parameters */
 
@@ -1018,7 +1018,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
 
     CALL H5Ldelete_f(fid, LIFECYCLE_TOP_GROUP, error)
     CALL check("H5Ldelete_f", error, total_error)
-    
+
     ! /* Close GCPL */
     CALL H5Pclose_f(gcpl, error)
     CALL check("H5Pclose_f", error, total_error)
@@ -1053,8 +1053,8 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
   SUBROUTINE cklinks(fapl, total_error)
 
 !    USE ISO_C_BINDING
-  USE HDF5 ! This module contains all necessary modules 
-    
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: fapl
@@ -1090,7 +1090,7 @@ SUBROUTINE lifecycle(cleanup, fapl2, total_error)
 !!$	TEST_ERROR
 !!$    } /* end if */
 
-  
+
   CALL H5Lexists_f(file,"d1",Lexists, error)
   CALL verifylogical("test_lcpl.H5Lexists", Lexists,.TRUE.,total_error)
 
@@ -1122,8 +1122,8 @@ END SUBROUTINE cklinks
 ! */
 SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: fapl
@@ -1133,16 +1133,16 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
   INTEGER(HID_T) :: gcpl_id  ! /* Group creation property list ID */
 
   INTEGER :: idx_type        ! /* Type of index to operate on */
-  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./) 
+  LOGICAL, DIMENSION(1:2) :: use_index = (/.FALSE.,.TRUE./)
                              ! /* Use index on creation order values */
-  INTEGER :: max_compact     ! /* Maximum # of links to store in group compactly */ 
+  INTEGER :: max_compact     ! /* Maximum # of links to store in group compactly */
   INTEGER :: min_dense       ! /* Minimum # of links to store in group "densely" */
 
   CHARACTER(LEN=7) :: objname   ! /* Object name */
   CHARACTER(LEN=8) :: filename = 'file0.h5' ! /* File name */
   CHARACTER(LEN=12), PARAMETER :: CORDER_GROUP_NAME = "corder_group"
 
-  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -1208,7 +1208,7 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
            ! /* Create file */
            CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, access_prp=fapl)
            CALL check("delete_by_idx.H5Fcreate_f", error, total_error)
-           
+
            ! /* Create group creation property list */
            CALL H5Pcreate_f(H5P_GROUP_CREATE_F, gcpl_id, error )
            CALL check("delete_by_idx.H5Pcreate_f", error, total_error)
@@ -1258,7 +1258,7 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
            ! IF(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
            ! /* Check for out of bound deletion */
-           htmp =9 
+           htmp =9
 !EP           CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, INT(u,HSIZE_T), error)
            CALL H5Ldelete_by_idx_f(group_id, ".", idx_type, iorder, htmp, error)
            CALL VERIFY("delete_by_idx.H5Ldelete_by_idx_f", error, -1, total_error) ! test should fail (error = -1)
@@ -1342,8 +1342,8 @@ END SUBROUTINE delete_by_idx
 SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
     hard_link, use_index, total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: group_id
@@ -1352,7 +1352,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   LOGICAL, INTENT(IN) :: hard_link
   LOGICAL, INTENT(IN) :: use_index
 
-  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute 
+  LOGICAL :: f_corder_valid ! Indicates whether the creation order data is valid for this attribute
   INTEGER :: corder ! Is a positive integer containing the creation order of the attribute
   INTEGER :: cset ! Indicates the character set used for the attribute’s name
   INTEGER(HSIZE_T) :: data_size   ! Indicates the size, in the number of characters, of the attribute
@@ -1388,7 +1388,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   ! /* Verify value for new soft link, in increasing creation order */
 !!$  IF(hard_link)THEN
 !!$     ! HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE);
-!!$     
+!!$
 !!$     CALL H5Lget_val_by_idx_f(group_id, ".", H5_INDEX_CRT_ORDER_F, H5_ITER_INC_F, n, tmpval, INT(7,SIZE_T),error)
 !!$     CALL check("H5Lget_val_by_idx",error,total_error)
 !!$
@@ -1444,21 +1444,21 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   SUBROUTINE test_lcpl(cleanup, fapl, total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: fapl
   LOGICAL :: cleanup
-    
+
   INTEGER(HID_T) :: file_id
   INTEGER(HID_T) :: group_id
   INTEGER(HID_T) :: space_id, data_space
   INTEGER(HID_T) :: dset_id
   INTEGER(HID_T) :: type_id
   INTEGER(HID_T) :: lcpl_id
-  
-  INTEGER :: cset ! Indicates the character set used for the link’s name. 
+
+  INTEGER :: cset ! Indicates the character set used for the link’s name.
   INTEGER :: corder ! Specifies the link’s creation order position.
   LOGICAL :: f_corder_valid ! Indicates whether the value in corder is valid.
   INTEGER :: link_type ! Specifies the link class:
@@ -1484,25 +1484,25 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
 !  WRITE(*,*) "link creation property lists (w/new group format)"
 
-  
+
   !/* Actually, intermediate group creation is tested elsewhere (tmisc).
   ! * Here we only need to test the character encoding property */
 
   !/* Create file */
   !  h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-  
+
   CALL H5Fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl)
   CALL check("test_lcpl.H5Fcreate_f", error, total_error)
 
 
   ! /* Create and link a group with the default LCPL */
-  
+
   CALL H5Gcreate_f(file_id, "/group", group_id, error)
   CALL check("test_lcpl.H5Gcreate_f", error, total_error)
-  
+
 
   ! /* Check that its character encoding is the default */
-  
+
   CALL H5Lget_info_f(file_id, "group", &
        cset, corder, f_corder_valid, link_type, address, val_size, &
        error, H5P_DEFAULT_F)
@@ -1520,7 +1520,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   CALL check("test_lcpl.h5tcommit_f", error, total_error)
   CALL h5tclose_f(type_id, error)
   CALL check("test_lcpl.h5tclose_f", error, total_error)
-  
+
 
   ! /* Check that its character encoding is the default */
   CALL H5Lget_info_f(file_id, "type", &
@@ -1561,7 +1561,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   CALL h5sget_simple_extent_dims_f(data_space, dimsout, maxdimsout, error)
   CALL check("test_lcpl.h5sget_simple_extent_dims_f",error, total_error)
-  
+
   DO i = 1, 2
      tmp1 = dimsout(i)
      tmp2 = extend_dim(i)
@@ -1576,7 +1576,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
   ! /* close data set */
 
   CALL h5dclose_f(dset_id, error)
-  CALL check("test_lcpl.h5dclose_f", error, total_error) 
+  CALL check("test_lcpl.h5dclose_f", error, total_error)
 
   ! /* Check that its character encoding is the default */
   CALL H5Lget_info_f(file_id, "dataset", &
@@ -1637,7 +1637,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   CALL H5Pget_char_encoding_f(lcpl_id, encoding, error)
   CALL check("test_lcpl.H5Pget_char_encoding_f", error, total_error)
-  CALL VERIFY("test_lcpl.H5Pget_char_encoding_f", encoding, H5T_CSET_UTF8_F, total_error) 
+  CALL VERIFY("test_lcpl.H5Pget_char_encoding_f", encoding, H5T_CSET_UTF8_F, total_error)
 
   ! /* Check that its character encoding is UTF-8 */
   CALL H5Lget_info_f(file_id, "dataset2", &
@@ -1666,7 +1666,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
        cset, corder, f_corder_valid, link_type, address, val_size, &
        error)
   CALL check("test_lcpl.H5Lget_info_f", error, total_error)
-  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error) 
+  CALL verify("test_lcpl.H5Lget_info_f",cset, H5T_CSET_ASCII_F,total_error)
 
   ! /* Check that the first link's encoding hasn't changed */
 
@@ -1679,7 +1679,7 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
   !/* Make sure that LCPLs work properly for other API calls: */
   !/* H5Lcreate_soft */
-  
+
   CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
   CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
   CALL H5Lcreate_soft_f("dataset2", file_id, "slink_to_dset2",error,lcpl_id)
@@ -1707,12 +1707,12 @@ SUBROUTINE link_info_by_idx_check(group_id, linkname, n, &
 
 
   ! /* H5Lcopy */
-  
+
   CALL H5Pset_char_encoding_f(lcpl_id, H5T_CSET_UTF8_F, error)
   CALL check("test_lcpl.H5Pset_char_encoding_f",error, total_error)
 
   CALL H5Lcopy_f(file_id, "moved_slink", file_id, "copied_slink", error, lcpl_id)
-  
+
   CALL H5Lget_info_f(file_id, "copied_slink", &
        cset, corder, f_corder_valid, link_type, address, val_size, &
        error)
@@ -1749,8 +1749,8 @@ END SUBROUTINE test_lcpl
 
 SUBROUTINE objcopy(fapl, total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(INOUT) :: total_error
   INTEGER(HID_T), INTENT(IN) :: fapl
@@ -1769,13 +1769,13 @@ SUBROUTINE objcopy(fapl, total_error)
 
 !/* Set the "use the latest version of the format" bounds for creating objects in the file */
   CALL H5Pset_libver_bounds_f(fapl2, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
-  
+
   ! /* create property to pass copy options */
   CALL h5pcreate_f(H5P_OBJECT_COPY_F, pid, error)
   CALL check("h5pcreate_f",error, total_error)
 
   ! /* set options for object copy */
-  CALL H5Pset_copy_object_f(pid, flag, error) 
+  CALL H5Pset_copy_object_f(pid, flag, error)
   CALL check("H5Pset_copy_object_f",error, total_error)
 
   ! /* Verify object copy flags */
@@ -1784,7 +1784,7 @@ SUBROUTINE objcopy(fapl, total_error)
   CALL VERIFY("H5Pget_copy_object_f", cpy_flags, flag, total_error)
 
 !!$
-!!$  CALL test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, 
+!!$  CALL test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG,
 !!$                       FALSE, "H5Ocopy(): without attributes");
 
   CALL lapl_nlinks(fapl2, total_error)
@@ -1813,7 +1813,7 @@ END SUBROUTINE objcopy
 SUBROUTINE lapl_nlinks( fapl, total_error)
 
   USE HDF5
-  
+
   IMPLICIT NONE
   INTEGER(HID_T), INTENT(IN) :: fapl
   INTEGER, INTENT(INOUT) :: total_error
@@ -1825,13 +1825,13 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
   INTEGER(HID_T) :: plist = (-1) ! /* lapl ID */
   INTEGER(HID_T) :: tid = (-1) ! /* Other IDs */
   INTEGER(HID_T) :: gapl = (-1), dapl = (-1), tapl = (-1) ! /* Other property lists */
-  
+
   CHARACTER(LEN=7) :: objname ! /* Object name */
   INTEGER(size_t) :: name_len ! /* Length of object name */
   CHARACTER(LEN=12) :: filename = 'TestLinks.h5'
   INTEGER(size_t) ::              nlinks ! /* nlinks for H5Pset_nlinks */
   INTEGER(size_t) :: buf_size = 7
-  
+
 !  WRITE(*,*) "adjusting nlinks with LAPL (w/new group format)"
 
 
@@ -1840,9 +1840,9 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
   CALL check(" lapl_nlinks.h5fcreate_f",error,total_error)
 
   ! /* Create group with short name in file (used as target for links) */
-  CALL H5Gcreate_f(fid, "final", gid, error) 
+  CALL H5Gcreate_f(fid, "final", gid, error)
   CALL check(" lapl_nlinks.H5Gcreate_f", error, total_error)
-  
+
   !/* Create chain of soft links to existing object (limited) */
   CALL H5Lcreate_soft_f("final", fid, "soft1", error)
   CALL H5Lcreate_soft_f("soft1", fid, "soft2", error)
@@ -1869,13 +1869,13 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
   CALL check("h5fclose_f",error,total_error)
 
   !/* Open file */
-  
+
   CALL h5fopen_f(FileName, H5F_ACC_RDWR_F, fid, error, fapl)
   CALL check("h5open_f",error,total_error)
-  
+
   !/* Create LAPL with higher-than-usual nlinks value */
   !/* Create a non-default lapl with udata set to point to the first group */
-  
+
   CALL H5Pcreate_f(H5P_LINK_ACCESS_F,plist,error)
   CALL check("h5Pcreate_f",error,total_error)
   nlinks = 20
@@ -1890,7 +1890,7 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
 
   !/* Open object through what is normally too many soft links using
   ! * new property list */
-  
+
   CALL H5Oopen_f(fid,"soft17",gid,error,plist)
   CALL check("H5Oopen_f",error,total_error)
 
@@ -1902,9 +1902,9 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
   CALL H5Gcreate_f(gid, "new_soft", gid2, error)
   CALL check("H5Gcreate_f", error, total_error)
 
-  ! /* Close groups */ 
+  ! /* Close groups */
   CALL H5Gclose_f(gid2, error)
-  CALL check("H5Gclose_f", error, total_error) 
+  CALL check("H5Gclose_f", error, total_error)
   CALL H5Gclose_f(gid, error)
   CALL check("H5Gclose_f", error, total_error)
 
@@ -1922,7 +1922,7 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
   CALL VERIFY("H5Pget_nlinks_f", INT(nlinks), 4, total_error)
 
   ! /* Try opening through what is now too many soft links */
-  
+
   CALL H5Oopen_f(fid,"soft5",gid,error,plist)
   CALL VERIFY("H5Oopen_f", error, -1, total_error) ! should fail
 
@@ -2012,11 +2012,11 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
 !!$    } H5E_END_TRY
 !!$
     ! /* Create property lists with nlinks set */
-  
+
   CALL H5Pcreate_f(H5P_GROUP_ACCESS_F,gapl,error)
-  CALL check("h5Pcreate_f",error,total_error) 
+  CALL check("h5Pcreate_f",error,total_error)
   CALL H5Pcreate_f(H5P_DATATYPE_ACCESS_F,tapl,error)
-  CALL check("h5Pcreate_f",error,total_error) 
+  CALL check("h5Pcreate_f",error,total_error)
   CALL H5Pcreate_f(H5P_DATASET_ACCESS_F,dapl,error)
   CALL check("h5Pcreate_f",error,total_error)
 
@@ -2038,11 +2038,11 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
 
   CALL H5Topen_f(fid, "soft17/datatype", tid, error, tapl)
   CALL check("H5Gopen_f",error,total_error)
-  
+
 !!$    if((did = H5Dopen2(fid, "soft17/dataset", dapl)) < 0) TEST_ERROR
 
   ! /* Close objects */
-  
+
   CALL h5gclose_f(gid, error)
   CALL check("h5gclose_f",error,total_error)
   CALL h5tclose_f(tid, error)
@@ -2051,7 +2051,7 @@ SUBROUTINE lapl_nlinks( fapl, total_error)
 !!$    if(H5Dclose(did) < 0) TEST_ERROR
 !!$
   ! /* Close plists */
-  
+
   CALL h5pclose_f(gapl, error)
   CALL check("h5pclose_f", error, total_error)
   CALL h5pclose_f(tapl, error)
diff --git a/fortran/test/tH5I.f90 b/fortran/test/tH5I.f90
index 1ef7ba2..796ce2b 100644
--- a/fortran/test/tH5I.f90
+++ b/fortran/test/tH5I.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,38 +11,38 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE identifier_test(cleanup, total_error)
 
 !   This subroutine tests following functionalities: h5iget_type_f
 
-   USE HDF5 ! This module contains all necessary modules 
+   USE HDF5 ! This module contains all necessary modules
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
      CHARACTER(LEN=6), PARAMETER :: filename = "itestf" ! File name
      CHARACTER(LEN=80) :: fix_filename
      CHARACTER(LEN=10), PARAMETER :: dsetname = "/itestdset" ! Dataset name
      CHARACTER(LEN=10), PARAMETER :: groupname = "itestgroup"! group name
      CHARACTER(LEN=10), PARAMETER :: aname = "itestattr"! group name
-          
-          
+
+
 
      INTEGER(HID_T) :: file_id       ! File identifier
      INTEGER(HID_T) :: new_file_id   ! File identifier
-     INTEGER(HID_T) :: group_id      ! group identifier  
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+     INTEGER(HID_T) :: group_id      ! group identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
      INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
      INTEGER(HID_T) :: attr_id      ! Datatype attribute identifier
      INTEGER(HID_T) :: aspace_id     ! attribute data space identifier
      INTEGER(HID_T) :: atype_id     ! attribute data type identifier
 
 
-     INTEGER, DIMENSION(1) :: dset_data = 0 ! Data value 
-     
+     INTEGER, DIMENSION(1) :: dset_data = 0 ! Data value
+
      INTEGER(HSIZE_T), DIMENSION(1) :: dims = 1 ! Datasets dimensions
      INTEGER(HSIZE_T), DIMENSION(1) :: adims = 1 ! Attribute dimensions
 
@@ -62,7 +62,7 @@
 
      !
      ! Create a new file using default properties.
-     ! 
+     !
      CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -70,7 +70,7 @@
      endif
      CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL check("h5fcreate_f",error,total_error)
-    
+
      !
      ! Create a group named "/MyGroup" in the file.
      !
@@ -78,20 +78,20 @@
      CALL check("h5gcreate_f",error,total_error)
 
      !
-     !Create data space for the dataset. 
+     !Create data space for the dataset.
      !
      CALL h5screate_simple_f(rank, dims, dspace_id, error)
      CALL check("h5screate_simple_f",error,total_error)
 
      !
-     ! create dataset in the file. 
+     ! create dataset in the file.
      !
      CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dspace_id, &
                dset_id, error)
      CALL check("h5dcreate_f",error,total_error)
      !
      ! Get dataset name from dataset identifier
-     ! 
+     !
      buf_size = 80
      CALL h5iget_name_f(dset_id, name_buf, buf_size, name_size, error)
      CALL check("h5iget_name_f",error,total_error)
@@ -104,8 +104,8 @@
               total_error = total_error + 1
           endif
       endif
-     
-     ! 
+
+     !
      ! Get file identifier from dataset identifier and then get file name
      !
      CALL h5iget_file_id_f(dset_id, new_file_id, error)
@@ -126,7 +126,7 @@
      CALL check("h5dwrite_f",error,total_error)
 
      !
-     ! Create scalar data space for dataset attribute. 
+     ! Create scalar data space for dataset attribute.
      !
      CALL h5screate_simple_f(arank, adims, aspace_id, error)
      CALL check("h5screate_simple_f",error,total_error)
@@ -191,37 +191,37 @@
      CALL check("h5iget_type_f",error,total_error)
      CALL verify("get attribute identifier wrong",type,H5I_ATTR_F,total_error)
 
-     !   
+     !
      ! Close the attribute.
-     ! 
+     !
      CALL h5aclose_f(attr_id, error)
      CALL check("h5aclose_f",error,total_error)
-     !   
+     !
      ! Close the dataspace.
-     ! 
+     !
      CALL h5sclose_f(aspace_id, error)
      CALL check("h5sclose_f",error,total_error)
      CALL h5sclose_f(dspace_id, error)
      CALL check("h5sclose_f",error,total_error)
-     !   
+     !
      ! Close the dataype.
-     ! 
+     !
      CALL h5tclose_f(atype_id, error)
      CALL check("h5tclose_f",error,total_error)
 
-     !   
+     !
      ! Close the dataset.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
      CALL check("h5dclose_f",error,total_error)
 
-     !   
+     !
      ! Close the group.
-     ! 
+     !
      CALL h5gclose_f(group_id, error)
      CALL check("h5gclose_f",error,total_error)
 
-     ! 
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
@@ -236,7 +236,7 @@
      ! Create a file
      CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL check("h5fcreate_f",error,total_error)
-    
+
      ! Get the reference count for the file ID
      CALL h5iget_ref_f(file_id, ref_count, error)
      CALL check("h5iget_ref_f",error,total_error)
diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90
index 0aa4abd..253a42a 100644
--- a/fortran/test/tH5O.f90
+++ b/fortran/test/tH5O.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,11 +11,11 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 SUBROUTINE test_h5o(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(OUT) :: total_error
@@ -35,7 +35,7 @@ SUBROUTINE test_h5o(cleanup, total_error)
   CALL check("h5_cleanup_f", error, total_error)
   IF(cleanup) CALL h5_cleanup_f("test", H5P_DEFAULT_F, error)
   CALL check("h5_cleanup_f", error, total_error)
-  
+
 END SUBROUTINE test_h5o
 
 !/****************************************************************
@@ -46,8 +46,8 @@ END SUBROUTINE test_h5o
 
 SUBROUTINE test_h5o_link(total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
 
@@ -79,7 +79,7 @@ SUBROUTINE test_h5o_link(total_error)
         wdata(i,j) = i*j
      ENDDO
   ENDDO
-  
+
   ! /* Create the dataspace */
   CALL h5screate_simple_f(2, dims, space_id, error)
   CALL check("h5screate_simple_f",error,total_error)
@@ -97,14 +97,14 @@ SUBROUTINE test_h5o_link(total_error)
   !/* Make a FAPL that uses the "use the latest version of the format" bounds */
   CALL H5Pcreate_f(H5P_FILE_ACCESS_F,fapl_id,error)
   CALL check("h5Pcreate_f",error,total_error)
-  
+
   ! /* Set the "use the latest version of the format" bounds for creating objects in the file */
-  
+
   CALL H5Pset_libver_bounds_f(fapl_id, H5F_LIBVER_LATEST_F, H5F_LIBVER_LATEST_F, error)
   CALL check("H5Pset_libver_bounds_f",error, total_error)
-  
+
 !!$ ret = H5Pset_libver_bounds(fapl_id, (new_format ? H5F_LIBVER_LATEST : H5F_LIBVER_EARLIEST), H5F_LIBVER_LATEST);
-  
+
   ! /* Create a new HDF5 file */
   CALL H5Fcreate_f(TEST_FILENAME, H5F_ACC_TRUNC_F, file_id, error, H5P_DEFAULT_F, fapl_id)
   CALL check("H5Fcreate_f", error, total_error)
@@ -112,11 +112,11 @@ SUBROUTINE test_h5o_link(total_error)
   ! /* Close the FAPL */
   CALL h5pclose_f(fapl_id, error)
   CALL check("h5pclose_f",error,total_error)
-  
+
   ! /* Create and commit a datatype with no name */
   CALL H5Tcopy_f( H5T_NATIVE_INTEGER, type_id, error)
   CALL check("H5Tcopy_F",error,total_error)
-  
+
   CALL H5Tcommit_anon_f(file_id, type_id, error) ! using no optional parameters
   CALL check("H5Tcommit_anon_F",error,total_error)
 
@@ -130,7 +130,7 @@ SUBROUTINE test_h5o_link(total_error)
 
 
   ! /* Verify that we can write to and read from the dataset */
-  
+
   ! /* Write the data to the dataset */
 
 !EP  CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error, &
@@ -143,7 +143,7 @@ SUBROUTINE test_h5o_link(total_error)
 !EP       mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F)
   CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error)
   CALL check("h5dread_f", error, total_error)
-        
+
   ! /* Verify the data */
   DO i = 1, TEST6_DIM1
      DO j = 1, TEST6_DIM2
@@ -175,17 +175,17 @@ SUBROUTINE test_h5o_link(total_error)
   ! /* Re-open datatype using new link */
   CALL H5Topen_f(group_id, "datatype", type_id, error)
   CALL check("h5topen_f", error, total_error)
-  
+
   ! /* Link nameless group to root group and close the group ID*/
   CALL H5Olink_f(group_id, file_id, "/group", error)
   CALL check("H5Olink_f", error, total_error)
-  
+
 
   CALL h5gclose_f(group_id, error)
   CALL check("h5gclose_f",error,total_error)
 
   ! /* Open dataset through root group and verify its data */
-  
+
   CALL H5Dopen_f(file_id, "/group/inter_group/dataset", dset_id, error)
   CALL check("test_lcpl.h5dopen_f", error, total_error)
 
@@ -227,8 +227,8 @@ END SUBROUTINE test_h5o_link
 
 SUBROUTINE test_h5o_plist(total_error)
 
-  USE HDF5 ! This module contains all necessary modules 
-  
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
   INTEGER, INTENT(OUT) :: total_error
 
@@ -240,7 +240,7 @@ SUBROUTINE test_h5o_plist(total_error)
   INTEGER :: max_compact, min_dense            !/* Actual phase change parameters */
   INTEGER :: error                             !/* Value returned from API calls */
   CHARACTER(LEN=7), PARAMETER :: TEST_FILENAME = 'test.h5'
-  
+
 
 !  PRINT*,'Testing object creation properties'
 
@@ -275,7 +275,7 @@ SUBROUTINE test_h5o_plist(total_error)
   CALL check("H5Pget_attr_phase_change_f", error, total_error)
   CALL H5Pset_attr_phase_change_f(tcpl, def_max_compact+1, def_min_dense-1, error)
   CALL check("H5Pget_attr_phase_change_f", error, total_error)
-  
+
   ! /* Retrieve attribute phase change values on each creation property list and verify */
   CALL H5Pget_attr_phase_change_f(gcpl, max_compact, min_dense, error)
   CALL check("H5Pget_attr_phase_change_f", error, total_error)
@@ -307,7 +307,7 @@ SUBROUTINE test_h5o_plist(total_error)
   ! /* Commit the type inside the group anonymously and link it in */
   CALL h5tcopy_f(H5T_NATIVE_INTEGER, dtype, error)
   CALL check("h5tcopy_f", error, total_error)
-  
+
   CALL H5Tcommit_anon_f(fid, dtype, error, tcpl_id=tcpl)
   CALL check("H5Tcommit_anon_f",error,total_error)
 
@@ -321,7 +321,7 @@ SUBROUTINE test_h5o_plist(total_error)
   ! /* Create the dataset anonymously and link it in */
   CALL H5Dcreate_anon_f(fid, H5T_NATIVE_INTEGER, dspace, dset, error, dcpl )
   CALL check("H5Dcreate_anon_f",error,total_error)
-  
+
   CALL H5Olink_f(dset, fid, "dataset", error)
   CALL check("H5Olink_f", error, total_error)
 
@@ -338,7 +338,7 @@ SUBROUTINE test_h5o_plist(total_error)
   CALL check("h5pclose_f", error, total_error)
 
   ! /* Retrieve each object's creation property list */
-  
+
   CALL H5Gget_create_plist_f(grp, gcpl, error)
   CALL check("H5Gget_create_plist", error, total_error)
 
@@ -367,7 +367,7 @@ SUBROUTINE test_h5o_plist(total_error)
 
 
   !/* Close current objects */
-  
+
   CALL h5pclose_f(gcpl,error)
   CALL check("h5pclose_f", error, total_error)
   CALL h5pclose_f(dcpl,error)
@@ -427,7 +427,7 @@ SUBROUTINE test_h5o_plist(total_error)
 
 
   ! /* Close current objects */
-  
+
   CALL h5pclose_f(gcpl,error)
   CALL check("h5pclose_f", error, total_error)
   CALL h5pclose_f(dcpl,error)
diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
index e8e3a1d..830217d 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,25 +11,25 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE external_test(cleanup, total_error)
 
-!   This subroutine tests following functionalities: 
+!   This subroutine tests following functionalities:
 !   h5pset_external_f,  h5pget_external_count_f,
 !   h5pget_external_f
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
      CHARACTER(LEN=8), PARAMETER :: filename = "external"
      CHARACTER(LEN=80) :: fix_filename
-     INTEGER(HID_T) :: file_id     
-     INTEGER(HID_T) :: plist_id     
-     INTEGER(HID_T) :: space_id     
+     INTEGER(HID_T) :: file_id
+     INTEGER(HID_T) :: plist_id
+     INTEGER(HID_T) :: space_id
      INTEGER(HID_T) :: dataset_id
      INTEGER(HSIZE_T), DIMENSION(1) :: cur_size !data space current size
      INTEGER(HSIZE_T), DIMENSION(1) :: max_size !data space maximum size
@@ -38,7 +38,7 @@
      INTEGER(HSIZE_T) :: file_size   !sizeof external file segment
      INTEGER :: error !error code
      INTEGER(SIZE_T) :: int_size !size of integer
-     INTEGER(HSIZE_T) :: file_bytes !Number of bytes reserved 
+     INTEGER(HSIZE_T) :: file_bytes !Number of bytes reserved
                                    !in the file for the data
      INTEGER :: RANK = 1 !dataset rank
      INTEGER :: count !number of external files for the
@@ -53,7 +53,7 @@
 
      !
      !Create file "external.h5" using default properties.
-     ! 
+     !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -82,7 +82,7 @@
      max_size(1) = 100;
      call h5tget_size_f(H5T_NATIVE_INTEGER, int_size, error)
      CALL check("h5tget_size_f",error,total_error)
-     file_size = int_size * max_size(1);     
+     file_size = int_size * max_size(1);
      CALL h5pset_external_f(plist_id, "ext1.data", 0, file_size, error)
      CALL check("h5pset_external_f",error,total_error)
      CALL h5screate_simple_f(RANK, cur_size, space_id, error, max_size)
@@ -90,7 +90,7 @@
      CALL h5dcreate_f(file_id, "dset1", H5T_NATIVE_INTEGER, space_id, &
                            dataset_id, error, plist_id)
      CALL check("h5dcreate_f", error, total_error)
-     
+
      CALL h5dclose_f(dataset_id, error)
      CALL check("h5dclose_f", error, total_error)
      CALL h5pclose_f(plist_id, error)
@@ -102,8 +102,8 @@
      CALL h5fopen_f(fix_filename, H5F_ACC_RDWR_F, file_id, error)
      CALL h5dopen_f(file_id, "dset1", dataset_id, error)
      CALL check("h5dopen_f",error,total_error)
-    
-     ! Read dataset creation information 
+
+     ! Read dataset creation information
      CALL h5dget_create_plist_f(dataset_id, plist_id, error)
      CALL check("h5dget_create_plist_f",error,total_error)
      CALL h5pget_external_count_f(plist_id, count, error)
@@ -125,7 +125,7 @@
          write (*,*) "got external file size is not correct"
          total_error = total_error + 1
      end if
- 
+
      CALL h5dclose_f(dataset_id, error)
      CALL check("h5dclose_f", error, total_error)
      CALL h5pclose_f(plist_id, error)
@@ -138,27 +138,27 @@
               CALL check("h5_cleanup_f", error, total_error)
      RETURN
      END SUBROUTINE external_test
-    
+
         SUBROUTINE multi_file_test(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           CHARACTER(LEN=9), PARAMETER :: filename = "multidset" ! File name
-          CHARACTER(LEN=80) :: fix_filename 
+          CHARACTER(LEN=80) :: fix_filename
           CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
           INTEGER(HID_T) :: dtype_id      ! Datatype identifier
           INTEGER(HID_T) :: fapl, fapl_1  ! File access property list identifier
           INTEGER, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_map, memb_map_out
           INTEGER(HID_T), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_fapl, memb_fapl_out
           CHARACTER(LEN=20), DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_name, memb_name_out
-          REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_addr, memb_addr_out 
+          REAL, DIMENSION(0:H5FD_MEM_NTYPES_F-1) :: memb_addr, memb_addr_out
           !INTEGER(HADDR_T), DIMENSION(0:H5FD_MEM_NTYPES_F) :: memb_addr
           LOGICAL :: relax  = .TRUE.
           LOGICAL :: relax_out = .TRUE.
@@ -210,7 +210,7 @@
 
           !
           ! Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -229,19 +229,19 @@
              write(*,*) "Wrong value for driver"
           endif
           !
-          ! Let's check h5pget(set)cache_f APIs here for now 
+          ! Let's check h5pget(set)cache_f APIs here for now
           !
           CALL h5pget_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
                               rdcc_w0, error)
                CALL check("h5pget_cache_f", error, total_error)
- 
+
           ! Set cache to some number
           !
           rdcc_nbytes = 1024*1024
           CALL h5pset_cache_f(fapl, mdc_nelmts, rdcc_nelmts, rdcc_nbytes, &
                               rdcc_w0, error)
                CALL check("h5pset_cache_f", error, total_error)
- 
+
           CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error, access_prp = fapl)
               CALL check("h5fcreate_f", error, total_error)
           if(error .ne. 0) then
@@ -249,10 +249,10 @@
              total_error = 1
              call h5pclose_f(fapl, error)
              return
-          endif  
+          endif
 
 
-          ! 
+          !
           ! Create the dataspace.
           !
           CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -270,14 +270,14 @@
           ! Write the dataset.
           !
           data_dims(1) = 4
-          data_dims(2) = 6 
+          data_dims(2) = 6
           CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, dset_data, data_dims, error)
               CALL check("h5dwrite_f", error, total_error)
 
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
@@ -287,14 +287,14 @@
           CALL h5sclose_f(dspace_id, error)
               CALL check("h5sclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f", error, total_error)
           CALL h5pclose_f(fapl, error)
               CALL check("h5pclose_f", error, total_error)
-         ! 
+         !
           ! Open the existing file.
           !
           CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error)
@@ -316,19 +316,19 @@
           !    CALL check("h5pget_fapl_multi_f", error, total_error)
 
           !
-          ! Open the existing dataset. 
+          ! Open the existing dataset.
           !
           CALL h5dopen_f(file_id, dsetname, dset_id, error)
               CALL check("h5dopen_f", error, total_error)
 
           !
-          ! Get the dataset type. 
+          ! Get the dataset type.
           !
           CALL h5dget_type_f(dset_id, dtype_id, error)
               CALL check("h5dget_type_f", error, total_error)
 
           !
-          ! Get the data space. 
+          ! Get the data space.
           !
           CALL h5dget_space_f(dset_id, dspace_id, error)
               CALL check("h5dget_space_f", error, total_error)
@@ -341,19 +341,19 @@
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, 4
               do j = 1, 6
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN 
+                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
                       write(*, *) "dataset test error occured"
                       write(*,*) "data read is not the same as the data writen"
                   END IF
-              end do    
+              end do
           end do
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
@@ -368,7 +368,7 @@
           !
           CALL h5tclose_f(dtype_id, error)
               CALL check("h5tclose_f", error, total_error)
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
@@ -379,6 +379,6 @@
               CALL check("h5pclose_f", error, total_error)
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
-     
+
           RETURN
         END SUBROUTINE multi_file_test
diff --git a/fortran/test/tH5R.f90 b/fortran/test/tH5R.f90
index adcdfc7..0289465 100644
--- a/fortran/test/tH5R.f90
+++ b/fortran/test/tH5R.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,56 +11,56 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing Reference Interface functionality.
 !
 !    The following subroutine tests h5rcreate_f, h5rdereference_f, h5rget_name_f
 !    and H5Rget_object_type functions
 !
 SUBROUTINE refobjtest(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(OUT) :: total_error 
-  
+  INTEGER, INTENT(OUT) :: total_error
+
   CHARACTER(LEN=9), PARAMETER :: filename = "reference"
   CHARACTER(LEN=80) :: fix_filename
   CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"
   CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES"
   CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"
   CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"
-  
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: grp1_id       ! Group identifier 
-  INTEGER(HID_T) :: grp2_id       ! Group identifier 
-  INTEGER(HID_T) :: dset1_id      ! Dataset identifier 
-  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
-  INTEGER(HID_T) :: type_id       ! Type identifier  
-  INTEGER(HID_T) :: space_id      ! Dataspace identifier 
-  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
+
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: grp1_id       ! Group identifier
+  INTEGER(HID_T) :: grp2_id       ! Group identifier
+  INTEGER(HID_T) :: dset1_id      ! Dataset identifier
+  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
+  INTEGER(HID_T) :: type_id       ! Type identifier
+  INTEGER(HID_T) :: space_id      ! Dataspace identifier
+  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
   INTEGER     ::   error, obj_type
   INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/5/)
   INTEGER(HSIZE_T), DIMENSION(1) :: dimsr= (/4/)
   INTEGER(HSIZE_T), DIMENSION(1) :: my_maxdims = (/5/)
-  INTEGER :: rank = 1 
-  INTEGER :: rankr = 1 
+  INTEGER :: rank = 1
+  INTEGER :: rankr = 1
   TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref
   TYPE(hobj_ref_t_f), DIMENSION(4) ::  ref_out
   INTEGER(HSIZE_T), DIMENSION(1) :: ref_dim
   INTEGER, DIMENSION(5) :: DATA = (/1, 2, 3, 4, 5/)
   INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
-  
+
   CHARACTER(LEN=7) :: buf        ! buffer to hold the region name
   CHARACTER(LEN=16) :: buf_big    ! buffer bigger then needed
   CHARACTER(LEN=4) :: buf_small  ! buffer smaller then needed
   INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
-  
+
   !
   !Create a new file with Default file access and
-  !file creation properties . 
+  !file creation properties .
   !
   CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
   IF (error .NE. 0) THEN
@@ -69,28 +69,28 @@ SUBROUTINE refobjtest(cleanup, total_error)
   ENDIF
   CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
   CALL check("h5fcreate_f",error,total_error)
-              
-  
+
+
   !
   ! Create a group inside the file
   !
   CALL h5gcreate_f(file_id, groupname1, grp1_id, error)
   CALL check("h5gcreate_f",error,total_error)
-  
+
   !
   ! Create a group inside the group GROUP1
   !
   CALL h5gcreate_f(grp1_id, groupname2, grp2_id, error)
   CALL check("h5gcreate_f",error,total_error)
-  
-  ! 
-  ! Create dataspaces for datasets   
+
+  !
+  ! Create dataspaces for datasets
   !
   CALL h5screate_simple_f(rank, dims, space_id, error, maxdims=my_maxdims)
   CALL check("h5screate_simple_f",error,total_error)
   CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
   CALL check("h5screate_simple_f",error,total_error)
-  
+
   !
   ! Create integer dataset
   !
@@ -110,13 +110,13 @@ SUBROUTINE refobjtest(cleanup, total_error)
   CALL check("h5tcopy_f",error,total_error)
   CALL h5tcommit_f(file_id, "MyType", type_id, error)
   CALL check("h5tcommit_f",error,total_error)
-  
+
   !
   !  Close dataspaces, groups and integer dataset
-  ! 
+  !
   CALL h5sclose_f(space_id, error)
   CALL check("h5sclose_f",error,total_error)
-  CALL h5sclose_f(spacer_id, error)         
+  CALL h5sclose_f(spacer_id, error)
   CALL check("h5sclose_f",error,total_error)
   CALL h5dclose_f(dset1_id, error)
   CALL check("h5dclose_f",error,total_error)
@@ -126,7 +126,7 @@ SUBROUTINE refobjtest(cleanup, total_error)
   CALL check("h5gclose_f",error,total_error)
   CALL h5gclose_f(grp2_id, error)
   CALL check("h5gclose_f",error,total_error)
-  
+
   !
   ! Craete references to two groups, integer dataset and shared datatype
   ! and write it to the dataset in the file
@@ -142,37 +142,37 @@ SUBROUTINE refobjtest(cleanup, total_error)
   ref_dim(1) = SIZE(ref)
   CALL h5dwrite_f(dsetr_id, H5T_STD_REF_OBJ, ref, ref_dim, error)
   CALL check("h5dwrite_f",error,total_error)
-  
+
   ! getting path to normal dataset in root group
-  
+
   CALL H5Rget_name_f(dsetr_id, ref(1), buf, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
- 
+
 
   CALL VERIFY("H5Rget_name_f", INT(buf_size),7, total_error)
   CALL VerifyString("H5Rget_name_f", buf, "/GROUP1", total_error)
-  
+
   ! with buffer bigger then needed
-  
+
   CALL H5Rget_name_f(dsetr_id, ref(1), buf_big, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
   CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1", total_error)
-  
+
   ! getting path to dataset in /Group1
-  
+
   CALL H5Rget_name_f(dsetr_id, ref(2), buf_big, error, buf_size )
   CALL check("H5Rget_name_f", error, total_error)
   CALL VERIFY("H5Rget_name_f", INT(buf_size),14,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_big), "/GROUP1/GROUP2", total_error)
-  
+
   !
   !Close the dataset
-  ! 
+  !
   CALL h5dclose_f(dsetr_id, error)
   CALL check("h5dclose_f",error,total_error)
-  
-  ! 
+
+  !
   ! Reopen the dataset with object references
   !
   CALL h5dopen_f(file_id, dsetnamer,dsetr_id,error)
@@ -180,60 +180,60 @@ SUBROUTINE refobjtest(cleanup, total_error)
   ref_dim(1) = SIZE(ref_out)
   CALL h5dread_f(dsetr_id, H5T_STD_REF_OBJ, ref_out, ref_dim, error)
   CALL check("h5dread_f",error,total_error)
-  
+
   !
   !get the third reference's type and Dereference it
   !
-  CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error) 
+  CALL h5rget_object_type_f(dsetr_id, ref(3), obj_type, error)
   CALL check("h5rget_object_type_f",error,total_error)
-  IF (obj_type == H5G_DATASET_F) THEN 
+  IF (obj_type == H5G_DATASET_F) THEN
      CALL h5rdereference_f(dsetr_id, ref(3), dset1_id, error)
      CALL check("h5rdereference_f",error,total_error)
-     
+
      data_dims(1) = 5
      CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
      CALL check("h5dwrite_f",error,total_error)
   END IF
-  
+
   !
   !get the fourth reference's type and Dereference it
   !
-  CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error) 
+  CALL h5rget_object_type_f(dsetr_id, ref(4), obj_type, error)
   CALL check("h5rget_object_type_f",error,total_error)
-  IF (obj_type == H5G_TYPE_F) THEN 
+  IF (obj_type == H5G_TYPE_F) THEN
      CALL h5rdereference_f(dsetr_id, ref(4), type_id, error)
      CALL check("h5rdereference_f",error,total_error)
   END IF
-  
+
   !
   ! Close all objects.
-  !          
+  !
   CALL h5dclose_f(dset1_id, error)
   CALL check("h5dclose_f",error,total_error)
   CALL h5tclose_f(type_id, error)
   CALL check("h5tclose_f",error,total_error)
-  
+
   CALL h5dclose_f(dsetr_id, error)
   CALL check("h5dclose_f",error,total_error)
   CALL h5fclose_f(file_id, error)
   CALL check("h5fclose_f",error,total_error)
-  
-  
+
+
   IF(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
   CALL check("h5_cleanup_f", error, total_error)
   RETURN
-  
+
 END SUBROUTINE refobjtest
 !
 !   The following subroutine tests h5rget_region_f, h5rcreate_f, h5rget_name_f,
 !   and h5rdereference_f functionalities
-! 
+!
 SUBROUTINE refregtest(cleanup, total_error)
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
   IMPLICIT NONE
   LOGICAL, INTENT(IN)  :: cleanup
-  INTEGER, INTENT(OUT) :: total_error 
-  
+  INTEGER, INTENT(OUT) :: total_error
+
   CHARACTER(LEN=6), PARAMETER :: filename = "Refreg"
   CHARACTER(LEN=80) :: fix_filename
   CHARACTER(LEN=6), PARAMETER :: dsetnamev = "MATRIX"
@@ -243,24 +243,24 @@ SUBROUTINE refregtest(cleanup, total_error)
   CHARACTER(LEN=11) :: buf_big    ! buffer bigger then needed
   CHARACTER(LEN=4) :: buf_small  ! buffer smaller then needed
   INTEGER(SIZE_T) :: buf_size     ! returned size of the region buffer name
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: space_id      ! Dataspace identifier 
-  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier 
-  INTEGER(HID_T) :: dsetv_id      ! Dataset identifier 
-  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: space_id      ! Dataspace identifier
+  INTEGER(HID_T) :: spacer_id     ! Dataspace identifier
+  INTEGER(HID_T) :: dsetv_id      ! Dataset identifier
+  INTEGER(HID_T) :: dsetr_id      ! Dataset identifier
   INTEGER     ::   error
   TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref     ! Buffers to store references
   TYPE(hdset_reg_ref_t_f) , DIMENSION(2) :: ref_out !
   INTEGER(HSIZE_T), DIMENSION(2) :: ref_dim
   INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
   INTEGER(HSIZE_T), DIMENSION(2) :: dims = (/2,9/)  ! Datasets dimensions
-  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr = (/2/)   ! 
+  INTEGER(HSIZE_T), DIMENSION(1) :: dimsr = (/2/)   !
   INTEGER(HSIZE_T), DIMENSION(2) :: start
   INTEGER(HSIZE_T), DIMENSION(2) :: count
-  INTEGER :: rankr = 1 
+  INTEGER :: rankr = 1
   INTEGER :: rank = 2
-  INTEGER , DIMENSION(2,9) ::  DATA 
-  INTEGER , DIMENSION(2,9) ::  data_out = 0 
+  INTEGER , DIMENSION(2,9) ::  DATA
+  INTEGER , DIMENSION(2,9) ::  data_out = 0
   INTEGER(HSIZE_T) , DIMENSION(2,3) :: coord
   INTEGER(SIZE_T) ::num_points = 3  ! Number of selected points
   coord = RESHAPE((/1,1,2,7,1,9/), (/2,3/))   ! Coordinates of selected points
@@ -281,30 +281,30 @@ SUBROUTINE refregtest(cleanup, total_error)
   ENDIF
   CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
   ! Default file access and file creation
-  ! properties are used. 
+  ! properties are used.
   CALL check("h5fcreate_f", error, total_error)
-  ! 
+  !
   ! Create  dataspaces:
-  ! 
-  ! for dataset with references to dataset regions 
+  !
+  ! for dataset with references to dataset regions
   !
   CALL h5screate_simple_f(rankr, dimsr, spacer_id, error)
   CALL check("h5screate_simple_f", error, total_error)
   !
-  ! for integer dataset 
+  ! for integer dataset
   !
   CALL h5screate_simple_f(rank, dims, space_id, error)
   CALL check("h5screate_simple_f", error, total_error)
   !
   ! Create  and write datasets:
   !
-  ! Integer dataset 
+  ! Integer dataset
   !
   CALL h5dcreate_f(file_id, dsetnamev, H5T_NATIVE_INTEGER, space_id, &
        dsetv_id, error)
   CALL check("h5dcreate_f", error, total_error)
   data_dims(1) = 2
-  data_dims(2) = 9 
+  data_dims(2) = 9
   CALL h5dwrite_f(dsetv_id, H5T_NATIVE_INTEGER, DATA, data_dims, error)
   CALL check("h5dwrite_f", error, total_error)
 
@@ -319,14 +319,14 @@ SUBROUTINE refregtest(cleanup, total_error)
   !
   ! Create a reference to the hyperslab selection.
   !
-  start(1) = 0 
-  start(2) = 3 
+  start(1) = 0
+  start(2) = 3
   COUNT(1) = 2
   COUNT(2) = 3
   CALL h5sselect_hyperslab_f(space_id, H5S_SELECT_SET_F, &
-       start, count, error) 
+       start, count, error)
   CALL check("h5sselect_hyperslab_f", error, total_error)
-  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error) 
+  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(1), error)
   CALL check("h5rcreate_f", error, total_error)
   !
   ! Create a reference to elements selection.
@@ -334,15 +334,15 @@ SUBROUTINE refregtest(cleanup, total_error)
   CALL h5sselect_none_f(space_id, error)
   CALL check("h5sselect_none_f", error, total_error)
   CALL h5sselect_elements_f(space_id, H5S_SELECT_SET_F, rank, num_points,&
-       coord, error) 
+       coord, error)
   CALL check("h5sselect_elements_f", error, total_error)
-  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error) 
+  CALL h5rcreate_f(file_id, dsetnamev, space_id, ref(2), error)
   CALL check("h5rcreate_f", error, total_error)
   !
-  ! Write dataset with the references. 
+  ! Write dataset with the references.
   !
   ref_dim(1) = SIZE(ref)
-  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_dim, error) 
+  CALL h5dwrite_f(dsetr_id, H5T_STD_REF_DSETREG, ref, ref_dim, error)
   CALL check("h5dwrite_f", error, total_error)
   !
   ! Close all objects.
@@ -366,7 +366,7 @@ SUBROUTINE refregtest(cleanup, total_error)
   ! Read references to the dataset regions.
   !
   ref_dim(1) = SIZE(ref_out)
-  CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_dim, error) 
+  CALL h5dread_f(dsetr_id, H5T_STD_REF_DSETREG, ref_out, ref_dim, error)
   CALL check("h5dread_f", error, total_error)
 
 
@@ -391,12 +391,12 @@ SUBROUTINE refregtest(cleanup, total_error)
   CALL VERIFY("H5Rget_name_f", INT(buf_size),7,total_error)
   CALL VerifyString("H5Rget_name_f", TRIM(buf_small), "/MAT", total_error)
 
-  ! 
+  !
   ! Dereference the first reference.
-  ! 
+  !
   CALL H5rdereference_f(dsetr_id, ref_out(1), dsetv_id, error)
   CALL check("h5rdereference_f", error, total_error)
-  CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error) 
+  CALL H5rget_region_f(dsetr_id, ref_out(1), space_id, error)
   CALL check("h5rget_region_f", error, total_error)
 
   ! Get name of the dataset the second region reference points to using H5Rget_name_f
@@ -418,13 +418,13 @@ SUBROUTINE refregtest(cleanup, total_error)
   CALL h5dclose_f(dsetv_id, error)
   CALL check("h5dclose_f", error, total_error)
   data_out = 0
-  !  
+  !
   ! Dereference the second reference.
-  ! 
+  !
   CALL H5rdereference_f(dsetr_id, ref_out(2), dsetv_id, error)
   CALL check("h5rdereference_f", error, total_error)
 
-  CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error) 
+  CALL H5rget_region_f(dsetr_id, ref_out(2), space_id, error)
   CALL check("h5rget_region_f", error, total_error)
   !
   ! Read selected data from the dataset.
diff --git a/fortran/test/tH5S.f90 b/fortran/test/tH5S.f90
index 63efe5f..29943bb 100644
--- a/fortran/test/tH5S.f90
+++ b/fortran/test/tH5S.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,35 +11,35 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing Dataspace Interface functionality.
 !
 !
 !   The following subroutine tests the following functionalities:
-!   h5screate_f, h5scopy_f, h5screate_simple_f, h5sis_simple_f,   
-!   h5sget_simple_extent_dims_f,h5sget_simple_extent_ndims_f 
+!   h5screate_f, h5scopy_f, h5screate_simple_f, h5sis_simple_f,
+!   h5sget_simple_extent_dims_f,h5sget_simple_extent_ndims_f
 !   h5sget_simple_extent_npoints_f, h5sget_simple_extent_type_f,
-!   h5sextent_copy_f, h5sset_extent_simple_f, h5sset_extent_none_f     
+!   h5sextent_copy_f, h5sset_extent_simple_f, h5sset_extent_none_f
 !
         SUBROUTINE dataspace_basic_test(cleanup, total_error)
 
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN)  :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           CHARACTER(LEN=10), PARAMETER :: filename1 = "basicspace" ! File1 name
           CHARACTER(LEN=9), PARAMETER :: filename2 = "copyspace"  ! File2 name
-          CHARACTER(LEN=80) :: fix_filename1 
-          CHARACTER(LEN=80) :: fix_filename2 
+          CHARACTER(LEN=80) :: fix_filename1
+          CHARACTER(LEN=80) :: fix_filename2
           CHARACTER(LEN=9), PARAMETER :: dsetname = "basicdset"       ! Dataset name
 
-          INTEGER(HID_T) :: file1_id, file2_id     ! File identifiers 
-          INTEGER(HID_T) :: dset1_id, dset2_id     ! Dataset identifiers 
+          INTEGER(HID_T) :: file1_id, file2_id     ! File identifiers
+          INTEGER(HID_T) :: dset1_id, dset2_id     ! Dataset identifiers
           INTEGER(HID_T) :: space1_id, space2_id   ! Dataspace identifiers
 
           INTEGER(HSIZE_T), DIMENSION(2) :: dims1 = (/4,6/) ! Dataset dimensions
@@ -81,10 +81,10 @@
           !
 !          CALL h5init_types_f(error)
 !              CALL check("h5init_types_f", error, total_error)
-          
+
           !
           ! Create new files using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -101,53 +101,53 @@
           CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
               CALL check("h5fcreate_f", error, total_error)
 
-          ! 
+          !
           ! Create dataspace for file1.
           !
           CALL h5screate_simple_f(rank1, dims1, space1_id, error, maxdims1)
               CALL check("h5screate_simple_f", error, total_error)
-          ! 
+          !
           ! Copy space1_id to space2_id.
           !
           CALL h5scopy_f(space1_id, space2_id, error)
               CALL check("h5scopy_f", error, total_error)
 
-          ! 
+          !
           !Check whether copied space is simple.
           !
           CALL h5sis_simple_f(space2_id, flag, error)
               CALL check("h5sissimple_f", error, total_error)
           IF (.NOT. flag) write(*,*) "dataspace is not simple type"
-      
-          ! 
+
+          !
           !set the copied space to none.
           !
           CALL h5sset_extent_none_f(space2_id, error)
               CALL check("h5sset_extent_none_f", error, total_error)
- 
-          ! 
+
+          !
           !copy the extent of space1_id to space2_id.
           !
-          CALL h5sextent_copy_f(space2_id, space1_id, error) 
+          CALL h5sextent_copy_f(space2_id, space1_id, error)
               CALL check("h5sextent_copy_f", error, total_error)
 
-          ! 
+          !
           !get the copied space's dimensions.
           !
           CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
               CALL check("h5sget_simple_extent_dims_f", error, total_error)
           IF ((dimsout(1) .NE. dims1(1)) .OR. (dimsout(2) .NE. dims1(2)) ) THEN
-              write(*,*)"error occured, copied dims not same" 
+              write(*,*)"error occured, copied dims not same"
           END IF
-   
-          ! 
+
+          !
           !get the copied space's rank.
           !
           CALL h5sget_simple_extent_ndims_f(space2_id, rank2, error)
               CALL check("h5sget_simple_extent_ndims_f", error, total_error)
-          IF (rank2 .NE. rank1) write(*,*)"error occured, copied ranks not same" 
-   
-          ! 
+          IF (rank2 .NE. rank1) write(*,*)"error occured, copied ranks not same"
+
+          !
           !get the copied space's number of elements.
           !
           CALL h5sget_simple_extent_npoints_f(space2_id, npoints, error)
@@ -155,27 +155,27 @@
           IF (npoints .NE. 24) write(*,*)"error occured, number of elements not correct"
 
 
-          ! 
+          !
           !get the copied space's class type.
           !
-          CALL h5sget_simple_extent_type_f(space2_id, classtype, error)   
+          CALL h5sget_simple_extent_type_f(space2_id, classtype, error)
               CALL check("h5sget_simple_extent_type_f", error, total_error)
           IF (classtype .NE. 1) write(*,*)"class type not H5S_SIMPLE_f"
 
-          ! 
+          !
           !set the copied space to dim2 size.
           !
           CALL h5sset_extent_simple_f(space2_id, rank2, dims2, maxdims2, error)
               CALL check("h5sset_extent_simple_f", error, total_error)
 
-          ! 
+          !
           !get the copied space's dimensions.
           !
           CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
               CALL check("h5sget_simple_extent_dims_f", error, total_error)
           IF ((dimsout(1) .NE. dims2(1)) .OR. (dimsout(2) .NE. dims2(2)) ) THEN
               write(*,*)"error occured, copied dims not same"
-          END IF 
+          END IF
 
           !
           ! Create the datasets with default properties in two files.
@@ -196,7 +196,7 @@
           CALL h5dwrite_f(dset1_id, H5T_NATIVE_INTEGER, data1_in, data_dims, error)
               CALL check("h5dwrite_f", error, total_error)
 
-          data_dims(1) = 6 
+          data_dims(1) = 6
           data_dims(2) = 6
           CALL h5dwrite_f(dset2_id, H5T_NATIVE_INTEGER, data2_in, data_dims, error)
               CALL check("h5dwrite_f", error, total_error)
@@ -211,40 +211,40 @@
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, 4
               do j = 1, 6
-                  IF (data1_out(i,j) .NE. data1_in(i, j)) THEN 
+                  IF (data1_out(i,j) .NE. data1_in(i, j)) THEN
                       write(*, *) "dataset test error occured"
                       write(*,*) "data read is not the same as the data writen"
                   END IF
-              end do    
+              end do
           end do
 
 
           !
           ! Read the second dataset.
           !
-          data_dims(1) = 6 
+          data_dims(1) = 6
           data_dims(2) = 6
           CALL h5dread_f(dset2_id, H5T_NATIVE_INTEGER, data2_out, data_dims, error)
               CALL check("h5dread_f", error, total_error)
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, 6
               do j = 1, 6
-                  IF (data2_out(i,j) .NE. data2_in(i, j)) THEN 
+                  IF (data2_out(i,j) .NE. data2_in(i, j)) THEN
                       write(*, *) "dataset test error occured"
                       write(*,*) "data read is not the same as the data writen"
                   END IF
-              end do    
+              end do
           end do
 
-          !   
+          !
           !Close the datasets.
-          ! 
+          !
           CALL h5dclose_f(dset1_id, error)
               CALL check("h5dclose_f", error, total_error)
           CALL h5dclose_f(dset2_id, error)
@@ -257,14 +257,14 @@
               CALL check("h5sclose_f", error, total_error)
           CALL h5sclose_f(space2_id, error)
               CALL check("h5sclose_f", error, total_error)
-          ! 
+          !
           ! Close the files.
           !
           CALL h5fclose_f(file1_id, error)
               CALL check("h5fclose_f", error, total_error)
           CALL h5fclose_f(file2_id, error)
               CALL check("h5fclose_f", error, total_error)
-     
+
 
           if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
diff --git a/fortran/test/tH5Sselect.f90 b/fortran/test/tH5Sselect.f90
index a004ba7..14872c7 100644
--- a/fortran/test/tH5Sselect.f90
+++ b/fortran/test/tH5Sselect.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,9 +11,9 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
-! 
 !    Testing Selection-related Dataspace Interface functionality.
 !
 
@@ -22,17 +22,17 @@
 !    h5sget_select_npoints_f, h5sselect_elements_f, h5sselect_all_f,
 !    h5sselect_none_f, h5sselect_valid_f, h5sselect_hyperslab_f,
 !    h5sget_select_bounds_f, h5sget_select_elem_pointlist_f,
-!    h5sget_select_elem_npoints_f, h5sget_select_hyper_blocklist_f, 
+!    h5sget_select_elem_npoints_f, h5sget_select_hyper_blocklist_f,
 !    h5sget_select_hyper_nblocks_f, h5sget_select_npoints_f
 !
 
   SUBROUTINE test_select_hyperslab(cleanup, total_error)
 
-    USE HDF5 ! This module contains all necessary modules 
+    USE HDF5 ! This module contains all necessary modules
 
     IMPLICIT NONE
     LOGICAL, INTENT(IN) :: cleanup
-    INTEGER, INTENT(OUT) :: total_error 
+    INTEGER, INTENT(OUT) :: total_error
 
     CHARACTER(LEN=7), PARAMETER :: filename = "tselect"
     CHARACTER(LEN=80) :: fix_filename
@@ -42,60 +42,60 @@
     !
     CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray"
 
-    INTEGER(HID_T) :: file_id       ! File identifier 
-    INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-    INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-    INTEGER(HID_T) :: memspace      ! memspace identifier 
+    INTEGER(HID_T) :: file_id       ! File identifier
+    INTEGER(HID_T) :: dset_id       ! Dataset identifier
+    INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+    INTEGER(HID_T) :: memspace      ! memspace identifier
 
     !
-    !Memory space dimensions 
+    !Memory space dimensions
     !
     INTEGER(HSIZE_T), DIMENSION(3) :: dimsm = (/7,7,3/)
 
 
     !
-    !Dataset dimensions 
+    !Dataset dimensions
     !
     INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/)
 
     !
-    !Size of the hyperslab in the file 
+    !Size of the hyperslab in the file
     !
     INTEGER(HSIZE_T), DIMENSION(2) :: count = (/3,4/)
 
     !
-    !hyperslab offset in the file 
+    !hyperslab offset in the file
     !
     INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/1,2/)
 
     !
-    !Size of the hyperslab in memory 
+    !Size of the hyperslab in memory
     !
     INTEGER(HSIZE_T), DIMENSION(3) :: count_out = (/3,4,1/)
 
     !
-    !hyperslab offset in memory 
+    !hyperslab offset in memory
     !
     INTEGER(HSIZE_T), DIMENSION(3) :: offset_out = (/3,0,0/)
 
     !
-    !data to write 
+    !data to write
     !
     INTEGER, DIMENSION(5,6) :: data
 
     !
-    !output buffer 
+    !output buffer
     !
     INTEGER, DIMENSION(7,7,3) :: data_out
 
 
     !
-    !dataset space rank 
+    !dataset space rank
     !
-    INTEGER :: dsetrank = 2 
+    INTEGER :: dsetrank = 2
 
     !
-    !memspace rank 
+    !memspace rank
     !
     INTEGER :: memrank = 3
 
@@ -103,23 +103,23 @@
 
 
     !
-    !general purpose integer 
+    !general purpose integer
     !
-    INTEGER :: i, j 
+    INTEGER :: i, j
 
     !
-    !flag to check operation success 
+    !flag to check operation success
     !
-    INTEGER :: error 
+    INTEGER :: error
     INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
 
 
     !
-    !This writes data to the HDF5 file.  
+    !This writes data to the HDF5 file.
     !
 
     !
-    !data initialization 
+    !data initialization
     !
     do i = 1, 5
        do j = 1, 6
@@ -137,12 +137,12 @@
     !
     !Initialize FORTRAN predifined datatypes
     !
-!    CALL h5init_types_f(error) 
+!    CALL h5init_types_f(error)
 !    CALL check("h5init_types_f", error, total_error)
 
     !
     !Create a new file using default properties.
-    ! 
+    !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -152,7 +152,7 @@
     CALL check("h5fcreate_f", error, total_error)
 
     !
-    !Create the data space for the  dataset. 
+    !Create the data space for the  dataset.
     !
     CALL h5screate_simple_f(dsetrank, dimsf, dataspace, error)
     CALL check("h5screate_simple_f", error, total_error)
@@ -168,7 +168,7 @@
     ! Write the dataset
     !
     data_dims(1) = 5
-    data_dims(2) = 6 
+    data_dims(2) = 6
     CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
     CALL check("h5dwrite_f", error, total_error)
 
@@ -191,7 +191,7 @@
     CALL check("h5fclose_f", error, total_error)
 
     !
-    !This reads the hyperslab from the sds.h5 file just 
+    !This reads the hyperslab from the sds.h5 file just
     !created, into a 2-dimensional plane of the 3-dimensional array.
     !
 
@@ -228,7 +228,7 @@
     !Select hyperslab in the dataset.
     !
     CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-         offset, count, error) 
+         offset, count, error)
     CALL check("h5sselect_hyperslab_f", error, total_error)
     !
     !create memory dataspace.
@@ -240,16 +240,16 @@
     !Select hyperslab in memory.
     !
     CALL h5sselect_hyperslab_f(memspace, H5S_SELECT_SET_F, &
-         offset_out, count_out, error) 
+         offset_out, count_out, error)
     CALL check("h5sselect_hyperslab_f", error, total_error)
 
     !
-    !Read data from hyperslab in the file into the hyperslab in 
+    !Read data from hyperslab in the file into the hyperslab in
     !memory and display.
     !
     data_dims(1) = 7
-    data_dims(2) = 7 
-    data_dims(3) = 3 
+    data_dims(2) = 7
+    data_dims(3) = 3
     CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, data_out, data_dims, error, &
          memspace, dataspace)
     CALL check("h5dread_f", error, total_error)
@@ -264,7 +264,7 @@
     ! 0 0 0 0 0 0 0
     ! 0 0 0 0 0 0 0
     ! 0 0 0 0 0 0 0
-    ! 3 4 5 6 0 0 0  
+    ! 3 4 5 6 0 0 0
     ! 4 5 6 7 0 0 0
     ! 5 6 7 8 0 0 0
     ! 0 0 0 0 0 0 0
@@ -307,11 +307,11 @@
 
   SUBROUTINE test_select_element(cleanup, total_error)
 
-    USE HDF5 ! This module contains all necessary modules 
+    USE HDF5 ! This module contains all necessary modules
 
     IMPLICIT NONE
     LOGICAL, INTENT(IN)  :: cleanup
-    INTEGER, INTENT(OUT) :: total_error 
+    INTEGER, INTENT(OUT) :: total_error
 
     !
     !the dataset1 is stored in file "copy1.h5"
@@ -335,60 +335,60 @@
     CHARACTER(LEN=8), PARAMETER :: dsetname2 = "Copy2"
 
     !
-    !dataset rank 
+    !dataset rank
     !
     INTEGER, PARAMETER :: RANK = 2
 
     !
-    !number of points selected 
+    !number of points selected
     !
     INTEGER(SIZE_T), PARAMETER :: NUMP = 2
 
-    INTEGER(HID_T) :: file1_id       ! File1 identifier 
-    INTEGER(HID_T) :: file2_id       ! File2 identifier 
-    INTEGER(HID_T) :: dset1_id       ! Dataset1 identifier 
-    INTEGER(HID_T) :: dset2_id       ! Dataset2 identifier 
-    INTEGER(HID_T) :: dataspace1     ! Dataspace identifier 
-    INTEGER(HID_T) :: dataspace2     ! Dataspace identifier 
-    INTEGER(HID_T) :: memspace       ! memspace identifier 
+    INTEGER(HID_T) :: file1_id       ! File1 identifier
+    INTEGER(HID_T) :: file2_id       ! File2 identifier
+    INTEGER(HID_T) :: dset1_id       ! Dataset1 identifier
+    INTEGER(HID_T) :: dset2_id       ! Dataset2 identifier
+    INTEGER(HID_T) :: dataspace1     ! Dataspace identifier
+    INTEGER(HID_T) :: dataspace2     ! Dataspace identifier
+    INTEGER(HID_T) :: memspace       ! memspace identifier
 
     !
-    !Memory space dimensions 
+    !Memory space dimensions
     !
     INTEGER(HSIZE_T), DIMENSION(1) :: dimsm = (/2/)
 
     !
-    !Dataset dimensions 
+    !Dataset dimensions
     !
     INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/3,4/)
 
     !
-    !Points positions in the file 
+    !Points positions in the file
     !
     INTEGER(HSIZE_T), DIMENSION(RANK,NUMP) :: coord
 
     !
-    !data buffers 
+    !data buffers
     !
     INTEGER, DIMENSION(3,4) :: buf1, buf2, bufnew
 
     !
-    !value to write 
+    !value to write
     !
     INTEGER, DIMENSION(2) :: val = (/53, 59/)
 
     !
-    !memory rank 
+    !memory rank
     !
-    INTEGER :: memrank = 1 
+    INTEGER :: memrank = 1
 
     !
-    !general purpose integer 
+    !general purpose integer
     !
-    INTEGER :: i, j 
+    INTEGER :: i, j
 
     !
-    !flag to check operation success 
+    !flag to check operation success
     !
     INTEGER :: error
     INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
@@ -396,11 +396,11 @@
 
     !
     !Create two files containing identical datasets. Write 0's to one
-    !and 1's to the other. 
+    !and 1's to the other.
     !
 
     !
-    !data initialization 
+    !data initialization
     !
     do i = 1, 3
        do j = 1, 4
@@ -417,12 +417,12 @@
     !
     !Initialize FORTRAN predifined datatypes
     !
-!    CALL h5init_types_f(error) 
+!    CALL h5init_types_f(error)
 !    CALL check("h5init_types_f", error, total_error)
 
     !
     !Create file1, file2  using default properties.
-    ! 
+    !
           CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -440,7 +440,7 @@
     CALL check("h5fcreate_f", error, total_error)
 
     !
-    !Create the data space for the  datasets. 
+    !Create the data space for the  datasets.
     !
     CALL h5screate_simple_f(RANK, dimsf, dataspace1, error)
     CALL check("h5screate_simple_f", error, total_error)
@@ -498,8 +498,8 @@
     CALL check("h5fclose_f", error, total_error)
 
     !
-    !Open the two files.  Select two points in one file, write values to 
-    !those point locations, then do H5Scopy and write the values to the  
+    !Open the two files.  Select two points in one file, write values to
+    !those point locations, then do H5Scopy and write the values to the
     !other file.  Close files.
     !
 
@@ -534,12 +534,12 @@
     CALL check("h5screate_simple_f", error, total_error)
 
     !
-    !Set the selected point positions.Because Fortran array index starts 
+    !Set the selected point positions.Because Fortran array index starts
     ! from 1, so add one to the actual select points in C
     !
-    coord(1,1) = 1     
-    coord(2,1) = 2     
-    coord(1,2) = 1     
+    coord(1,1) = 1
+    coord(2,1) = 2
+    coord(1,2) = 1
     coord(2,2) = 4
 
     !
@@ -560,7 +560,7 @@
     !
     !Copy the daspace1 into dataspace2
     !
-    CALL h5scopy_f(dataspace1, dataspace2, error)  
+    CALL h5scopy_f(dataspace1, dataspace2, error)
     CALL check("h5scopy_f", error, total_error)
 
     !
@@ -683,25 +683,25 @@
 
 
   SUBROUTINE test_basic_select(cleanup, total_error)
-    USE HDF5 ! This module contains all necessary modules 
+    USE HDF5 ! This module contains all necessary modules
 
     IMPLICIT NONE
     LOGICAL, INTENT(IN)  :: cleanup
-    INTEGER, INTENT(OUT) :: total_error 
+    INTEGER, INTENT(OUT) :: total_error
 
      !
      !the dataset is stored in file "testselect.h5"
      !
      CHARACTER(LEN=10), PARAMETER :: filename = "testselect"
-     CHARACTER(LEN=80) :: fix_filename 
+     CHARACTER(LEN=80) :: fix_filename
 
      !
-     !dataspace rank 
+     !dataspace rank
      !
      INTEGER, PARAMETER :: RANK = 2
 
      !
-     !select NUMP_POINTS points from the file 
+     !select NUMP_POINTS points from the file
      !
      INTEGER(SIZE_T), PARAMETER :: NUMPS = 10
 
@@ -710,92 +710,92 @@
      !
      CHARACTER(LEN=10), PARAMETER :: dsetname = "testselect"
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
      INTEGER(HID_T) :: dataspace     ! Dataspace identifier
 
      !
-     !Dataset dimensions 
+     !Dataset dimensions
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: dimsf = (/5,6/)
 
      !
-     !Size of the hyperslab in the file 
+     !Size of the hyperslab in the file
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: count = (/2,2/)
 
      !
-     !hyperslab offset in the file 
+     !hyperslab offset in the file
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: offset = (/0,0/)
 
      !
-     !start block for getting the selected hyperslab 
+     !start block for getting the selected hyperslab
      !
      INTEGER(HSIZE_T) :: startblock = 0
 
      !
-     !start point for getting the selected elements 
+     !start point for getting the selected elements
      !
      INTEGER(HSIZE_T)  :: startpoint = 0
 
      !
-     !Stride of the hyperslab in the file 
+     !Stride of the hyperslab in the file
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: stride = (/3,3/)
 
      !
-     !BLock size of the hyperslab in the file 
+     !BLock size of the hyperslab in the file
      !
      INTEGER(HSIZE_T), DIMENSION(2) :: block = (/2,2/)
 
      !
-     !array to give selected points' coordinations 
+     !array to give selected points' coordinations
      !
      INTEGER(HSIZE_T), DIMENSION(RANK, NUMPS) :: coord
 
 
      !
-     !Number of hyperslabs selected in the current dataspace 
+     !Number of hyperslabs selected in the current dataspace
      !
      INTEGER(HSSIZE_T) :: num_blocks
 
      !
      !allocatable array for putting a list of hyperslabs
-     !selected in the current file dataspace 
+     !selected in the current file dataspace
      !
      INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: blocklist
 
      !
-     !Number of points selected in the current dataspace 
+     !Number of points selected in the current dataspace
      !
      INTEGER(HSSIZE_T) :: num_points
      INTEGER(HSIZE_T) :: num1_points
 
      !
      !allocatable array for putting a list of points
-     !selected in the current file dataspace 
+     !selected in the current file dataspace
      !
      INTEGER(HSIZE_T), ALLOCATABLE, DIMENSION(:) :: pointlist
 
      !
-     !start and end bounds in the current dataspace selection 
+     !start and end bounds in the current dataspace selection
      !
      INTEGER(HSIZE_T), DIMENSION(RANK) :: startout, endout
 
      !
-     !data to write 
+     !data to write
      !
      INTEGER, DIMENSION(5,6) :: data
 
      !
-     !flag to check operation success 
+     !flag to check operation success
      !
      INTEGER :: error
      INTEGER(HSIZE_T), DIMENSION(3) :: data_dims
 
      !
-     !initialize the coord array to give the selected points' position 
+     !initialize the coord array to give the selected points' position
      !
      coord(1,1) = 1
      coord(2,1) = 1
@@ -820,7 +820,7 @@
 
      !
      !Create a new file using default properties.
-     ! 
+     !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -830,7 +830,7 @@
      CALL check("h5fcreate_f", error, total_error)
 
      !
-     !Create the data space for the  dataset. 
+     !Create the data space for the  dataset.
      !
      CALL h5screate_simple_f(RANK, dimsf, dataspace, error)
      CALL check("h5screate_simple_f", error, total_error)
@@ -873,7 +873,7 @@
      !
      CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
      CALL check("h5fopen_f", error, total_error)
-       
+
      !
      !Open the  dataset.
      !
@@ -890,11 +890,11 @@
      !Select hyperslab in the dataset.
      !
      CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-                                offset, count, error, stride, block) 
+                                offset, count, error, stride, block)
      CALL check("h5sselect_hyperslab_f", error, total_error)
 
      !
-     !get the number of hyperslab blocks in the current dataspac selection 
+     !get the number of hyperslab blocks in the current dataspac selection
      !
      CALL h5sget_select_hyper_nblocks_f(dataspace, num_blocks, error)
      CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
@@ -909,16 +909,16 @@
      if(error .NE. 0) then
          STOP
      endif
-     
+
      !
-     !get the list of hyperslabs selected in the current dataspac selection 
+     !get the list of hyperslabs selected in the current dataspac selection
      !
      CALL h5sget_select_hyper_blocklist_f(dataspace, startblock, &
                                           num_blocks, blocklist, error)
      CALL check("h5sget_select_hyper_blocklist_f", error, total_error)
      !write(*,*) (blocklist(i), i =1, num_blocks*RANK*2)
      !result of blocklist selected is:
-     !1,  1,  2,  2,  4,  1,  5,  2,  1,  4,  2,  5,  4,  4,  5,  5     
+     !1,  1,  2,  2,  4,  1,  5,  2,  1,  4,  2,  5,  4,  4,  5,  5
 
      !
      !deallocate the blocklist array
@@ -926,7 +926,7 @@
      DEALLOCATE(blocklist)
 
      !
-     !get the selection bounds in the current dataspac selection 
+     !get the selection bounds in the current dataspac selection
      !
      CALL h5sget_select_bounds_f(dataspace, startout, endout, error)
      CALL check("h5sget_select_bounds_f", error, total_error)
@@ -965,7 +965,7 @@
      CALL h5sget_select_elem_npoints_f(dataspace, num_points, error)
      CALL check("h5sget_select_elem_npoints_f", error, total_error)
      IF (num_points .NE. 10) write(*,*) "error occured with num_points"
-     !write(*,*) num_points 
+     !write(*,*) num_points
      ! result of num_points is 10
 
      !
@@ -975,11 +975,11 @@
      CALL h5sget_select_elem_pointlist_f(dataspace, startpoint, &
                                           num1_points, pointlist, error)
      CALL check("h5sget_select_elem_pointlist_f", error, total_error)
-     !write(*,*) (pointlist(i), i =1, num1_points*RANK) 
+     !write(*,*) (pointlist(i), i =1, num1_points*RANK)
      !result of pintlist is:
-     !1,  1,  3,  1,  5,  1,  1,  3,  3,  3,  5,  3,  3, 
+     !1,  1,  3,  1,  5,  1,  1,  3,  3,  3,  5,  3,  3,
      !4,  1,  4,  3,  5,  5,  5
-      
+
      !
      !deallocate the pointlist array
      !
diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90
index 9901a53..ca5a352 100644
--- a/fortran/test/tH5T.f90
+++ b/fortran/test/tH5T.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE compoundtest(cleanup, total_error)
 !
@@ -30,20 +30,20 @@
 ! h5tequal_f, h5tinsert_array_f, h5tcommit_f, h5tencode_f, h5tdecode_f
 
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
      CHARACTER(LEN=8), PARAMETER :: filename = "compound" ! File name
      CHARACTER(LEN=80) :: fix_filename
      CHARACTER(LEN=8), PARAMETER :: dsetname = "Compound"     ! Dataset name
      INTEGER, PARAMETER :: dimsize = 6 ! Size of the dataset
-     INTEGER, PARAMETER :: COMP_NUM_MEMBERS = 4 ! Number of members in the compound datatype 
+     INTEGER, PARAMETER :: COMP_NUM_MEMBERS = 4 ! Number of members in the compound datatype
 
-     INTEGER(HID_T) :: file_id       ! File identifier 
-     INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+     INTEGER(HID_T) :: file_id       ! File identifier
+     INTEGER(HID_T) :: dset_id       ! Dataset identifier
      INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
      INTEGER(HID_T) :: dtype_id      ! Compound datatype identifier
      INTEGER(HID_T) :: dtarray_id    ! Compound datatype identifier
@@ -52,8 +52,8 @@
      INTEGER(HID_T) :: dt2_id      ! Memory datatype identifier (for integer field)
      INTEGER(HID_T) :: dt3_id      ! Memory datatype identifier (for double precision field)
      INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
-     INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier 
-     INTEGER(HID_T) :: membtype_id ! Datatype identifier 
+     INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
+     INTEGER(HID_T) :: membtype_id ! Datatype identifier
      INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
 
 
@@ -62,7 +62,7 @@
 
      INTEGER     ::   error ! Error flag
      INTEGER(SIZE_T)     ::   type_size  ! Size of the datatype
-     INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype 
+     INTEGER(SIZE_T)     ::   type_sizec  ! Size of the character datatype
      INTEGER(SIZE_T)     ::   type_sizei  ! Size of the integer datatype
      INTEGER(SIZE_T)     ::   type_sized  ! Size of the double precision datatype
      INTEGER(SIZE_T)     ::   type_sizer  ! Size of the real datatype
@@ -77,10 +77,10 @@
      REAL, DIMENSION(dimsize)             :: real_member
      REAL, DIMENSION(dimsize)             :: real_member_out
      INTEGER :: i
-     INTEGER :: class ! Datatype class              
+     INTEGER :: class ! Datatype class
      INTEGER :: num_members ! Number of members in the compound datatype
-     CHARACTER(LEN=256) :: member_name 
-     INTEGER :: len ! Lenght of the name of the compound datatype member 
+     CHARACTER(LEN=256) :: member_name
+     INTEGER :: len ! Lenght of the name of the compound datatype member
      INTEGER :: member_index ! index of the field
      INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/)
      INTEGER :: array_dims_range = 3
@@ -88,7 +88,7 @@
      INTEGER(SIZE_T) :: sizechar
      INTEGER(HSIZE_T), DIMENSION(1) :: data_dims
      LOGICAL :: flag = .TRUE.
-     
+
      CHARACTER(LEN=1024) :: cmpd_buf
      INTEGER(SIZE_T) :: cmpd_buf_size=0
      INTEGER(HID_T) :: decoded_sid1
@@ -101,8 +101,8 @@
      do i = 1, dimsize
         char_member(i)(1:1) = char(65+i)
         char_member(i)(2:2) = char(65+i)
-        char_member_out(i)(1:1)   = char(65) 
-        char_member_out(i)(2:2)   = char(65) 
+        char_member_out(i)(1:1)   = char(65)
+        char_member_out(i)(2:2)   = char(65)
         int_member(i)   = i
         int_member_out(i)   = 0
         double_member(i)   = 2.* i
@@ -121,7 +121,7 @@
          CALL check("h5pset_preserve_f", error, total_error)
      !
      ! Create a new file using default properties.
-     ! 
+     !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -130,7 +130,7 @@
      CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
          CALL check("h5fcreate_f", error, total_error)
 
-     ! 
+     !
      ! Create the dataspace.
      !
      CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -198,19 +198,19 @@
 !!$     ! /* Try decoding bogus buffer */
 !!$
 !!$     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
-!!$     CALL VERIFY("H5Tdecode_f", error, -1, total_error)  
-!!$     
+!!$     CALL VERIFY("H5Tdecode_f", error, -1, total_error)
+!!$
 !!$     CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
 !!$     CALL check("H5Tencode_f", error, total_error)
 !!$
 !!$     ! /* Decode from the compound buffer and return an object handle */
 !!$     CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
-!!$     CALL check("H5Tdecode_f", error, total_error)  
+!!$     CALL check("H5Tdecode_f", error, total_error)
 !!$
 !!$     ! /* Verify that the datatype was copied exactly */
-!!$     
+!!$
 !!$     CALL H5Tequal_f(decoded_tid1, dtype_id, flag, error)
-!!$     CALL check("H5Tequal_f", error, total_error) 
+!!$     CALL check("H5Tequal_f", error, total_error)
 !!$     CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
 
      !
@@ -220,8 +220,8 @@
                       dset_id, error)
          CALL check("h5dcreate_f", error, total_error)
      !
-     ! Create memory types. We have to create a compound datatype 
-     ! for each member we want to write. 
+     ! Create memory types. We have to create a compound datatype
+     ! for each member we want to write.
      !
      CALL h5tcreate_f(H5T_COMPOUND_F, type_sizec, dt1_id, error)
          CALL check("h5tcreate_f", error, total_error)
@@ -258,9 +258,9 @@
      CALL h5dwrite_f(dset_id, dt2_id, int_member, data_dims, error, xfer_prp = plist_id)
          CALL check("h5dwrite_f", error, total_error)
 
-     !   
+     !
      ! End access to the dataset and release resources used by it.
-     ! 
+     !
      CALL h5dclose_f(dset_id, error)
          CALL check("h5dclose_f", error, total_error)
 
@@ -284,7 +284,7 @@
          CALL check("h5tclose_f", error, total_error)
 
      !
-     ! Create and store compound datatype with the character and 
+     ! Create and store compound datatype with the character and
      ! array members.
      !
      type_size = type_sizec + elements*type_sizer ! Size of compound datatype
@@ -304,13 +304,13 @@
          CALL check("h5tclose_f", error, total_error)
      CALL h5tclose_f(dtarray_id, error)
          CALL check("h5tclose_f", error, total_error)
-      
-     ! 
+
+     !
      ! Close the file.
      !
      CALL h5fclose_f(file_id, error)
          CALL check("h5fclose_f", error, total_error)
-     
+
      !
      ! Open the file.
      !
@@ -324,7 +324,7 @@
      !
      ! Get datatype of the open dataset.
      ! Check it class, number of members,  and member's names.
-     ! 
+     !
      CALL h5dget_type_f(dset_id, dtype_id, error)
          CALL check("h5dget_type_f", error, total_error)
      CALL h5tget_class_f(dtype_id, class, error)
@@ -361,7 +361,7 @@
              if(offset_out .ne. 0) then
                write(*,*) "Offset of the char member is incorrect"
                total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
               CALL check("h5tget_member_type_f", error, total_error)
              CALL h5tequal_f(membtype_id, dt5_id, flag, error)
@@ -369,7 +369,7 @@
              if(.not. flag) then
                 write(*,*) "Wrong member type returned for character member"
                 total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_class_f(dtype_id, i-1, class, error)
               CALL check("h5tget_member_class_f",error, total_error)
               if (class .ne. H5T_STRING_F) then
@@ -380,7 +380,7 @@
              if(offset_out .ne. type_sizec) then
                write(*,*) "Offset of the integer member is incorrect"
                total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
               CALL check("h5tget_member_type_f", error, total_error)
              CALL h5tequal_f(membtype_id, H5T_NATIVE_INTEGER, flag, error)
@@ -388,7 +388,7 @@
              if(.not. flag) then
                 write(*,*) "Wrong member type returned for integer memebr"
                 total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_class_f(dtype_id, i-1, class, error)
               CALL check("h5tget_member_class_f",error, total_error)
               if (class .ne. H5T_INTEGER_F) then
@@ -399,7 +399,7 @@
              if(offset_out .ne. (type_sizec+type_sizei)) then
                write(*,*) "Offset of the double precision member is incorrect"
                total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
               CALL check("h5tget_member_type_f", error, total_error)
              CALL h5tequal_f(membtype_id, H5T_NATIVE_DOUBLE, flag, error)
@@ -407,7 +407,7 @@
              if(.not. flag) then
                 write(*,*) "Wrong member type returned for double precision memebr"
                 total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_class_f(dtype_id, i-1, class, error)
               CALL check("h5tget_member_class_f",error, total_error)
               if (class .ne. H5T_FLOAT_F) then
@@ -418,7 +418,7 @@
              if(offset_out .ne. (type_sizec+type_sizei+type_sized)) then
                write(*,*) "Offset of the real member is incorrect"
                total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_type_f(dtype_id, i-1, membtype_id, error)
               CALL check("h5tget_member_type_f", error, total_error)
              CALL h5tequal_f(membtype_id, H5T_NATIVE_REAL, flag, error)
@@ -426,7 +426,7 @@
              if(.not. flag) then
                 write(*,*) "Wrong member type returned for real memebr"
                 total_error = total_error + 1
-             endif 
+             endif
              CALL h5tget_member_class_f(dtype_id, i-1, class, error)
               CALL check("h5tget_member_class_f",error, total_error)
               if (class .ne. H5T_FLOAT_F) then
@@ -436,7 +436,7 @@
         CASE DEFAULT
                write(*,*) "Wrong member's name"
                total_error = total_error + 1
-  
+
         END SELECT CHECK_NAME
 
      enddo
@@ -445,7 +445,7 @@
      !
      CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt2_id, error)
          CALL check("h5tcopy_f", error, total_error)
-     sizechar = 2 
+     sizechar = 2
      CALL h5tset_size_f(dt2_id, sizechar, error)
          CALL check("h5tset_size_f", error, total_error)
      CALL h5tget_size_f(dt2_id, type_size, error)
@@ -533,19 +533,19 @@
      ! /* Try decoding bogus buffer */
 
      CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
-     CALL VERIFY("H5Tdecode_f", error, -1, total_error)  
-     
+     CALL VERIFY("H5Tdecode_f", error, -1, total_error)
+
      CALL H5Tencode_f(dtype_id, cmpd_buf, cmpd_buf_size, error)
      CALL check("H5Tencode_f", error, total_error)
 
      ! /* Decode from the compound buffer and return an object handle */
      CALL H5Tdecode_f(cmpd_buf, decoded_tid1, error)
-     CALL check("H5Tdecode_f", error, total_error)  
+     CALL check("H5Tdecode_f", error, total_error)
 
      ! /* Verify that the datatype was copied exactly */
-     
+
      CALL H5Tequal_f(decoded_tid1, dtype_id, flag, error)
-     CALL check("H5Tequal_f", error, total_error) 
+     CALL check("H5Tequal_f", error, total_error)
      CALL VerifyLogical("H5Tequal_f", flag, .TRUE., total_error)
      !
      ! Close all open objects.
@@ -572,35 +572,35 @@
 
 
 
-     
+
     SUBROUTINE basic_data_type_test(cleanup, total_error)
 
-!   This subroutine tests following functionalities: 
+!   This subroutine tests following functionalities:
 !   H5tget_precision_f, H5tset_precision_f, H5tget_offset_f
 !   H5tset_offset_f, H5tget_pad_f, H5tset_pad_f, H5tget_sign_f,
 !   H5tset_sign_f, H5tget_ebias_f,H5tset_ebias_f, H5tget_norm_f,
 !   H5tset_norm_f, H5tget_inpad_f, H5tset_inpad_f, H5tget_cset_f,
 !   H5tset_cset_f, H5tget_strpad_f, H5tset_strpad_f
 
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
 
-     INTEGER(HID_T) :: dtype1_id, dtype2_id, dtype3_id, dtype4_id, dtype5_id  
+     INTEGER(HID_T) :: dtype1_id, dtype2_id, dtype3_id, dtype4_id, dtype5_id
                                      ! datatype identifiers
      INTEGER(SIZE_T) :: precision ! Datatype precision
      INTEGER(SIZE_T) :: setprecision ! Datatype precision
      INTEGER(SIZE_T) :: offset ! Datatype offset
      INTEGER(SIZE_T) :: setoffset ! Datatype offset
-     INTEGER :: lsbpad !padding type of the least significant bit 
-     INTEGER :: msbpad !padding type of the most significant bit 
-     INTEGER :: sign !sign type for an integer type 
-     INTEGER(SIZE_T) :: ebias1 !Datatype exponent bias of a floating-point type 
+     INTEGER :: lsbpad !padding type of the least significant bit
+     INTEGER :: msbpad !padding type of the most significant bit
+     INTEGER :: sign !sign type for an integer type
+     INTEGER(SIZE_T) :: ebias1 !Datatype exponent bias of a floating-point type
      INTEGER(SIZE_T) :: ebias2 !Datatype exponent bias of a floating-point type
-     INTEGER(SIZE_T) :: setebias 
-     INTEGER :: norm   !mantissa normalization of a floating-point datatype 
+     INTEGER(SIZE_T) :: setebias
+     INTEGER :: norm   !mantissa normalization of a floating-point datatype
      INTEGER :: inpad   !padding type for unused bits in floating-point datatypes.
      INTEGER :: cset   !character set type of a string datatype
      INTEGER :: strpad !string padding method for a string datatype
@@ -608,7 +608,7 @@
 
 
      !
-     ! Create a datatype 
+     ! Create a datatype
      !
      CALL h5tcopy_f(H5T_STD_U16BE, dtype1_id, error)
      CALL check("h5tcopy_f",error,total_error)
@@ -624,17 +624,17 @@
          write (*,*) "got precision is not correct"
          total_error = total_error + 1
      end if
-     
+
      CALL h5tcopy_f(H5T_STD_I32LE, dtype2_id, error)
      CALL check("h5tcopy_f",error,total_error)
      setprecision = 12
      CALL h5tset_precision_f(dtype2_id, setprecision, error)
      CALL check("h5set_precision_f",error,total_error)
 
-     setoffset = 2 
+     setoffset = 2
      CALL h5tset_offset_f(dtype1_id, setoffset, error)
      CALL check("h5set_offset_f",error,total_error)
-     setoffset = 10 
+     setoffset = 10
      CALL h5tset_offset_f(dtype2_id, setoffset, error)
      CALL check("h5set_offset_f",error,total_error)
      CALL h5tget_offset_f(dtype2_id,offset, error)
@@ -643,7 +643,7 @@
          write (*,*) "got offset is not correct"
          total_error = total_error + 1
      end if
-         
+
      CALL h5tset_pad_f(dtype2_id,H5T_PAD_ONE_F, H5T_PAD_ONE_F, error)
      CALL check("h5set_pad_f",error,total_error)
      CALL h5tget_pad_f(dtype2_id,lsbpad,msbpad, error)
@@ -671,7 +671,7 @@
      setebias = 257
      CALL h5tset_ebias_f(dtype3_id, setebias, error)
      CALL check("h5tset_ebias_f",error,total_error)
-     setebias = 1 
+     setebias = 1
      CALL h5tset_ebias_f(dtype4_id, setebias, error)
      CALL check("h5tset_ebias_f",error,total_error)
      CALL h5tget_ebias_f(dtype3_id, ebias1, error)
@@ -686,7 +686,7 @@
          write (*,*) "got ebias is not correct"
          total_error = total_error + 1
      end if
-       
+
      !attention:
      !It seems that I can't use H5T_NORM_IMPLIED_F to set the norm value
      !because I got error for the get_norm function
@@ -744,7 +744,7 @@
      end if
 
 !     we should not apply h5tset_cset_f to non_character data typemake
- 
+
 !     CALL h5tset_cset_f(dtype4_id, H5T_CSET_ASCII_F, error)
 !     CALL check("h5tset_cset_f",error,total_error)
 !     CALL h5tget_cset_f(dtype4_id, cset, error)
@@ -803,13 +803,13 @@
     IMPLICIT none
 
     LOGICAL, INTENT(IN)  :: cleanup
-    INTEGER, INTENT(OUT) :: total_error 
+    INTEGER, INTENT(OUT) :: total_error
     CHARACTER(LEN=4), PARAMETER :: filename="enum"
     CHARACTER(LEN=80) :: fix_filename
     CHARACTER(LEN=8), PARAMETER :: dsetname="enumdset"
     CHARACTER(LEN=4)            :: true ="TRUE"
     CHARACTER(LEN=5)            :: false="FALSE"
-    CHARACTER(LEN=5)            :: mem_name 
+    CHARACTER(LEN=5)            :: mem_name
 
     INTEGER(HID_T) :: file_id
     INTEGER(HID_T) :: dset_id
@@ -818,7 +818,7 @@
     INTEGER        :: error
     INTEGER        :: value
     INTEGER(HSIZE_T), DIMENSION(1) :: dsize
-    INTEGER(SIZE_T) :: buf_size 
+    INTEGER(SIZE_T) :: buf_size
     INTEGER, DIMENSION(2) :: data
     INTEGER(HSIZE_T), DIMENSION(7) :: dims
 
@@ -828,7 +828,7 @@
     data(2) = 0
      !
      ! Create a new file using default properties.
-     ! 
+     !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -866,7 +866,7 @@
         if (value .ne. 1) then
             write(*,*) " Value of TRUE is not 1, error"
             total_error = total_error + 1
-        endif 
+        endif
     !
     !  Get name of 0
     !
@@ -883,5 +883,5 @@
     CALL h5fclose_f(file_id,error)
         CALL check("h5fclose_f", error, total_error)
     RETURN
-    END SUBROUTINE enumtest 
+    END SUBROUTINE enumtest
 
diff --git a/fortran/test/tH5VL.f90 b/fortran/test/tH5VL.f90
index 13f2af1..3afd025 100644
--- a/fortran/test/tH5VL.f90
+++ b/fortran/test/tH5VL.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,34 +11,34 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    Testing Variable_length datatypes
 !
 !
 !
         SUBROUTINE vl_test_integer(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           CHARACTER(LEN=7), PARAMETER :: filename = "VLtypes" ! File name
-          CHARACTER(LEN=80) :: fix_filename 
+          CHARACTER(LEN=80) :: fix_filename
           CHARACTER(LEN=5), PARAMETER :: dsetname = "VLint"     ! Dataset name
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
           INTEGER(HID_T) :: vltype_id     ! Datatype identifier
 
 
           INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/6/) ! Dataset dimensions
-          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths 
-          INTEGER(SIZE_T), DIMENSION(6) :: len_out 
+          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths
+          INTEGER(SIZE_T), DIMENSION(6) :: len_out
           INTEGER     ::   rank = 1                      ! Dataset rank
 
           INTEGER, DIMENSION(5,6) :: vl_int_data ! Data buffers
@@ -52,14 +52,14 @@
           !
           ! Initialize the vl_int_data array.
           !
-          do i = 1, 6 
-             do j = 1, 5 
+          do i = 1, 6
+             do j = 1, 5
                 vl_int_data(j,i) = -100
              end do
           end do
 
-          do i = 2, 6 
-             do j = 1,  i-1 
+          do i = 2, 6
+             do j = 1,  i-1
                 vl_int_data(j,i) = i-1
              end do
           end do
@@ -71,7 +71,7 @@
 
           !
           ! Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -81,7 +81,7 @@
               CALL check("h5fcreate_f", error, total_error)
 
 
-          ! 
+          !
           ! Create the dataspace.
           !
           CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -105,13 +105,13 @@
               CALL check("h5dwrite_int_f", error, total_error)
 
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
@@ -124,11 +124,11 @@
               CALL check("h5fopen_f", error, total_error)
 
           !
-          ! Open the existing dataset. 
+          ! Open the existing dataset.
           !
           CALL h5dopen_f(file_id, dsetname, dset_id, error)
               CALL check("h5dopen_f", error, total_error)
-          
+
           CALL h5dvlen_get_max_len_f(dset_id, vltype_id, dspace_id, max_len, error)
               CALL check("h5dvlen_get_max_len_f", error, total_error)
               if(max_len .ne. data_dims(1)) then
@@ -168,37 +168,37 @@
           CALL h5sclose_f(dspace_id, error)
               CALL check("h5sclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f", error, total_error)
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
-     
+
           RETURN
         END SUBROUTINE vl_test_integer
 
         SUBROUTINE vl_test_real(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           CHARACTER(LEN=8), PARAMETER :: filename = "VLtypesR" ! File name
-          CHARACTER(LEN=80) :: fix_filename 
+          CHARACTER(LEN=80) :: fix_filename
           CHARACTER(LEN=6), PARAMETER :: dsetname = "VLreal"     ! Dataset name
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
           INTEGER(HID_T) :: vltype_id     ! Datatype identifier
 
 
           INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/6/) ! Dataset dimensions
-          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths 
-          INTEGER(SIZE_T), DIMENSION(6) :: len_out 
+          INTEGER(SIZE_T), DIMENSION(6) :: len           ! Elements lengths
+          INTEGER(SIZE_T), DIMENSION(6) :: len_out
           INTEGER     ::   rank = 1                      ! Dataset rank
 
           REAL, DIMENSION(5,6) :: vl_real_data ! Data buffers
@@ -214,14 +214,14 @@
           !
           ! Initialize the vl_int_data array.
           !
-          do i = 1, 6 
-             do j = 1, 5 
+          do i = 1, 6
+             do j = 1, 5
                 vl_real_data(j,i) = -100.
              end do
           end do
 
-          do i = 2, 6 
-             do j = 1,  i-1 
+          do i = 2, 6
+             do j = 1,  i-1
                 vl_real_data(j,i) = i-1
              end do
           end do
@@ -233,7 +233,7 @@
 
           !
           ! Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -243,7 +243,7 @@
               CALL check("h5fcreate_f", error, total_error)
 
 
-          ! 
+          !
           ! Create the dataspace.
           !
           CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -276,13 +276,13 @@
               CALL check("h5dwrite_vl_real_f", error, total_error)
 
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
@@ -295,11 +295,11 @@
               CALL check("h5fopen_f", error, total_error)
 
           !
-          ! Open the existing dataset. 
+          ! Open the existing dataset.
           !
           CALL h5dopen_f(file_id, dsetname, dset_id, error)
               CALL check("h5dopen_f", error, total_error)
-          
+
           CALL h5dvlen_get_max_len_f(dset_id, vltype_id, dspace_id, max_len, error)
               CALL check("h5dvlen_get_max_len_f", error, total_error)
               if(max_len .ne. data_dims(1)) then
@@ -339,36 +339,36 @@
           CALL h5sclose_f(dspace_id, error)
               CALL check("h5sclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f", error, total_error)
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
-     
+
           RETURN
         END SUBROUTINE vl_test_real
 
         SUBROUTINE vl_test_string(cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
+          INTEGER, INTENT(OUT) :: total_error
 
           CHARACTER(LEN=8), PARAMETER :: filename = "VLtypesS" ! File name
-          CHARACTER(LEN=80) :: fix_filename 
+          CHARACTER(LEN=80) :: fix_filename
           CHARACTER(LEN=9), PARAMETER :: dsetname = "VLstrings"     ! Dataset name
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
 
 
           INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/4/) ! Dataset dimensions
-          INTEGER(SIZE_T), DIMENSION(4) :: str_len           ! Elements lengths 
-          INTEGER(SIZE_T), DIMENSION(4) :: str_len_out 
+          INTEGER(SIZE_T), DIMENSION(4) :: str_len           ! Elements lengths
+          INTEGER(SIZE_T), DIMENSION(4) :: str_len_out
           INTEGER     ::   rank = 1                      ! Dataset rank
 
           CHARACTER(LEN=10), DIMENSION(4) :: string_data ! Array of strings
@@ -388,14 +388,14 @@
           string_data(2) = 'a fortran '
           str_len(2) = 10
           string_data(3) = 'strings   '
-          str_len(3) = 8 
+          str_len(3) = 8
           string_data(4) = 'test.     '
-          str_len(4) = 5 
+          str_len(4) = 5
 
 
           !
           ! Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -405,7 +405,7 @@
               CALL check("h5fcreate_f", error, total_error)
 
 
-          ! 
+          !
           ! Create the dataspace.
           !
           CALL h5screate_simple_f(rank, dims, dspace_id, error)
@@ -437,13 +437,13 @@
               CALL check("h5dwrite_string_f", error, total_error)
 
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
@@ -456,7 +456,7 @@
               CALL check("h5fopen_f", error, total_error)
 
           !
-          ! Open the existing dataset. 
+          ! Open the existing dataset.
           !
           CALL h5dopen_f(file_id, dsetname, dset_id, error)
               CALL check("h5dopen_f", error, total_error)
@@ -471,13 +471,13 @@
                 total_error=total_error + 1
                 write(*,*) 'Returned string length is incorrect'
                 goto 100
-             endif 
+             endif
              if(string_data(1)(1:str_len(i)) .ne. string_data_out(1)(1:str_len(i))) then
              write(*,*) ' Returned string is wrong'
              total_error = total_error + 1
              endif
-100       continue 
-          
+100       continue
+
           !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
@@ -488,14 +488,14 @@
           CALL h5sclose_f(dspace_id, error)
               CALL check("h5sclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f", error, total_error)
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
-     
+
           RETURN
         END SUBROUTINE vl_test_string
 
diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90
index ea567a2..6262528 100644
--- a/fortran/test/tH5Z.f90
+++ b/fortran/test/tH5Z.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,17 +11,17 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
     SUBROUTINE filters_test(cleanup, total_error)
 
 !   This subroutine tests following functionalities: h5zfilter_avail_f, h5zunregister_f
 
-   USE HDF5 ! This module contains all necessary modules 
+   USE HDF5 ! This module contains all necessary modules
 
      IMPLICIT NONE
      LOGICAL, INTENT(IN)  :: cleanup
-     INTEGER, INTENT(OUT) :: total_error 
+     INTEGER, INTENT(OUT) :: total_error
      LOGICAL :: status
      INTEGER(HID_T)    :: crtpr_id, xfer_id
      INTEGER           :: nfilters
@@ -44,11 +44,11 @@
         CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
               CALL check("h5pset_chunk_f",error, total_error)
         CALL h5pset_deflate_f(crtpr_id, dlevel, error)
-              CALL check("h5pset_deflate_f", error, total_error) 
+              CALL check("h5pset_deflate_f", error, total_error)
         CALL h5pclose_f(crtpr_id,error)
               CALL check("h5pclose_f", error, total_error)
      endif
-        
+
 !
 ! Shuffle filter
 !
@@ -60,11 +60,11 @@
         CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
               CALL check("h5pset_chunk_f",error, total_error)
         CALL h5pset_shuffle_f(crtpr_id, error)
-              CALL check("h5pset_shuffle_f", error, total_error) 
+              CALL check("h5pset_shuffle_f", error, total_error)
         CALL h5pclose_f(crtpr_id,error)
               CALL check("h5pclose_f", error, total_error)
      endif
-        
+
 !
 ! Checksum filter
 !
@@ -76,7 +76,7 @@
         CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
               CALL check("h5pset_chunk_f",error, total_error)
         CALL h5pset_fletcher32_f(crtpr_id, error)
-              CALL check("h5pset_fletcher32_f", error, total_error) 
+              CALL check("h5pset_fletcher32_f", error, total_error)
         CALL h5pclose_f(crtpr_id,error)
               CALL check("h5pclose_f", error, total_error)
         CALL h5pcreate_f(H5P_DATASET_XFER_F, xfer_id, error)
@@ -106,11 +106,11 @@
             CALL h5pcreate_f(H5P_DATASET_CREATE_F, crtpr_id, error)
                   CALL check("h5pcreate_f", error, total_error)
             CALL h5pset_fletcher32_f(crtpr_id, error)
-                  CALL check("h5pset_fletcher32_f", error, total_error) 
+                  CALL check("h5pset_fletcher32_f", error, total_error)
             CALL h5pset_shuffle_f(crtpr_id, error)
-                  CALL check("h5pset_shuffle_f", error, total_error) 
+                  CALL check("h5pset_shuffle_f", error, total_error)
             CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
-                  CALL check("h5pget_nfilters_f", error, total_error) 
+                  CALL check("h5pget_nfilters_f", error, total_error)
 
             ! Verify the correct number of filters
             if (nfilters .ne. 2) then
@@ -120,11 +120,11 @@
 
             ! Delete a single filter
             CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_SHUFFLE_F, error)
-                  CALL check("h5pset_shuffle_f", error, total_error) 
+                  CALL check("h5pset_shuffle_f", error, total_error)
 
             ! Verify the correct number of filters now
             CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
-                  CALL check("h5pget_nfilters_f", error, total_error) 
+                  CALL check("h5pget_nfilters_f", error, total_error)
             if (nfilters .ne. 1) then
                   write(*,*) "number of filters is wrong"
                   total_error = total_error + 1
@@ -132,11 +132,11 @@
 
             ! Delete all filters
             CALL h5premove_filter_f(crtpr_id, H5Z_FILTER_ALL_F, error)
-                  CALL check("h5premove_filter_f", error, total_error) 
+                  CALL check("h5premove_filter_f", error, total_error)
 
             ! Verify the correct number of filters now
             CALL h5pget_nfilters_f(crtpr_id, nfilters, error)
-                  CALL check("h5pget_nfilters_f", error, total_error) 
+                  CALL check("h5pget_nfilters_f", error, total_error)
             if (nfilters .ne. 0) then
                   write(*,*) "number of filters is wrong"
                   total_error = total_error + 1
@@ -150,24 +150,24 @@
      END SUBROUTINE filters_test
 
         SUBROUTINE szip_test(szip_flag, cleanup, total_error)
-        USE HDF5 ! This module contains all necessary modules 
+        USE HDF5 ! This module contains all necessary modules
 
           IMPLICIT NONE
           LOGICAL, INTENT(OUT) :: szip_flag
           LOGICAL, INTENT(IN) :: cleanup
-          INTEGER, INTENT(OUT) :: total_error 
- 
+          INTEGER, INTENT(OUT) :: total_error
+
 
           CHARACTER(LEN=4), PARAMETER :: filename = "szip" ! File name
-          CHARACTER(LEN=80) :: fix_filename 
+          CHARACTER(LEN=80) :: fix_filename
           CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
           INTEGER, PARAMETER :: N = 1024
           INTEGER, PARAMETER :: NN = 64
           INTEGER, PARAMETER :: M = 512
           INTEGER, PARAMETER :: MM = 32
 
-          INTEGER(HID_T) :: file_id       ! File identifier 
-          INTEGER(HID_T) :: dset_id       ! Dataset identifier 
+          INTEGER(HID_T) :: file_id       ! File identifier
+          INTEGER(HID_T) :: dset_id       ! Dataset identifier
           INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
           INTEGER(HID_T) :: dtype_id      ! Datatype identifier
 
@@ -183,9 +183,9 @@
           INTEGER     :: i, j    !general purpose integers
           INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
           INTEGER(HID_T) ::  crp_list
-          INTEGER :: options_mask, pix_per_block 
+          INTEGER :: options_mask, pix_per_block
           LOGICAL :: flag
-          CHARACTER(LEN=4) filter_name 
+          CHARACTER(LEN=4) filter_name
 
           INTEGER :: filter_flag = -1
           INTEGER(SIZE_T) :: cd_nelemnts = 4
@@ -213,7 +213,7 @@
           CALL h5zget_filter_info_f(H5Z_FILTER_SZIP_F, config_flag, error)
               CALL check("h5zget_filter_info_f", error, total_error)
           ! Quit if failed
-          if (error .ne. 0) return 
+          if (error .ne. 0) return
           !
           ! Make sure h5zget_filter_info_f returns the right flag
           !
@@ -225,10 +225,10 @@
                      CALL check("h5zget_filter_info_f config_flag", error, total_error)
                   endif
               endif
-          endif    
+          endif
 
           ! Continue only when encoder is available
-          if ( IAND(config_flag,  H5Z_FILTER_ENCODE_ENABLED_F) .EQ. 0 ) return 
+          if ( IAND(config_flag,  H5Z_FILTER_ENCODE_ENABLED_F) .EQ. 0 ) return
 
           options_mask = H5_SZIP_NN_OM_F
           pix_per_block = 32
@@ -244,7 +244,7 @@
 
           !
           ! Create a new file using default properties.
-          ! 
+          !
           CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
           if (error .ne. 0) then
               write(*,*) "Cannot modify filename"
@@ -254,12 +254,12 @@
               CALL check("h5fcreate_f", error, total_error)
 
 
-          ! 
+          !
           ! Create the dataspace.
           !
           CALL h5screate_simple_f(rank, dims, dspace_id, error)
               CALL check("h5screate_simple_f", error, total_error)
-          
+
           CALL h5pcreate_f(H5P_DATASET_CREATE_F, crp_list, error)
               CALL check("h5pcreat_f",error,total_error)
 
@@ -277,11 +277,11 @@
              total_error = -1
              return
           endif
- 
+
          CALL h5pget_filter_by_id_f(crp_list, H5Z_FILTER_SZIP_F, filter_flag, &
- 
+
                                     cd_nelemnts, cd_values,&
- 
+
                                     filter_name_len, filter_name, error)
                CALL check("h5pget_filter_by_id_f",error,total_error)
           !
@@ -300,9 +300,9 @@
               CALL check("h5dwrite_f", error, total_error)
 
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
@@ -312,7 +312,7 @@
           CALL h5sclose_f(dspace_id, error)
               CALL check("h5sclose_f", error, total_error)
 
-          ! 
+          !
           ! Close the file.
           !
              CALL h5pclose_f(crp_list, error)
@@ -326,20 +326,20 @@
               CALL check("h5fopen_f", error, total_error)
 
           !
-          ! Open the existing dataset. 
+          ! Open the existing dataset.
           !
           CALL h5dopen_f(file_id, dsetname, dset_id, error)
               CALL check("h5dopen_f", error, total_error)
                CALL check("h5pget_filter_by_id_f",error,total_error)
 
           !
-          ! Get the dataset type. 
+          ! Get the dataset type.
           !
           CALL h5dget_type_f(dset_id, dtype_id, error)
               CALL check("h5dget_type_f", error, total_error)
 
           !
-          ! Get the data space. 
+          ! Get the data space.
           !
           CALL h5dget_space_f(dset_id, dspace_id, error)
               CALL check("h5dget_space_f", error, total_error)
@@ -352,10 +352,10 @@
 
           !
           !Compare the data.
-          ! 
+          !
           do i = 1, N
               do j = 1, M
-                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN 
+                  IF (data_out(i,j) .NE. dset_data(i, j)) THEN
                       write(*, *) "dataset test error occured"
                       write(*,*) "data read is not the same as the data written"
                       num_errors = num_errors + 1
@@ -364,15 +364,15 @@
                         goto 100
                       END IF
                   END IF
-              end do    
+              end do
           end do
 100       IF (num_errors .GT. 0) THEN
             total_error=total_error + 1
           END IF
 
-          !   
+          !
           ! End access to the dataset and release resources used by it.
-          ! 
+          !
           CALL h5dclose_f(dset_id, error)
               CALL check("h5dclose_f", error, total_error)
 
@@ -387,7 +387,7 @@
           !
           CALL h5tclose_f(dtype_id, error)
               CALL check("h5tclose_f", error, total_error)
-          ! 
+          !
           ! Close the file.
           !
           CALL h5fclose_f(file_id, error)
@@ -395,6 +395,6 @@
           if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
               CALL check("h5_cleanup_f", error, total_error)
           endif ! SZIP available
-     
+
           RETURN
         END SUBROUTINE szip_test
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index d48ede1..52f498f 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,10 +11,10 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+!
 !
 !
-! 
 !    This file contains subroutines which are used in
 !    all the hdf5 fortran tests
 !
@@ -22,7 +22,7 @@
 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: write_test_status 
+!DEC$attributes dllexport :: write_test_status
 !DEC$endif
   SUBROUTINE write_test_status( test_result, test_title, total_error)
 
@@ -31,7 +31,7 @@
     IMPLICIT NONE
 
     INTEGER, INTENT(IN) :: test_result  ! negative,  --skip --
-                                        ! 0       ,   passed 
+                                        ! 0       ,   passed
                                         ! positive,   failed
 
     CHARACTER(LEN=*), INTENT(IN) :: test_title ! Short description of test
@@ -51,9 +51,9 @@
     ELSE IF (test_result == -1) THEN
        error_string = skip
     ENDIF
-       
+
     WRITE(*, fmt = '(A, T72, A)') test_title, error_string
-    
+
     IF(test_result.GT.0) total_error = total_error + test_result
 
   END SUBROUTINE write_test_status
@@ -119,19 +119,19 @@ END SUBROUTINE verifyString
 
 
 !----------------------------------------------------------------------
-! Name:		h5_fixname_f 
+! Name:		h5_fixname_f
 !
 ! Purpose:	Create a file name from the a file base name.
 !               It is a fortran counterpart for the h5_fixname in ../../test/h5test.c
 !
-! Inputs:  
-!		base_name	- base name of the file 
-!               fapl		- file access property list 
-! Outputs:  
+! Inputs:
+!		base_name	- base name of the file
+!               fapl		- file access property list
+! Outputs:
 !		full_name	- full file name
-!		hdferr:		- error code		
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		September 13, 2002
@@ -144,13 +144,13 @@ SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_fixname_f
 !DEC$endif
-  USE H5GLOBAL           
+  USE H5GLOBAL
   IMPLICIT NONE
-  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
-  CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name 
-  INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name
+  CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name
+  INTEGER, INTENT(OUT) :: hdferr         ! Error code
   INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-  
+
   INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
   INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
 !            INTEGER(HID_T) :: fapl_default
@@ -162,8 +162,8 @@ SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
        !DEC$ IF DEFINED(HDF5F90_WINDOWS)
        !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
        !DEC$ ENDIF
-       !DEC$ATTRIBUTES reference :: base_name 
-       !DEC$ATTRIBUTES reference :: full_name 
+       !DEC$ATTRIBUTES reference :: base_name
+       !DEC$ATTRIBUTES reference :: full_name
        CHARACTER(LEN=*), INTENT(IN) :: base_name
        INTEGER(SIZE_T) :: base_namelen
        INTEGER(HID_T), INTENT(IN) :: fapl
@@ -171,27 +171,27 @@ SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
        INTEGER(SIZE_T) :: full_namelen
      END FUNCTION h5_fixname_c
   END INTERFACE
-  
+
   base_namelen = LEN(base_name)
   full_namelen = LEN(full_name)
   hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
-       full_name, full_namelen) 
-  
+       full_name, full_namelen)
+
 END SUBROUTINE h5_fixname_f
-          
+
 !----------------------------------------------------------------------
-! Name:		h5_cleanup_f 
+! Name:		h5_cleanup_f
 !
 ! Purpose:	Cleanups tests files
 !               It is a fortran counterpart for the h5_cleanup in ../../test/h5test.c
 !
-! Inputs:  
-!		base_name	- base name of the file 
-!               fapl		- file access property list 
-! Outputs:  
-!		hdferr:		- error code		
+! Inputs:
+!		base_name	- base name of the file
+!               fapl		- file access property list
+! Outputs:
+!		hdferr:		- error code
 !				 	Success:  0
-!				 	Failure: -1   
+!				 	Failure: -1
 !
 ! Programmer:	Elena Pourmal
 !		September 19, 2002
@@ -204,34 +204,34 @@ SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_cleanup_f
 !DEC$endif
-  USE H5GLOBAL           
+  USE H5GLOBAL
   IMPLICIT NONE
-  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
-  INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name
+  INTEGER, INTENT(OUT) :: hdferr         ! Error code
   INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-  
+
   INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-  
+
   INTERFACE
      INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
        USE H5GLOBAL
        !DEC$ IF DEFINED(HDF5F90_WINDOWS)
        !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
        !DEC$ ENDIF
-       !DEC$ATTRIBUTES reference :: base_name 
+       !DEC$ATTRIBUTES reference :: base_name
        CHARACTER(LEN=*), INTENT(IN) :: base_name
        INTEGER(SIZE_T) :: base_namelen
        INTEGER(HID_T), INTENT(IN) :: fapl
      END FUNCTION h5_cleanup_c
   END INTERFACE
-  
+
   base_namelen = LEN(base_name)
   hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
-  
+
 END SUBROUTINE h5_cleanup_f
 
 !----------------------------------------------------------------------
-! Name:		h5_exit_f 
+! Name:		h5_exit_f
 !
 ! Purpose:	Exit application
 !               It is a fortran counterpart for the standard C 'exit()' routine
@@ -239,10 +239,10 @@ END SUBROUTINE h5_cleanup_f
 ! 		UNIX supports a very small range such as 1 byte.
 !		Therefore, exit(256) may end up as exit(0).
 !
-! Inputs:  
+! Inputs:
 !		status	- Status to return from application
 !
-! Outputs:  
+! Outputs:
 !		none
 !
 ! Programmer:	Quincey Koziol
@@ -258,7 +258,7 @@ SUBROUTINE h5_exit_f(status)
 !DEC$endif
   IMPLICIT NONE
   INTEGER, INTENT(IN) :: status         ! Return code
-  
+
   INTERFACE
      SUBROUTINE h5_exit_c(status)
        !DEC$ IF DEFINED(HDF5F90_WINDOWS)
@@ -267,8 +267,8 @@ SUBROUTINE h5_exit_f(status)
        INTEGER, INTENT(IN) :: status
      END SUBROUTINE h5_exit_c
   END INTERFACE
-  
+
   CALL h5_exit_c(status)
-  
-END SUBROUTINE h5_exit_f 
+
+END SUBROUTINE h5_exit_f
 
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90
index a6d72dd..1d65ae1 100644
--- a/fortran/testpar/hyper.f90
+++ b/fortran/testpar/hyper.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,11 +11,11 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 !//////////////////////////////////////////////////////////
-! writes/reads dataset by hyperslabs 
+! writes/reads dataset by hyperslabs
 !//////////////////////////////////////////////////////////
 
 SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
@@ -26,8 +26,8 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
   INTEGER, INTENT(in) :: length                     ! array length
   LOGICAL, INTENT(in) :: do_collective              ! use collective I/O
   LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
-  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator 
-  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator 
+  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
+  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
   INTEGER, INTENT(inout) :: nerrors                 ! number of errors
   INTEGER :: mpierror                               ! MPI hdferror flag
   INTEGER :: hdferror                               ! HDF hdferror flag
@@ -35,17 +35,17 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
   INTEGER(hsize_t), DIMENSION(1) :: cdims           ! chunk dimensions
   INTEGER, ALLOCATABLE :: wbuf(:)                   ! write buffer
   INTEGER, ALLOCATABLE :: rbuf(:)                   ! read buffer
-  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection 
-  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection  
+  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection
+  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection
   INTEGER(hid_t) :: fapl_id                         ! file access identifier
-  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list 
-  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list 
+  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list
+  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list
   INTEGER(hid_t) :: file_id                         ! file identifier
   INTEGER(hid_t) :: dset_id                         ! dataset identifier
   INTEGER(hid_t) :: fspace_id                       ! file space identifier
   INTEGER(hid_t) :: mspace_id                       ! memory space identifier
   INTEGER(hid_t) :: driver_id                       ! low-level file driver identifier
-  INTEGER        :: istart                          ! start position in array 
+  INTEGER        :: istart                          ! start position in array
   INTEGER        :: iend                            ! end position in array
   INTEGER        :: icount                          ! number of elements in array
   CHARACTER(len=80) :: filename                     ! filename
@@ -139,11 +139,11 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
   CALL check("h5dcreate_f", hdferror, nerrors)
 
   !//////////////////////////////////////////////////////////
-  ! define hyperslab 
+  ! define hyperslab
   !//////////////////////////////////////////////////////////
 
-  counti(1) = icount           
-  start(1)  = istart   
+  counti(1) = icount
+  start(1)  = istart
 
   !//////////////////////////////////////////////////////////
   ! select hyperslab in memory
diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90
index dcc7210..9d14a50 100644
--- a/fortran/testpar/mdset.f90
+++ b/fortran/testpar/mdset.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,11 +11,11 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 
 !//////////////////////////////////////////////////////////
-! writes/reads dataset by hyperslabs 
+! writes/reads dataset by hyperslabs
 !//////////////////////////////////////////////////////////
 
 SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
@@ -26,8 +26,8 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
   INTEGER, INTENT(in) :: length                     ! array length
   LOGICAL, INTENT(in) :: do_collective              ! use collective I/O
   LOGICAL, INTENT(in) :: do_chunk                   ! use chunking
-  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator 
-  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator 
+  INTEGER, INTENT(in) :: mpi_size                   ! number of processes in the group of communicator
+  INTEGER, INTENT(in) :: mpi_rank                   ! rank of the calling process in the communicator
   INTEGER, INTENT(inout) :: nerrors                 ! number of errors
   INTEGER :: mpierror                               ! MPI hdferror flag
   INTEGER :: hdferror                               ! HDF hdferror flag
@@ -35,17 +35,17 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
   INTEGER(hsize_t), DIMENSION(1) :: cdims           ! chunk dimensions
   INTEGER, ALLOCATABLE :: wbuf(:)                   ! write buffer
   INTEGER, ALLOCATABLE :: rbuf(:)                   ! read buffer
-  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection 
-  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection  
+  INTEGER(hsize_t), DIMENSION(1) :: counti          ! hyperslab selection
+  INTEGER(hsize_t), DIMENSION(1) :: start           ! hyperslab selection
   INTEGER(hid_t) :: fapl_id                         ! file access identifier
-  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list 
-  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list 
+  INTEGER(hid_t) :: dxpl_id                         ! dataset transfer property list
+  INTEGER(hid_t) :: dcpl_id                         ! dataset creation property list
   INTEGER(hid_t) :: file_id                         ! file identifier
   INTEGER(hid_t) :: dset_id                         ! dataset identifier
   INTEGER(hid_t) :: fspace_id                       ! file space identifier
   INTEGER(hid_t) :: mspace_id                       ! memory space identifier
   INTEGER(hid_t) :: driver_id                       ! low-level file driver identifier
-  INTEGER        :: istart                          ! start position in array 
+  INTEGER        :: istart                          ! start position in array
   INTEGER        :: iend                            ! end position in array
   INTEGER        :: icount                          ! number of elements in array
   CHARACTER(len=80) :: filename                     ! filename
@@ -141,11 +141,11 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
   ENDIF
 
   !//////////////////////////////////////////////////////////
-  ! define hyperslab 
+  ! define hyperslab
   !//////////////////////////////////////////////////////////
 
-  counti(1) = icount           
-  start(1)  = istart   
+  counti(1) = icount
+  start(1)  = istart
 
   !//////////////////////////////////////////////////////////
   ! select hyperslab in memory
diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90
index 6f6fb2e..e474668 100644
--- a/fortran/testpar/ptest.f90
+++ b/fortran/testpar/ptest.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 !//////////////////////////////////////////////////////////
 ! main program for parallel HDF5 Fortran tests
@@ -27,8 +27,8 @@ PROGRAM parallel_test
   LOGICAL :: do_collective                        ! use collective MPI I/O
   LOGICAL :: do_chunk                             ! use chunking
   INTEGER :: nerrors = 0                          ! number of errors
-  INTEGER :: mpi_size                             ! number of processes in the group of communicator 
-  INTEGER :: mpi_rank                             ! rank of the calling process in the communicator 
+  INTEGER :: mpi_size                             ! number of processes in the group of communicator
+  INTEGER :: mpi_rank                             ! rank of the calling process in the communicator
   INTEGER :: length = 12000                       ! length of array
 
   !//////////////////////////////////////////////////////////
@@ -115,20 +115,20 @@ PROGRAM parallel_test
   !//////////////////////////////////////////////////////////
 
   IF (nerrors == 0) THEN
-     CALL mpi_finalize(mpierror)  
+     CALL mpi_finalize(mpierror)
      IF (mpierror .NE. MPI_SUCCESS) THEN
         WRITE(*,*) "MPI_FINALIZE  *FAILED* Process = ", mpi_rank
      ENDIF
   ELSE
      WRITE(*,*) 'Errors detected in process ', mpi_rank
-     CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror)  
+     CALL mpi_abort(MPI_COMM_WORLD, 1, mpierror)
      IF (mpierror .NE. MPI_SUCCESS) THEN
         WRITE(*,*) "MPI_ABORT  *FAILED* Process = ", mpi_rank
      ENDIF
   ENDIF
 
   !//////////////////////////////////////////////////////////
-  ! end main program 
+  ! end main program
   !//////////////////////////////////////////////////////////
 
 END PROGRAM parallel_test
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index 77edce4..79339f4 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -253,13 +253,13 @@ out:
 
 int TestCompress()
 {
-   
+
 	unsigned int flags = 0;
     unsigned int config = 0;
     size_t cd_nelemts = 0;
 
     TESTING("compression")
-#ifdef H5_HAVE_FILTER_DEFLATE 
+#ifdef H5_HAVE_FILTER_DEFLATE
     try {
         /* Create packet table with compression. */
         FL_PacketTable wrapper(fileID, "/compressTest", H5T_NATIVE_CHAR, 100, 8);
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index 1ffcb22..de304d9 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -129,7 +129,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 1ef661c..98e33d3 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -123,7 +123,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index af3894e..7315fd3 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -129,7 +129,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index 10d888f..0a01116 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -155,7 +155,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index ee671e0..f0c96eb 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -166,7 +166,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index e2e1038..261b23c 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -87,7 +87,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index 1be9f13..3479aa8 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -105,7 +105,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index 6ec0ac1..4078bea 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -136,7 +136,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index 82dca3f..7ba0aa1 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -137,7 +137,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index fb11a98..20543c2 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -129,7 +129,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index 7679ac6..872fa4e 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -109,7 +109,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index b4a5a3a..b6cc2b4 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -102,7 +102,7 @@ int main( void )
 
   /* close type */
  H5Tclose( string_type );
- 
+
  /* close the file */
  H5Fclose( file_id );
 
diff --git a/hl/fortran/examples/exlite.f90 b/hl/fortran/examples/exlite.f90
index ad9c6d5..916bcb9 100644
--- a/hl/fortran/examples/exlite.f90
+++ b/hl/fortran/examples/exlite.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 !
 ! This file contains a FORTRAN90 example for the H5LT API
@@ -20,7 +20,7 @@
 program lite_example
 
 
-use H5LT ! module of H5LT 
+use H5LT ! module of H5LT
 use HDF5 ! module of HDF5 library
 
 implicit none
@@ -28,7 +28,7 @@ implicit none
 integer, parameter :: DIM1 = 4;                      ! Dimension of array
 character(len=9), parameter :: filename = "exlite.h5"! File name
 character(LEN=5), parameter :: dsetname1 = "dset1"   ! Dataset name
-integer(HID_T) :: file_id                            ! File identifier 
+integer(HID_T) :: file_id                            ! File identifier
 integer(HSIZE_T), dimension(1) :: dims = (/DIM1/)    ! Dataset dimensions
 integer        :: rank = 1                           ! Dataset rank
 integer, dimension(DIM1) :: buf1                     ! Data buffer
@@ -49,7 +49,7 @@ end do
 ! Initialize FORTRAN predefined datatypes.
 !
 
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -58,13 +58,13 @@ call h5open_f(errcode)
 call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 
 !
-! write dataset. 
+! write dataset.
 !
 
 call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf1, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 
 call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr1, dims, errcode)
@@ -96,10 +96,10 @@ call h5fclose_f(file_id, errcode)
 call h5close_f(errcode)
 
 !
-! end 
+! end
 !
 
-end program lite_example 
+end program lite_example
 
 
 
diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90
index 0fd4cd8..6053c4e 100755
--- a/hl/fortran/src/H5IMff.f90
+++ b/hl/fortran/src/H5IMff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,15 +11,15 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5IM functions
 !
-      
+
 module h5im
 use h5fortran_types
-use hdf5 
+use hdf5
 contains
 
 
@@ -40,12 +40,12 @@ contains
 !
 !-------------------------------------------------------------------------
 
-subroutine h5immake_image_8bit_f(loc_id,& 
+subroutine h5immake_image_8bit_f(loc_id,&
                                  dset_name,&
-                                 width,& 
+                                 width,&
                                  height,&
                                  buf,&
-                                 errcode ) 
+                                 errcode )
 
  implicit none
 
@@ -56,14 +56,14 @@ subroutine h5immake_image_8bit_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), intent(in) :: width              ! width of image  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), intent(in) :: width              ! width of image
  integer(hsize_t), intent(in) :: height             ! height of image
- integer, intent(in), dimension(*) :: buf           ! buffer 
+ integer, intent(in), dimension(*) :: buf           ! buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
- 
+
  interface
   integer function h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf)
   use h5global
@@ -73,10 +73,10 @@ subroutine h5immake_image_8bit_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), intent(in) :: width                   ! width of image  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), intent(in) :: width                   ! width of image
   integer(hsize_t), intent(in) :: height                  ! height of image
-  integer , intent(in), dimension(*) :: buf               ! buffer  
+  integer , intent(in), dimension(*) :: buf               ! buffer
   end function h5immake_image_8bit_c
  end interface
 
@@ -105,10 +105,10 @@ end subroutine h5immake_image_8bit_f
 !-------------------------------------------------------------------------
 
 
-subroutine h5imread_image_f(loc_id,& 
+subroutine h5imread_image_f(loc_id,&
                             dset_name,&
                             buf,&
-                            errcode ) 
+                            errcode )
 
  implicit none
 
@@ -118,12 +118,12 @@ subroutine h5imread_image_f(loc_id,&
 !DEC$attributes dllexport :: h5imread_image_f
 !DEC$endif
 !
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer, intent(inout), dimension(*) :: buf        ! buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer, intent(inout), dimension(*) :: buf        ! buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
- 
+
  interface
   integer function h5imread_image_c(loc_id,namelen,dset_name,buf)
   use h5global
@@ -133,8 +133,8 @@ subroutine h5imread_image_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer, intent(inout), dimension(*) :: buf             ! buffer  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer, intent(inout), dimension(*) :: buf             ! buffer
   end function h5imread_image_c
  end interface
 
@@ -161,13 +161,13 @@ end subroutine h5imread_image_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5immake_image_24bit_f(loc_id,& 
+subroutine h5immake_image_24bit_f(loc_id,&
                                  dset_name,&
-                                 width,& 
+                                 width,&
                                  height,&
                                  il,&
                                  buf,&
-                                 errcode ) 
+                                 errcode )
 
  implicit none
 
@@ -178,16 +178,16 @@ subroutine h5immake_image_24bit_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), intent(in) :: width              ! width of image  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), intent(in) :: width              ! width of image
  integer(hsize_t), intent(in) :: height             ! height of image
  character(len=*), intent(in) :: il                 ! interlace
- integer, intent(in), dimension(*) :: buf           ! buffer 
+ integer, intent(in), dimension(*) :: buf           ! buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer :: ilen                                    ! name length
- 
+
  interface
   integer function h5immake_image_24bit_c(loc_id,namelen,dset_name,ilen,il,width,height,buf)
   use h5global
@@ -197,14 +197,14 @@ subroutine h5immake_image_24bit_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: il
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), intent(in) :: width                   ! width of image  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), intent(in) :: width                   ! width of image
   integer(hsize_t), intent(in) :: height                  ! height of image
   character(len=*), intent(in) :: il                      ! interlace
-  integer, intent(in), dimension(*) :: buf                ! buffer 
+  integer, intent(in), dimension(*) :: buf                ! buffer
   integer :: namelen                                      ! lenght of name buffer
   integer :: ilen                                         ! name length
- 
+
   end function h5immake_image_24bit_c
  end interface
 
@@ -218,7 +218,7 @@ end subroutine h5immake_image_24bit_f
 !-------------------------------------------------------------------------
 ! Function: h5imget_image_info_f
 !
-! Purpose: Gets information about an image dataset (dimensions, interlace mode 
+! Purpose: Gets information about an image dataset (dimensions, interlace mode
 !          and number of associated palettes).
 !
 ! Return: Success: 0, Failure: -1
@@ -233,14 +233,14 @@ end subroutine h5immake_image_24bit_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5imget_image_info_f(loc_id,& 
+subroutine h5imget_image_info_f(loc_id,&
                                 dset_name,&
                                 width,&
                                 height,&
                                 planes,&
                                 interlace,&
                                 npals,&
-                                errcode ) 
+                                errcode )
 
  implicit none
 
@@ -251,13 +251,13 @@ subroutine h5imget_image_info_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), intent(inout) :: width           ! width of image  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), intent(inout) :: width           ! width of image
  integer(hsize_t), intent(inout) :: height          ! height of image
  integer(hsize_t), intent(inout) :: planes          ! color planes
  integer(hsize_t), intent(inout) :: npals           ! palettes
- character(len=*), intent(inout) :: interlace       ! interlace 
+ character(len=*), intent(inout) :: interlace       ! interlace
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer :: ilen                                    ! name length
@@ -270,13 +270,13 @@ subroutine h5imget_image_info_f(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: interlace
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
-  character(len=*), intent(in) :: dset_name          ! name of the dataset 
-  integer(hsize_t), intent(inout) :: width           ! width of image  
+  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+  character(len=*), intent(in) :: dset_name          ! name of the dataset
+  integer(hsize_t), intent(inout) :: width           ! width of image
   integer(hsize_t), intent(inout) :: height          ! height of image
   integer(hsize_t), intent(inout) :: planes          ! color planes
   integer(hsize_t), intent(inout) :: npals           ! palettes
-  character(len=*), intent(inout) :: interlace       ! interlace 
+  character(len=*), intent(inout) :: interlace       ! interlace
   integer :: namelen                                 ! name length
   integer :: ilen                                    ! name length
   end function h5imget_image_info_c
@@ -306,8 +306,8 @@ end subroutine h5imget_image_info_f
 !
 !-------------------------------------------------------------------------
 
-integer function h5imis_image_f(loc_id,& 
-                                dset_name) 
+integer function h5imis_image_f(loc_id,&
+                                dset_name)
 
  implicit none
 
@@ -318,8 +318,8 @@ integer function h5imis_image_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -332,7 +332,7 @@ integer function h5imis_image_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   end function h5imis_image_c
  end interface
 
@@ -360,11 +360,11 @@ end function h5imis_image_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5immake_palette_f(loc_id,& 
+subroutine h5immake_palette_f(loc_id,&
                               dset_name,&
-                              pal_dims,& 
+                              pal_dims,&
                               buf,&
-                              errcode ) 
+                              errcode )
 
  implicit none
 
@@ -375,13 +375,13 @@ subroutine h5immake_palette_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                 ! file or group identifier 
- character(len=*), intent(in) :: dset_name              ! name of the dataset 
- integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions  
- integer, intent(in), dimension(*) :: buf               ! buffer 
+ integer(hid_t),   intent(in) :: loc_id                 ! file or group identifier
+ character(len=*), intent(in) :: dset_name              ! name of the dataset
+ integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions
+ integer, intent(in), dimension(*) :: buf               ! buffer
  integer :: errcode                                     ! error code
  integer :: namelen                                     ! name length
- 
+
  interface
   integer function h5immake_palette_c(loc_id,namelen,dset_name,pal_dims,buf)
   use h5global
@@ -391,9 +391,9 @@ subroutine h5immake_palette_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   integer(hsize_t), intent(in), dimension(*) :: pal_dims  ! dimensions
-  integer, intent(in), dimension(*) :: buf                ! buffer  
+  integer, intent(in), dimension(*) :: buf                ! buffer
   end function h5immake_palette_c
  end interface
 
@@ -421,10 +421,10 @@ end subroutine h5immake_palette_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5imlink_palette_f(loc_id,& 
+subroutine h5imlink_palette_f(loc_id,&
                               dset_name,&
                               pal_name,&
-                              errcode ) 
+                              errcode )
 
  implicit none
 
@@ -434,9 +434,9 @@ subroutine h5imlink_palette_f(loc_id,&
 !DEC$attributes dllexport :: h5imlink_palette_f
 !DEC$endif
 !
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- character(len=*), intent(in) :: pal_name           ! palette name 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ character(len=*), intent(in) :: pal_name           ! palette name
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer :: ilen                                    ! name length
@@ -449,9 +449,9 @@ subroutine h5imlink_palette_f(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: pal_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
-  character(len=*), intent(in) :: dset_name          ! name of the dataset 
-  character(len=*), intent(in) :: pal_name           ! palette name 
+  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+  character(len=*), intent(in) :: dset_name          ! name of the dataset
+  character(len=*), intent(in) :: pal_name           ! palette name
   integer :: namelen                                 ! name length
   integer :: ilen                                    ! name length
   end function h5imlink_palette_c
@@ -481,10 +481,10 @@ end subroutine h5imlink_palette_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5imunlink_palette_f(loc_id,& 
+subroutine h5imunlink_palette_f(loc_id,&
                               dset_name,&
                               pal_name,&
-                              errcode ) 
+                              errcode )
 
  implicit none
 
@@ -496,9 +496,9 @@ subroutine h5imunlink_palette_f(loc_id,&
 !
 
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- character(len=*), intent(in) :: pal_name           ! palette name 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ character(len=*), intent(in) :: pal_name           ! palette name
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer :: ilen                                    ! name length
@@ -511,9 +511,9 @@ subroutine h5imunlink_palette_f(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: pal_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
-  character(len=*), intent(in) :: dset_name          ! name of the dataset 
-  character(len=*), intent(in) :: pal_name           ! palette name 
+  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+  character(len=*), intent(in) :: dset_name          ! name of the dataset
+  character(len=*), intent(in) :: pal_name           ! palette name
   integer :: namelen                                 ! name length
   integer :: ilen                                    ! name length
   end function h5imunlink_palette_c
@@ -544,10 +544,10 @@ end subroutine h5imunlink_palette_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5imget_npalettes_f(loc_id,& 
+subroutine h5imget_npalettes_f(loc_id,&
                                dset_name,&
                                npals,&
-                               errcode ) 
+                               errcode )
 
  implicit none
 
@@ -558,8 +558,8 @@ subroutine h5imget_npalettes_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer(hsize_t), intent(inout) :: npals           ! palettes
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
@@ -571,8 +571,8 @@ subroutine h5imget_npalettes_f(loc_id,&
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IMGET_NPALETTES_C'::h5imget_npalettes_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
-  character(len=*), intent(in) :: dset_name          ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+  character(len=*), intent(in) :: dset_name          ! name of the dataset
   integer(hsize_t), intent(inout) :: npals           ! palettes
   integer :: namelen                                 ! name length
   end function h5imget_npalettes_c
@@ -601,15 +601,15 @@ end subroutine h5imget_npalettes_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5imget_palette_info_f(loc_id,& 
+subroutine h5imget_palette_info_f(loc_id,&
                                   dset_name,&
                                   pal_number,&
                                   dims,&
-                                  errcode ) 
+                                  errcode )
 
  implicit none
 
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -617,10 +617,10 @@ subroutine h5imget_palette_info_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                ! file or group identifier 
- character(len=*), intent(in) :: dset_name             ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                ! file or group identifier
+ character(len=*), intent(in) :: dset_name             ! name of the dataset
  integer, intent(in) :: pal_number                     ! palette number
- integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions 
+ integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
  integer :: errcode                                    ! error code
  integer :: namelen                                    ! name length
 
@@ -631,10 +631,10 @@ subroutine h5imget_palette_info_f(loc_id,&
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5IMGET_PALETTE_INFO_C'::h5imget_palette_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                ! file or group identifier 
-  character(len=*), intent(in) :: dset_name             ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                ! file or group identifier
+  character(len=*), intent(in) :: dset_name             ! name of the dataset
   integer, intent(in) :: pal_number                     ! palette number
-  integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions 
+  integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
   integer :: namelen                                    ! name length
   end function h5imget_palette_info_c
  end interface
@@ -664,11 +664,11 @@ end subroutine h5imget_palette_info_f
 !-------------------------------------------------------------------------
 
 
-subroutine h5imget_palette_f(loc_id,& 
+subroutine h5imget_palette_f(loc_id,&
                              dset_name,&
                              pal_number,&
                              buf,&
-                             errcode ) 
+                             errcode )
 
  implicit none
 
@@ -679,13 +679,13 @@ subroutine h5imget_palette_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer, intent(in) :: pal_number                  ! palette number
- integer, intent(inout), dimension(*) :: buf        ! buffer 
+ integer, intent(inout), dimension(*) :: buf        ! buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
- 
+
  interface
   integer function h5imget_palette_c(loc_id,namelen,dset_name,pal_number,buf)
   use h5global
@@ -695,9 +695,9 @@ subroutine h5imget_palette_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   integer, intent(in) :: pal_number                       ! palette number
-  integer, intent(inout), dimension(*) :: buf             ! buffer  
+  integer, intent(inout), dimension(*) :: buf             ! buffer
   end function h5imget_palette_c
  end interface
 
@@ -724,8 +724,8 @@ end subroutine h5imget_palette_f
 !
 !-------------------------------------------------------------------------
 
-integer function h5imis_palette_f(loc_id,& 
-                                  dset_name) 
+integer function h5imis_palette_f(loc_id,&
+                                  dset_name)
 
  implicit none
 
@@ -736,8 +736,8 @@ integer function h5imis_palette_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -750,7 +750,7 @@ integer function h5imis_palette_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   end function h5imis_palette_c
  end interface
 
@@ -764,7 +764,7 @@ end function h5imis_palette_f
 !  end
 !
 end module H5IM
-            
+
 
 
 
diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90
index 45d9a23..e8eb96d 100755
--- a/hl/fortran/src/H5LTff.f90
+++ b/hl/fortran/src/H5LTff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,7 +11,7 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5LT functions
@@ -19,7 +19,7 @@
 
 module h5lt
 use h5fortran_types
-use hdf5 
+use hdf5
 
 interface h5ltmake_dataset_f
  module procedure h5ltmake_dataset_f_int1
@@ -103,16 +103,16 @@ contains
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_int1(loc_id,& 
+subroutine h5ltmake_dataset_f_int1(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -120,15 +120,15 @@ subroutine h5ltmake_dataset_f_int1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer, intent(in), dimension(*) :: buf           ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer, intent(in), dimension(*) :: buf           ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
- 
+
  interface
   integer function h5ltmake_dataset_int1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -137,12 +137,12 @@ subroutine h5ltmake_dataset_f_int1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  integer, intent(in), dimension(*) :: buf                ! data buffer 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  integer, intent(in), dimension(*) :: buf                ! data buffer
   end function h5ltmake_dataset_int1_c
  end interface
 
@@ -168,16 +168,16 @@ end subroutine h5ltmake_dataset_f_int1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_int2(loc_id,& 
+subroutine h5ltmake_dataset_f_int2(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
+
+ implicit none
 
- implicit none 
- 
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -185,16 +185,16 @@ subroutine h5ltmake_dataset_f_int2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(in), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
- 
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
+
  interface
   integer function h5ltmake_dataset_int2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -203,13 +203,13 @@ subroutine h5ltmake_dataset_f_int2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer  
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltmake_dataset_int2_c
  end interface
 
@@ -235,16 +235,16 @@ end subroutine h5ltmake_dataset_f_int2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_int3(loc_id,& 
+subroutine h5ltmake_dataset_f_int3(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -252,16 +252,16 @@ subroutine h5ltmake_dataset_f_int3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(in), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer 
- 
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
+
  interface
   integer function h5ltmake_dataset_int3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -270,13 +270,13 @@ subroutine h5ltmake_dataset_f_int3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer 
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltmake_dataset_int3_c
  end interface
 
@@ -303,16 +303,16 @@ end subroutine h5ltmake_dataset_f_int3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_float1(loc_id,& 
+subroutine h5ltmake_dataset_f_float1(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -320,15 +320,15 @@ subroutine h5ltmake_dataset_f_float1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- real, intent(in), dimension(*) :: buf              ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ real, intent(in), dimension(*) :: buf              ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
- 
+
  interface
   integer function h5ltmake_dataset_fl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -337,12 +337,12 @@ subroutine h5ltmake_dataset_f_float1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  real, intent(in), dimension(*) :: buf                   ! data buffer 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  real, intent(in), dimension(*) :: buf                   ! data buffer
   end function h5ltmake_dataset_fl1_c
  end interface
 
@@ -368,16 +368,16 @@ end subroutine h5ltmake_dataset_f_float1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_float2(loc_id,& 
+subroutine h5ltmake_dataset_f_float2(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -385,16 +385,16 @@ subroutine h5ltmake_dataset_f_float2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(in), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
- 
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
+
  interface
   integer function h5ltmake_dataset_fl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -403,13 +403,13 @@ subroutine h5ltmake_dataset_f_float2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer  
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltmake_dataset_fl2_c
  end interface
 
@@ -435,16 +435,16 @@ end subroutine h5ltmake_dataset_f_float2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_float3(loc_id,& 
+subroutine h5ltmake_dataset_f_float3(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -452,16 +452,16 @@ subroutine h5ltmake_dataset_f_float3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(in), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer 
- 
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
+
  interface
   integer function h5ltmake_dataset_fl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -470,13 +470,13 @@ subroutine h5ltmake_dataset_f_float3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer 
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltmake_dataset_fl3_c
  end interface
 
@@ -502,16 +502,16 @@ end subroutine h5ltmake_dataset_f_float3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_double1(loc_id,& 
+subroutine h5ltmake_dataset_f_double1(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -519,15 +519,15 @@ subroutine h5ltmake_dataset_f_double1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- double precision, intent(in), dimension(*) :: buf  ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ double precision, intent(in), dimension(*) :: buf  ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
- 
+
  interface
   integer function h5ltmake_dataset_dl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -536,12 +536,12 @@ subroutine h5ltmake_dataset_f_double1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  double precision, intent(in), dimension(*) :: buf       ! data buffer 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  double precision, intent(in), dimension(*) :: buf       ! data buffer
   end function h5ltmake_dataset_dl1_c
  end interface
 
@@ -567,16 +567,16 @@ end subroutine h5ltmake_dataset_f_double1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_double2(loc_id,& 
+subroutine h5ltmake_dataset_f_double2(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -584,16 +584,16 @@ subroutine h5ltmake_dataset_f_double2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(in), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
- 
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
+
  interface
   integer function h5ltmake_dataset_dl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -602,13 +602,13 @@ subroutine h5ltmake_dataset_f_double2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer  
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltmake_dataset_dl2_c
  end interface
 
@@ -634,16 +634,16 @@ end subroutine h5ltmake_dataset_f_double2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_f_double3(loc_id,& 
+subroutine h5ltmake_dataset_f_double3(loc_id,&
                                 dset_name,&
-                                rank,& 
+                                rank,&
                                 dims,&
                                 type_id,&
                                 buf,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -651,16 +651,16 @@ subroutine h5ltmake_dataset_f_double3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(in), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer 
- 
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
+
  interface
   integer function h5ltmake_dataset_dl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -669,13 +669,13 @@ subroutine h5ltmake_dataset_f_double3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer 
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltmake_dataset_dl3_c
  end interface
 
@@ -703,15 +703,15 @@ end subroutine h5ltmake_dataset_f_double3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_int1(loc_id,& 
+subroutine h5ltread_dataset_f_int1(loc_id,&
                                 dset_name,&
                                 type_id,&
                                 buf,&
                                 dims,&
-                                errcode )  
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -719,11 +719,11 @@ subroutine h5ltread_dataset_f_int1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
- integer, intent(inout), dimension(*) :: buf        ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer, intent(inout), dimension(*) :: buf        ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -735,11 +735,11 @@ subroutine h5ltread_dataset_f_int1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(HID_T),   intent(IN) :: loc_id                  ! file or group identifier
-  integer(HID_T),   intent(IN) :: type_id                 ! datatype identifier 
+  integer(HID_T),   intent(IN) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(LEN=*), intent(IN) :: dset_name               ! name of the dataset 
-  integer(HSIZE_T), dimension(*), intent(IN) :: dims      ! size of the bufffer buf  
-  integer, intent(IN), dimension(*) :: buf                ! data buffer 
+  character(LEN=*), intent(IN) :: dset_name               ! name of the dataset
+  integer(HSIZE_T), dimension(*), intent(IN) :: dims      ! size of the bufffer buf
+  integer, intent(IN), dimension(*) :: buf                ! data buffer
   end function h5ltread_dataset_int1_c
  end interface
 
@@ -765,15 +765,15 @@ end subroutine h5ltread_dataset_f_int1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_int2(loc_id,& 
+subroutine h5ltread_dataset_f_int2(loc_id,&
                                  dset_name,&
                                  type_id,&
                                  buf,&
                                  dims,&
-                                 errcode )  
+                                 errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -781,14 +781,14 @@ subroutine h5ltread_dataset_f_int2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(inout), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
 
  interface
   integer function h5ltread_dataset_int2_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -798,12 +798,12 @@ subroutine h5ltread_dataset_f_int2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer 
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltread_dataset_int2_c
  end interface
 
@@ -829,15 +829,15 @@ end subroutine h5ltread_dataset_f_int2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_int3(loc_id,& 
+subroutine h5ltread_dataset_f_int3(loc_id,&
                                 dset_name,&
                                 type_id,&
                                 buf,&
                                 dims,&
-                                errcode )  
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -845,14 +845,14 @@ subroutine h5ltread_dataset_f_int3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(inout), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer  
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
  interface
   integer function h5ltread_dataset_int3_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -862,12 +862,12 @@ subroutine h5ltread_dataset_f_int3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer  
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltread_dataset_int3_c
  end interface
 
@@ -896,15 +896,15 @@ end subroutine h5ltread_dataset_f_int3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_float1(loc_id,& 
+subroutine h5ltread_dataset_f_float1(loc_id,&
                                 dset_name,&
                                 type_id,&
                                 buf,&
                                 dims,&
-                                errcode )  
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -912,11 +912,11 @@ subroutine h5ltread_dataset_f_float1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
- real, intent(inout), dimension(*) :: buf           ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ real, intent(inout), dimension(*) :: buf           ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -928,11 +928,11 @@ subroutine h5ltread_dataset_f_float1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  real, intent(in), dimension(*) :: buf                   ! data buffer 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  real, intent(in), dimension(*) :: buf                   ! data buffer
   end function h5ltread_dataset_fl1_c
  end interface
 
@@ -958,15 +958,15 @@ end subroutine h5ltread_dataset_f_float1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_float2(loc_id,& 
+subroutine h5ltread_dataset_f_float2(loc_id,&
                                  dset_name,&
                                  type_id,&
                                  buf,&
                                  dims,&
-                                 errcode )  
+                                 errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -975,14 +975,14 @@ subroutine h5ltread_dataset_f_float2(loc_id,&
 !
 
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(inout), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
 
  interface
   integer function h5ltread_dataset_fl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -992,12 +992,12 @@ subroutine h5ltread_dataset_f_float2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer 
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltread_dataset_fl2_c
  end interface
 
@@ -1023,15 +1023,15 @@ end subroutine h5ltread_dataset_f_float2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_float3(loc_id,& 
+subroutine h5ltread_dataset_f_float3(loc_id,&
                                 dset_name,&
                                 type_id,&
                                 buf,&
                                 dims,&
-                                errcode )  
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1039,14 +1039,14 @@ subroutine h5ltread_dataset_f_float3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(inout), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer  
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
  interface
   integer function h5ltread_dataset_fl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1056,12 +1056,12 @@ subroutine h5ltread_dataset_f_float3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer  
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltread_dataset_fl3_c
  end interface
 
@@ -1088,15 +1088,15 @@ end subroutine h5ltread_dataset_f_float3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_double1(loc_id,& 
+subroutine h5ltread_dataset_f_double1(loc_id,&
                                 dset_name,&
                                 type_id,&
                                 buf,&
                                 dims,&
-                                errcode )  
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1104,11 +1104,11 @@ subroutine h5ltread_dataset_f_double1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
- double precision, intent(inout), dimension(*) :: buf ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ double precision, intent(inout), dimension(*) :: buf ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -1120,11 +1120,11 @@ subroutine h5ltread_dataset_f_double1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  double precision, intent(in), dimension(*) :: buf       ! data buffer 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  double precision, intent(in), dimension(*) :: buf       ! data buffer
   end function h5ltread_dataset_dl1_c
  end interface
 
@@ -1150,15 +1150,15 @@ end subroutine h5ltread_dataset_f_double1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_double2(loc_id,& 
+subroutine h5ltread_dataset_f_double2(loc_id,&
                                  dset_name,&
                                  type_id,&
                                  buf,&
                                  dims,&
-                                 errcode )  
+                                 errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1166,14 +1166,14 @@ subroutine h5ltread_dataset_f_double2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(inout), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
 
  interface
   integer function h5ltread_dataset_dl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1183,12 +1183,12 @@ subroutine h5ltread_dataset_f_double2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer 
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltread_dataset_dl2_c
  end interface
 
@@ -1214,15 +1214,15 @@ end subroutine h5ltread_dataset_f_double2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_f_double3(loc_id,& 
+subroutine h5ltread_dataset_f_double3(loc_id,&
                                 dset_name,&
                                 type_id,&
                                 buf,&
                                 dims,&
-                                errcode )  
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1230,14 +1230,14 @@ subroutine h5ltread_dataset_f_double3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hid_t),   intent(in) :: type_id            ! datatype identifier 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hid_t),   intent(in) :: type_id            ! datatype identifier
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(inout), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer  
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
  interface
   integer function h5ltread_dataset_dl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1247,12 +1247,12 @@ subroutine h5ltread_dataset_f_double3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer  
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltread_dataset_dl3_c
  end interface
 
@@ -1279,15 +1279,15 @@ end subroutine h5ltread_dataset_f_double3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_int_f_1 (loc_id,& 
+subroutine h5ltmake_dataset_int_f_1 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1295,14 +1295,14 @@ subroutine h5ltmake_dataset_int_f_1 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- integer, intent(in), dimension(*) :: buf           ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ integer, intent(in), dimension(*) :: buf           ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
-            
+
  interface
   integer function h5ltmake_dataset_nint1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1311,12 +1311,12 @@ subroutine h5ltmake_dataset_int_f_1 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  integer, intent(in), dimension(*) :: buf                ! data buffer  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  integer, intent(in), dimension(*) :: buf                ! data buffer
   end function h5ltmake_dataset_nint1_c
  end interface
 
@@ -1342,15 +1342,15 @@ end subroutine h5ltmake_dataset_int_f_1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_int_f_2 (loc_id,& 
+subroutine h5ltmake_dataset_int_f_2 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1358,16 +1358,16 @@ subroutine h5ltmake_dataset_int_f_2 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(in), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
- 
-            
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
+
+
  interface
   integer function h5ltmake_dataset_nint2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1376,13 +1376,13 @@ subroutine h5ltmake_dataset_int_f_2 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                  ! data buffer 
+  dimension(dims(1),dims(2)) :: buf                  ! data buffer
   end function h5ltmake_dataset_nint2_c
  end interface
 
@@ -1409,15 +1409,15 @@ end subroutine h5ltmake_dataset_int_f_2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_int_f_3 (loc_id,& 
+subroutine h5ltmake_dataset_int_f_3 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1425,16 +1425,16 @@ subroutine h5ltmake_dataset_int_f_3 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(in), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer 
- 
-            
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
+
+
  interface
   integer function h5ltmake_dataset_nint3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1443,13 +1443,13 @@ subroutine h5ltmake_dataset_int_f_3 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer 
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltmake_dataset_nint3_c
  end interface
 
@@ -1477,15 +1477,15 @@ end subroutine h5ltmake_dataset_int_f_3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_float_f_1 (loc_id,& 
+subroutine h5ltmake_dataset_float_f_1 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1493,14 +1493,14 @@ subroutine h5ltmake_dataset_float_f_1 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
- real, intent(in), dimension(*) :: buf              ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
+ real, intent(in), dimension(*) :: buf              ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
-            
+
  interface
   integer function h5ltmake_dataset_nfl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1509,12 +1509,12 @@ subroutine h5ltmake_dataset_float_f_1 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
-  real, intent(in), dimension(*) :: buf                   ! data buffer  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
+  real, intent(in), dimension(*) :: buf                   ! data buffer
   end function h5ltmake_dataset_nfl1_c
  end interface
 
@@ -1540,15 +1540,15 @@ end subroutine h5ltmake_dataset_float_f_1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_float_f_2 (loc_id,& 
+subroutine h5ltmake_dataset_float_f_2 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1556,15 +1556,15 @@ subroutine h5ltmake_dataset_float_f_2 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(in), &
  dimension(dims(1),dims(2)) :: buf                  ! data buffer
-            
+
  interface
   integer function h5ltmake_dataset_nfl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1573,13 +1573,13 @@ subroutine h5ltmake_dataset_float_f_2 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                  ! data buffer  
+  dimension(dims(1),dims(2)) :: buf                  ! data buffer
   end function h5ltmake_dataset_nfl2_c
  end interface
 
@@ -1605,15 +1605,15 @@ end subroutine h5ltmake_dataset_float_f_2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_float_f_3 (loc_id,& 
+subroutine h5ltmake_dataset_float_f_3 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1621,15 +1621,15 @@ subroutine h5ltmake_dataset_float_f_3 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(in), &
  dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
-            
+
  interface
   integer function h5ltmake_dataset_nfl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1638,13 +1638,13 @@ subroutine h5ltmake_dataset_float_f_3 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer 
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltmake_dataset_nfl3_c
  end interface
 
@@ -1673,15 +1673,15 @@ end subroutine h5ltmake_dataset_float_f_3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_double_f_1 (loc_id,& 
+subroutine h5ltmake_dataset_double_f_1 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1689,15 +1689,15 @@ subroutine h5ltmake_dataset_double_f_1 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(in), &
- dimension(dims(1)) :: buf                          ! data buffer 
-            
+ dimension(dims(1)) :: buf                          ! data buffer
+
  interface
   integer function h5ltmake_dataset_ndl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1706,13 +1706,13 @@ subroutine h5ltmake_dataset_double_f_1 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1)) :: buf                               ! data buffer   
+  dimension(dims(1)) :: buf                               ! data buffer
   end function h5ltmake_dataset_ndl1_c
  end interface
 
@@ -1739,15 +1739,15 @@ end subroutine h5ltmake_dataset_double_f_1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_double_f_2 (loc_id,& 
+subroutine h5ltmake_dataset_double_f_2 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1755,15 +1755,15 @@ subroutine h5ltmake_dataset_double_f_2 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(in), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer 
-            
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
+
  interface
   integer function h5ltmake_dataset_ndl2_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1772,13 +1772,13 @@ subroutine h5ltmake_dataset_double_f_2 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer   
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltmake_dataset_ndl2_c
  end interface
 
@@ -1804,15 +1804,15 @@ end subroutine h5ltmake_dataset_double_f_2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_double_f_3 (loc_id,& 
+subroutine h5ltmake_dataset_double_f_3 (loc_id,&
                                    dset_name,&
-                                   rank,& 
+                                   rank,&
                                    dims,&
                                    buf,&
-                                   errcode )   
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1820,15 +1820,15 @@ subroutine h5ltmake_dataset_double_f_3 (loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(in) :: rank               ! rank 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf  
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(in) :: rank               ! rank
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(in), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer 
-            
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
+
  interface
   integer function h5ltmake_dataset_ndl3_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
   use h5global
@@ -1837,13 +1837,13 @@ subroutine h5ltmake_dataset_double_f_3 (loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(in) :: rank                    ! rank 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(in) :: rank                    ! rank
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(in), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer    
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltmake_dataset_ndl3_c
  end interface
 
@@ -1871,14 +1871,14 @@ end subroutine h5ltmake_dataset_double_f_3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_int_f_1(loc_id,& 
+subroutine h5ltread_dataset_int_f_1(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1886,13 +1886,13 @@ subroutine h5ltread_dataset_int_f_1(loc_id,&
 !DEC$endif
 !
 
- integer(HID_T),   intent(IN) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(HID_T),   intent(IN) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(inout), &
- dimension(dims(1)) :: buf                          ! data buffer  
+ dimension(dims(1)) :: buf                          ! data buffer
 
  interface
   integer function h5ltread_dataset_nint1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1902,12 +1902,12 @@ subroutine h5ltread_dataset_int_f_1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(inout), &
-  dimension(dims(1)) :: buf                               ! data buffer   
+  dimension(dims(1)) :: buf                               ! data buffer
   end function h5ltread_dataset_nint1_c
  end interface
 
@@ -1920,7 +1920,7 @@ end subroutine h5ltread_dataset_int_f_1
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_int_f_2
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -1934,14 +1934,14 @@ end subroutine h5ltread_dataset_int_f_1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_int_f_2(loc_id,& 
+subroutine h5ltread_dataset_int_f_2(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1949,13 +1949,13 @@ subroutine h5ltread_dataset_int_f_2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(inout), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer  
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
 
  interface
   integer function h5ltread_dataset_nint2_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1965,12 +1965,12 @@ subroutine h5ltread_dataset_int_f_2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(inout), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer    
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltread_dataset_nint2_c
  end interface
 
@@ -1982,7 +1982,7 @@ end subroutine h5ltread_dataset_int_f_2
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_int_f_3
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -1996,14 +1996,14 @@ end subroutine h5ltread_dataset_int_f_2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_int_f_3(loc_id,& 
+subroutine h5ltread_dataset_int_f_3(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2011,13 +2011,13 @@ subroutine h5ltread_dataset_int_f_3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer, intent(inout), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer  
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
  interface
   integer function h5ltread_dataset_nint3_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2027,12 +2027,12 @@ subroutine h5ltread_dataset_int_f_3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   integer, intent(inout), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer   
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltread_dataset_nint3_c
  end interface
 
@@ -2045,7 +2045,7 @@ end subroutine h5ltread_dataset_int_f_3
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_float_f_1
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -2059,14 +2059,14 @@ end subroutine h5ltread_dataset_int_f_3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_float_f_1(loc_id,& 
+subroutine h5ltread_dataset_float_f_1(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2074,13 +2074,13 @@ subroutine h5ltread_dataset_float_f_1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(inout), &
- dimension(dims(1)) :: buf                          ! data buffer  
+ dimension(dims(1)) :: buf                          ! data buffer
 
  interface
   integer function h5ltread_dataset_nfl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2090,12 +2090,12 @@ subroutine h5ltread_dataset_float_f_1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(inout), &
-  dimension(dims(1)) :: buf                               ! data buffer   
+  dimension(dims(1)) :: buf                               ! data buffer
   end function h5ltread_dataset_nfl1_c
  end interface
 
@@ -2108,7 +2108,7 @@ end subroutine h5ltread_dataset_float_f_1
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_float_f_2
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -2122,14 +2122,14 @@ end subroutine h5ltread_dataset_float_f_1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_float_f_2(loc_id,& 
+subroutine h5ltread_dataset_float_f_2(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2137,13 +2137,13 @@ subroutine h5ltread_dataset_float_f_2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(inout), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer  
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
 
  interface
   integer function h5ltread_dataset_nfl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2153,12 +2153,12 @@ subroutine h5ltread_dataset_float_f_2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(inout), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer    
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltread_dataset_nfl2_c
  end interface
 
@@ -2184,14 +2184,14 @@ end subroutine h5ltread_dataset_float_f_2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_float_f_3(loc_id,& 
+subroutine h5ltread_dataset_float_f_3(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2199,13 +2199,13 @@ subroutine h5ltread_dataset_float_f_3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  real, intent(inout), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer  
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
  interface
   integer function h5ltread_dataset_nfl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2215,12 +2215,12 @@ subroutine h5ltread_dataset_float_f_3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   real, intent(inout), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer   
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltread_dataset_nfl3_c
  end interface
 
@@ -2232,7 +2232,7 @@ end subroutine h5ltread_dataset_float_f_3
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_double_f_1
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -2246,14 +2246,14 @@ end subroutine h5ltread_dataset_float_f_3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_double_f_1(loc_id,& 
+subroutine h5ltread_dataset_double_f_1(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2261,13 +2261,13 @@ subroutine h5ltread_dataset_double_f_1(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(inout), &
- dimension(dims(1)) :: buf                          ! data buffer  
+ dimension(dims(1)) :: buf                          ! data buffer
 
  interface
   integer function h5ltread_dataset_ndl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2277,12 +2277,12 @@ subroutine h5ltread_dataset_double_f_1(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(inout), &
-  dimension(dims(1)) :: buf                               ! data buffer   
+  dimension(dims(1)) :: buf                               ! data buffer
   end function h5ltread_dataset_ndl1_c
  end interface
 
@@ -2295,7 +2295,7 @@ end subroutine h5ltread_dataset_double_f_1
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_double_f_2
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -2309,14 +2309,14 @@ end subroutine h5ltread_dataset_double_f_1
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_double_f_2(loc_id,& 
+subroutine h5ltread_dataset_double_f_2(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2324,13 +2324,13 @@ subroutine h5ltread_dataset_double_f_2(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(inout), &
- dimension(dims(1),dims(2)) :: buf                  ! data buffer  
+ dimension(dims(1),dims(2)) :: buf                  ! data buffer
 
  interface
   integer function h5ltread_dataset_ndl2_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2340,12 +2340,12 @@ subroutine h5ltread_dataset_double_f_2(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(inout), &
-  dimension(dims(1),dims(2)) :: buf                       ! data buffer    
+  dimension(dims(1),dims(2)) :: buf                       ! data buffer
   end function h5ltread_dataset_ndl2_c
  end interface
 
@@ -2357,7 +2357,7 @@ end subroutine h5ltread_dataset_double_f_2
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_double_f_3
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -2371,14 +2371,14 @@ end subroutine h5ltread_dataset_double_f_2
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_double_f_3(loc_id,& 
+subroutine h5ltread_dataset_double_f_3(loc_id,&
                                    dset_name,&
                                    buf,&
-                                   dims,& 
-                                   errcode ) 
+                                   dims,&
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2386,13 +2386,13 @@ subroutine h5ltread_dataset_double_f_3(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), dimension(*), intent(in) :: dims ! size of the bufffer buf
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  double precision, intent(inout), &
- dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer  
+ dimension(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
  interface
   integer function h5ltread_dataset_ndl3_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2402,12 +2402,12 @@ subroutine h5ltread_dataset_double_f_3(loc_id,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier 
+  integer(hid_t),   intent(in) :: type_id                 ! datatype identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t), dimension(*), intent(in) :: dims      ! size of the bufffer buf
   double precision, intent(inout), &
-  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer   
+  dimension(dims(1),dims(2),dims(3)) :: buf               ! data buffer
   end function h5ltread_dataset_ndl3_c
  end interface
 
@@ -2434,13 +2434,13 @@ end subroutine h5ltread_dataset_double_f_3
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltmake_dataset_string_f(loc_id,& 
+subroutine h5ltmake_dataset_string_f(loc_id,&
                                      dset_name,&
                                      buf,&
-                                     errcode )   
+                                     errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2448,12 +2448,12 @@ subroutine h5ltmake_dataset_string_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- character(len=*), intent(in) :: buf                ! data buffer 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ character(len=*), intent(in) :: buf                ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
-            
+
  interface
   integer function h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buf)
   use h5global
@@ -2463,8 +2463,8 @@ subroutine h5ltmake_dataset_string_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  character(len=*), intent(in) :: buf                     ! data buffer  
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  character(len=*), intent(in) :: buf                     ! data buffer
   end function h5ltmake_dataset_string_c
  end interface
 
@@ -2476,7 +2476,7 @@ end subroutine h5ltmake_dataset_string_f
 !-------------------------------------------------------------------------
 ! Function: h5ltread_dataset_string_f
 !
-! Purpose: Read a dataset 
+! Purpose: Read a dataset
 !
 ! Return: Success: 0, Failure: -1
 !
@@ -2490,13 +2490,13 @@ end subroutine h5ltmake_dataset_string_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltread_dataset_string_f(loc_id,& 
+subroutine h5ltread_dataset_string_f(loc_id,&
                                      dset_name,&
                                      buf,&
-                                     errcode ) 
+                                     errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2504,8 +2504,8 @@ subroutine h5ltread_dataset_string_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(inout) :: buf             ! data buffer
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
@@ -2519,7 +2519,7 @@ subroutine h5ltread_dataset_string_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(inout) :: buf                  ! data buffer
   end function h5ltread_dataset_string_c
  end interface
@@ -2554,15 +2554,15 @@ end subroutine h5ltread_dataset_string_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltset_attribute_int_f(loc_id,& 
+subroutine h5ltset_attribute_int_f(loc_id,&
                                     dset_name,&
                                     attr_name,&
                                     buf,&
                                     size,&
-                                    errcode ) 
+                                    errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2570,8 +2570,8 @@ subroutine h5ltset_attribute_int_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer(size_t),  intent(in) :: size               ! size of attribute array
  integer :: errcode                                 ! error code
@@ -2590,7 +2590,7 @@ subroutine h5ltset_attribute_int_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   integer(size_t),  intent(in) :: size                    ! size of attribute array
   integer, intent(in), dimension(*) :: buf                ! data buffer
@@ -2620,15 +2620,15 @@ end subroutine h5ltset_attribute_int_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltset_attribute_float_f(loc_id,& 
+subroutine h5ltset_attribute_float_f(loc_id,&
                                     dset_name,&
                                     attr_name,&
                                     buf,&
                                     size,&
-                                    errcode ) 
+                                    errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2636,8 +2636,8 @@ subroutine h5ltset_attribute_float_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer(size_t),  intent(in) :: size               ! size of attribute array
  integer :: errcode                                 ! error code
@@ -2656,7 +2656,7 @@ subroutine h5ltset_attribute_float_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   integer(size_t),  intent(in) :: size                    ! size of attribute array
   real, intent(in), dimension(*) :: buf                   ! data buffer
@@ -2686,15 +2686,15 @@ end subroutine h5ltset_attribute_float_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltset_attribute_double_f(loc_id,& 
+subroutine h5ltset_attribute_double_f(loc_id,&
                                       dset_name,&
                                       attr_name,&
                                       buf,&
                                       size,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2702,8 +2702,8 @@ subroutine h5ltset_attribute_double_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer(size_t),  intent(in) :: size               ! size of attribute array
  integer :: errcode                                 ! error code
@@ -2722,7 +2722,7 @@ subroutine h5ltset_attribute_double_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   integer(size_t),  intent(in) :: size                    ! size of attribute array
   double precision, intent(in), dimension(*) :: buf       ! data buffer
@@ -2753,14 +2753,14 @@ end subroutine h5ltset_attribute_double_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltset_attribute_string_f(loc_id,& 
+subroutine h5ltset_attribute_string_f(loc_id,&
                                       dset_name,&
                                       attr_name,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2768,8 +2768,8 @@ subroutine h5ltset_attribute_string_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer :: errcode                                 ! error code
  character(len=*), intent(in) :: buf                ! data buffer
@@ -2787,7 +2787,7 @@ subroutine h5ltset_attribute_string_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   character(len=*), intent(in) :: buf                     ! data buffer
   end function h5ltset_attribute_string_c
@@ -2818,14 +2818,14 @@ end subroutine h5ltset_attribute_string_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_attribute_int_f(loc_id,& 
+subroutine h5ltget_attribute_int_f(loc_id,&
                                     dset_name,&
                                     attr_name,&
                                     buf,&
-                                    errcode ) 
+                                    errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2833,8 +2833,8 @@ subroutine h5ltget_attribute_int_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer :: errcode                                 ! error code
  integer, intent(inout), dimension(*) :: buf        ! data buffer
@@ -2852,7 +2852,7 @@ subroutine h5ltget_attribute_int_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   integer, intent(inout), dimension(*) :: buf             ! data buffer
   end function h5ltget_attribute_int_c
@@ -2882,14 +2882,14 @@ end subroutine h5ltget_attribute_int_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_attribute_float_f(loc_id,& 
+subroutine h5ltget_attribute_float_f(loc_id,&
                                     dset_name,&
                                     attr_name,&
                                     buf,&
-                                    errcode ) 
+                                    errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2897,8 +2897,8 @@ subroutine h5ltget_attribute_float_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer :: errcode                                 ! error code
  real, intent(inout), dimension(*) :: buf           ! data buffer
@@ -2916,7 +2916,7 @@ subroutine h5ltget_attribute_float_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   real, intent(inout), dimension(*) :: buf                ! data buffer
   end function h5ltget_attribute_float_c
@@ -2945,14 +2945,14 @@ end subroutine h5ltget_attribute_float_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_attribute_double_f(loc_id,& 
+subroutine h5ltget_attribute_double_f(loc_id,&
                                     dset_name,&
                                     attr_name,&
                                     buf,&
-                                    errcode ) 
+                                    errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -2960,8 +2960,8 @@ subroutine h5ltget_attribute_double_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer :: errcode                                 ! error code
  double precision,intent(inout),dimension(*) :: buf ! data buffer
@@ -2979,7 +2979,7 @@ subroutine h5ltget_attribute_double_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   double precision, intent(inout), dimension(*) :: buf    ! data buffer
   end function h5ltget_attribute_double_c
@@ -3008,14 +3008,14 @@ end subroutine h5ltget_attribute_double_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_attribute_string_f(loc_id,& 
+subroutine h5ltget_attribute_string_f(loc_id,&
                                       dset_name,&
                                       attr_name,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3023,8 +3023,8 @@ subroutine h5ltget_attribute_string_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
  integer :: errcode                                 ! error code
  character(len=*), intent(inout) :: buf             ! data buffer
@@ -3042,7 +3042,7 @@ subroutine h5ltget_attribute_string_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
   character(len=*), intent(inout) :: buf                  ! data buffer
   end function h5ltget_attribute_string_c
@@ -3075,13 +3075,13 @@ end subroutine h5ltget_attribute_string_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_dataset_ndims_f(loc_id,& 
+subroutine h5ltget_dataset_ndims_f(loc_id,&
                                    dset_name,&
                                    rank,&
-                                   errcode ) 
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3089,9 +3089,9 @@ subroutine h5ltget_dataset_ndims_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer,          intent(inout) :: rank            ! rank 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer,          intent(inout) :: rank            ! rank
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -3104,8 +3104,8 @@ subroutine h5ltget_dataset_ndims_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer,          intent(inout) :: rank                 ! rank 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer,          intent(inout) :: rank                 ! rank
   end function h5ltget_dataset_ndims_c
  end interface
 
@@ -3118,7 +3118,7 @@ end subroutine h5ltget_dataset_ndims_f
 !-------------------------------------------------------------------------
 ! Function: h5ltfind_dataset_f
 !
-! Purpose: Inquires if a dataset named dset_name exists attached 
+! Purpose: Inquires if a dataset named dset_name exists attached
 !           to the object loc_id.
 !
 ! Return: Success: 0, Failure: -1
@@ -3133,11 +3133,11 @@ end subroutine h5ltget_dataset_ndims_f
 !
 !-------------------------------------------------------------------------
 
-integer function h5ltfind_dataset_f(loc_id,& 
-                                    dset_name) 
+integer function h5ltfind_dataset_f(loc_id,&
+                                    dset_name)
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3145,8 +3145,8 @@ integer function h5ltfind_dataset_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -3159,7 +3159,7 @@ integer function h5ltfind_dataset_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   end function h5ltfind_dataset_c
  end interface
 
@@ -3186,15 +3186,15 @@ end function h5ltfind_dataset_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_dataset_info_f(loc_id,& 
+subroutine h5ltget_dataset_info_f(loc_id,&
                                    dset_name,&
                                    dims,&
                                    type_class,&
                                    type_size,&
-                                   errcode ) 
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3202,9 +3202,9 @@ subroutine h5ltget_dataset_info_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions
  integer, intent(inout)         :: type_class       ! type class
  integer(size_t), intent(inout) :: type_size        ! type size
  integer :: errcode                                 ! error code
@@ -3219,10 +3219,10 @@ subroutine h5ltget_dataset_info_f(loc_id,&
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
-  integer(hsize_t),dimension(*),intent(inout):: dims      ! dimensions 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
+  integer(hsize_t),dimension(*),intent(inout):: dims      ! dimensions
   integer, intent(inout)         :: type_class            ! type class
-  integer(size_t), intent(inout) :: type_size             ! type size 
+  integer(size_t), intent(inout) :: type_size             ! type size
   end function h5ltget_dataset_info_c
  end interface
 
@@ -3254,14 +3254,14 @@ end subroutine h5ltget_dataset_info_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_attribute_ndims_f(loc_id,& 
+subroutine h5ltget_attribute_ndims_f(loc_id,&
                                     dset_name,&
                                     attr_name,&
                                     rank,&
-                                    errcode ) 
+                                    errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3269,10 +3269,10 @@ subroutine h5ltget_attribute_ndims_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
- integer,          intent(inout) :: rank            ! rank 
+ integer,          intent(inout) :: rank            ! rank
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
  integer :: attrlen                                 ! name length
@@ -3288,9 +3288,9 @@ subroutine h5ltget_attribute_ndims_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
-  integer,          intent(inout) :: rank                 ! rank 
+  integer,          intent(inout) :: rank                 ! rank
   end function h5ltget_attribute_ndims_c
  end interface
 
@@ -3318,16 +3318,16 @@ end subroutine h5ltget_attribute_ndims_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5ltget_attribute_info_f(loc_id,& 
+subroutine h5ltget_attribute_info_f(loc_id,&
                                    dset_name,&
                                    attr_name,&
                                    dims,&
                                    type_class,&
                                    type_size,&
-                                   errcode ) 
+                                   errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -3335,10 +3335,10 @@ subroutine h5ltget_attribute_info_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: attr_name          ! name of the attribute
- integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions 
+ integer(hsize_t),dimension(*),intent(inout):: dims ! dimensions
  integer, intent(inout)         :: type_class       ! type class
  integer(size_t), intent(inout) :: type_size        ! type size
  integer :: errcode                                 ! error code
@@ -3356,11 +3356,11 @@ subroutine h5ltget_attribute_info_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
   integer :: namelen                                      ! lenght of name buffer
   integer :: attrlen                                      ! lenght of attr name buffer
-  character(len=*), intent(in) :: dset_name               ! name of the dataset 
+  character(len=*), intent(in) :: dset_name               ! name of the dataset
   character(len=*), intent(in) :: attr_name               ! name of the attribute
-  integer(hsize_t),dimension(*),intent(inout):: dims      ! dimensions 
+  integer(hsize_t),dimension(*),intent(inout):: dims      ! dimensions
   integer, intent(inout)         :: type_class            ! type class
-  integer(size_t), intent(inout) :: type_size             ! type size 
+  integer(size_t), intent(inout) :: type_size             ! type size
   end function h5ltget_attribute_info_c
  end interface
 
@@ -3375,9 +3375,9 @@ end subroutine h5ltget_attribute_info_f
 !  end
 !
 end module H5LT
-            
 
-                                     
+
+
 
 
 
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index cea094a..c641cf4 100755
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -635,7 +635,7 @@ int_f
 nh5tbinsert_field_c(hid_t_f *loc_id,
                     int_f *namelen,
                     _fcd name,
-                    int_f *namelen1, 
+                    int_f *namelen1,
                     _fcd field_name,
                     hid_t_f *field_type,
                     int_f *position,
diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
index 781bd6a..6731b79 100755
--- a/hl/fortran/src/H5TBff.f90
+++ b/hl/fortran/src/H5TBff.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,15 +11,15 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
 ! This file contains FORTRAN90 interfaces for H5TB functions
 !
-      
+
 module h5tb
 use h5fortran_types
-use hdf5 
+use hdf5
 
 
 interface h5tbwrite_field_name_f
@@ -80,9 +80,9 @@ contains
 !-------------------------------------------------------------------------
 
 subroutine h5tbmake_table_f(table_title,&
-                            loc_id,& 
+                            loc_id,&
                             dset_name,&
-                            nfields,& 
+                            nfields,&
                             nrecords,&
                             type_size,&
                             field_names,&
@@ -90,7 +90,7 @@ subroutine h5tbmake_table_f(table_title,&
                             field_types,&
                             chunk_size,&
                             compress,&
-                            errcode ) 
+                            errcode )
 
  implicit none
 
@@ -101,10 +101,10 @@ subroutine h5tbmake_table_f(table_title,&
 !DEC$endif
 !
 
- character(len=*), intent(in) :: table_title                      ! name of the dataset 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
- integer(hsize_t), intent(in) :: nfields                          ! fields 
+ character(len=*), intent(in) :: table_title                      ! name of the dataset
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
+ integer(hsize_t), intent(in) :: nfields                          ! fields
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
  character(len=*), dimension(nfields), intent(in) :: field_names  ! field names
@@ -118,7 +118,7 @@ subroutine h5tbmake_table_f(table_title,&
  integer, dimension(nfields) :: namelen2                          ! name lengths
  integer :: i                                                     ! general purpose integer
 
- 
+
  interface
   integer function h5tbmake_table_c(namelen1,&
   table_title,&
@@ -141,10 +141,10 @@ subroutine h5tbmake_table_f(table_title,&
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: table_title
-  character(len=*), intent(in) :: table_title                      ! name of the dataset 
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
-  integer(hsize_t), intent(in) :: nfields                          ! fields 
+  character(len=*), intent(in) :: table_title                      ! name of the dataset
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
+  integer(hsize_t), intent(in) :: nfields                          ! fields
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
   character(len=*), dimension(nfields), intent(in) :: field_names  ! field names
@@ -197,17 +197,17 @@ end subroutine h5tbmake_table_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_name_f_int(loc_id,& 
+subroutine h5tbwrite_field_name_f_int(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -215,13 +215,13 @@ subroutine h5tbwrite_field_name_f_int(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- integer, intent(in), dimension(*) :: buf                         ! data buffer 
+ integer, intent(in), dimension(*) :: buf                         ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -229,20 +229,20 @@ subroutine h5tbwrite_field_name_f_int(loc_id,&
  interface
   integer function h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_INT_C'::h5tbwrite_field_name_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  integer, intent(in), dimension(*) :: buf                         ! data buffer 
+  integer, intent(in), dimension(*) :: buf                         ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -251,7 +251,7 @@ subroutine h5tbwrite_field_name_f_int(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -272,17 +272,17 @@ end subroutine h5tbwrite_field_name_f_int
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_name_f_float(loc_id,& 
+subroutine h5tbwrite_field_name_f_float(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -290,13 +290,13 @@ subroutine h5tbwrite_field_name_f_float(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- real, intent(in), dimension(*) :: buf                            ! data buffer 
+ real, intent(in), dimension(*) :: buf                            ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -304,20 +304,20 @@ subroutine h5tbwrite_field_name_f_float(loc_id,&
  interface
   integer function h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_FL_C'::h5tbwrite_field_name_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  real, intent(in), dimension(*) :: buf                            ! data buffer 
+  real, intent(in), dimension(*) :: buf                            ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -326,7 +326,7 @@ subroutine h5tbwrite_field_name_f_float(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -349,17 +349,17 @@ end subroutine h5tbwrite_field_name_f_float
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_name_f_double(loc_id,& 
+subroutine h5tbwrite_field_name_f_double(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -367,13 +367,13 @@ subroutine h5tbwrite_field_name_f_double(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- double precision, intent(in), dimension(*) :: buf                ! data buffer 
+ double precision, intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -381,20 +381,20 @@ subroutine h5tbwrite_field_name_f_double(loc_id,&
  interface
   integer function h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_DL_C'::h5tbwrite_field_name_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  double precision, intent(in), dimension(*) :: buf                ! data buffer 
+  double precision, intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -403,7 +403,7 @@ subroutine h5tbwrite_field_name_f_double(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -424,17 +424,17 @@ end subroutine h5tbwrite_field_name_f_double
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_name_f_string(loc_id,& 
+subroutine h5tbwrite_field_name_f_string(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -442,13 +442,13 @@ subroutine h5tbwrite_field_name_f_string(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -456,20 +456,20 @@ subroutine h5tbwrite_field_name_f_string(loc_id,&
  interface
   integer function h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_NAME_ST_C'::h5tbwrite_field_name_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -478,7 +478,7 @@ subroutine h5tbwrite_field_name_f_string(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -500,17 +500,17 @@ end subroutine h5tbwrite_field_name_f_string
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_name_f_int(loc_id,& 
+subroutine h5tbread_field_name_f_int(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -518,13 +518,13 @@ subroutine h5tbread_field_name_f_int(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- integer, intent(in), dimension(*) :: buf                         ! data buffer 
+ integer, intent(in), dimension(*) :: buf                         ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -532,20 +532,20 @@ subroutine h5tbread_field_name_f_int(loc_id,&
  interface
   integer function h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_INT_C'::h5tbread_field_name_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  integer, intent(in), dimension(*) :: buf                         ! data buffer 
+  integer, intent(in), dimension(*) :: buf                         ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -554,7 +554,7 @@ subroutine h5tbread_field_name_f_int(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -575,17 +575,17 @@ end subroutine h5tbread_field_name_f_int
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_name_f_float(loc_id,& 
+subroutine h5tbread_field_name_f_float(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -593,13 +593,13 @@ subroutine h5tbread_field_name_f_float(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- real, intent(in), dimension(*) :: buf                            ! data buffer 
+ real, intent(in), dimension(*) :: buf                            ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -607,20 +607,20 @@ subroutine h5tbread_field_name_f_float(loc_id,&
  interface
   integer function h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_FL_C'::h5tbread_field_name_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  real, intent(in), dimension(*) :: buf                            ! data buffer 
+  real, intent(in), dimension(*) :: buf                            ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -629,7 +629,7 @@ subroutine h5tbread_field_name_f_float(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -650,17 +650,17 @@ end subroutine h5tbread_field_name_f_float
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_name_f_double(loc_id,& 
+subroutine h5tbread_field_name_f_double(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -668,13 +668,13 @@ subroutine h5tbread_field_name_f_double(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- double precision, intent(in), dimension(*) :: buf                ! data buffer 
+ double precision, intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -682,20 +682,20 @@ subroutine h5tbread_field_name_f_double(loc_id,&
  interface
   integer function h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_DL_C'::h5tbread_field_name_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  double precision, intent(in), dimension(*) :: buf                ! data buffer 
+  double precision, intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -704,7 +704,7 @@ subroutine h5tbread_field_name_f_double(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -725,17 +725,17 @@ end subroutine h5tbread_field_name_f_double
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_name_f_string(loc_id,& 
+subroutine h5tbread_field_name_f_string(loc_id,&
                                       dset_name,&
-                                      field_name,& 
+                                      field_name,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -743,13 +743,13 @@ subroutine h5tbread_field_name_f_string(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -757,20 +757,20 @@ subroutine h5tbread_field_name_f_string(loc_id,&
  interface
   integer function h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_NAME_ST_C'::h5tbread_field_name_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length
@@ -779,7 +779,7 @@ subroutine h5tbread_field_name_f_string(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
   start,nrecords,type_size,buf)
 
@@ -801,17 +801,17 @@ end subroutine h5tbread_field_name_f_string
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_index_f_int(loc_id,& 
+subroutine h5tbwrite_field_index_f_int(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -819,39 +819,39 @@ subroutine h5tbwrite_field_index_f_int(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- integer, intent(in), dimension(*) :: buf                         ! data buffer 
+ integer, intent(in), dimension(*) :: buf                         ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_INT_C'::h5tbwrite_field_index_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  integer, intent(in), dimension(*) :: buf                         ! data buffer 
+  integer, intent(in), dimension(*) :: buf                         ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_int_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -872,17 +872,17 @@ end subroutine h5tbwrite_field_index_f_int
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_index_f_float(loc_id,& 
+subroutine h5tbwrite_field_index_f_float(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -890,39 +890,39 @@ subroutine h5tbwrite_field_index_f_float(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- real, intent(in), dimension(*) :: buf                            ! data buffer 
+ real, intent(in), dimension(*) :: buf                            ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_FL_C'::h5tbwrite_field_index_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  real, intent(in), dimension(*) :: buf                            ! data buffer 
+  real, intent(in), dimension(*) :: buf                            ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_fl_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -945,17 +945,17 @@ end subroutine h5tbwrite_field_index_f_float
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_index_f_double(loc_id,& 
+subroutine h5tbwrite_field_index_f_double(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -963,39 +963,39 @@ subroutine h5tbwrite_field_index_f_double(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- double precision, intent(in), dimension(*) :: buf                ! data buffer 
+ double precision, intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_DL_C'::h5tbwrite_field_index_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  double precision, intent(in), dimension(*) :: buf                ! data buffer 
+  double precision, intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_dl_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -1016,17 +1016,17 @@ end subroutine h5tbwrite_field_index_f_double
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbwrite_field_index_f_string(loc_id,& 
+subroutine h5tbwrite_field_index_f_string(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1034,39 +1034,39 @@ subroutine h5tbwrite_field_index_f_string(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBWRITE_FIELD_INDEX_ST_C'::h5tbwrite_field_index_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbwrite_field_index_st_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -1088,17 +1088,17 @@ end subroutine h5tbwrite_field_index_f_string
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_index_f_int(loc_id,& 
+subroutine h5tbread_field_index_f_int(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1106,39 +1106,39 @@ subroutine h5tbread_field_index_f_int(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- integer, intent(in), dimension(*) :: buf                         ! data buffer 
+ integer, intent(in), dimension(*) :: buf                         ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_INT_C'::h5tbread_field_index_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  integer, intent(in), dimension(*) :: buf                         ! data buffer 
+  integer, intent(in), dimension(*) :: buf                         ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_int_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -1159,17 +1159,17 @@ end subroutine h5tbread_field_index_f_int
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_index_f_float(loc_id,& 
+subroutine h5tbread_field_index_f_float(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1177,39 +1177,39 @@ subroutine h5tbread_field_index_f_float(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- real, intent(in), dimension(*) :: buf                            ! data buffer 
+ real, intent(in), dimension(*) :: buf                            ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
    start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_FL_C'::h5tbread_field_index_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  real, intent(in), dimension(*) :: buf                            ! data buffer 
+  real, intent(in), dimension(*) :: buf                            ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_fl_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -1230,17 +1230,17 @@ end subroutine h5tbread_field_index_f_float
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_index_f_double(loc_id,& 
+subroutine h5tbread_field_index_f_double(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1248,39 +1248,39 @@ subroutine h5tbread_field_index_f_double(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- double precision, intent(in), dimension(*) :: buf                ! data buffer 
+ double precision, intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
    start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_DL_C'::h5tbread_field_index_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  double precision, intent(in), dimension(*) :: buf                ! data buffer 
+  double precision, intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_dl_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -1301,17 +1301,17 @@ end subroutine h5tbread_field_index_f_double
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbread_field_index_f_string(loc_id,& 
+subroutine h5tbread_field_index_f_string(loc_id,&
                                       dset_name,&
-                                      field_index,& 
+                                      field_index,&
                                       start,&
                                       nrecords,&
                                       type_size,&
                                       buf,&
-                                      errcode ) 
+                                      errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1319,39 +1319,39 @@ subroutine h5tbread_field_index_f_string(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  integer, intent(in) :: field_index                               ! index
- integer(hsize_t), intent(in) :: start                            ! start record 
+ integer(hsize_t), intent(in) :: start                            ! start record
  integer(hsize_t), intent(in) :: nrecords                         ! records
  integer(size_t),  intent(in) :: type_size                        ! type size
- character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer
  integer :: errcode                                               ! error code
  integer :: namelen                                               ! name length
 
  interface
   integer function h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,&
    start,nrecords,type_size,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBREAD_FIELD_INDEX_ST_C'::h5tbread_field_index_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   integer, intent(in) :: field_index                               ! index
-  integer(hsize_t), intent(in) :: start                            ! start record 
+  integer(hsize_t), intent(in) :: start                            ! start record
   integer(hsize_t), intent(in) :: nrecords                         ! records
   integer(size_t),  intent(in) :: type_size                        ! type size
-  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer
   integer :: errcode                                               ! error code
   integer :: namelen                                               ! name length
   end function h5tbread_field_index_st_c
  end interface
 
  namelen  = len(dset_name)
- 
+
  errcode = h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,&
   start,nrecords,type_size,buf)
 
@@ -1373,15 +1373,15 @@ end subroutine h5tbread_field_index_f_string
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbinsert_field_f_int(loc_id,& 
+subroutine h5tbinsert_field_f_int(loc_id,&
                                   dset_name,&
-                                  field_name,& 
+                                  field_name,&
                                   field_type,&
                                   field_index,&
                                   buf,&
-                                  errcode ) 
+                                  errcode )
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1389,12 +1389,12 @@ subroutine h5tbinsert_field_f_int(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
  integer(hid_t), intent(in)   :: field_type                       ! field type
  integer, intent(in) :: field_index                               ! field_index
- integer, intent(in), dimension(*) :: buf                         ! data buffer 
+ integer, intent(in), dimension(*) :: buf                         ! data buffer
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1403,19 +1403,19 @@ subroutine h5tbinsert_field_f_int(loc_id,&
  interface
   integer function h5tbinsert_field_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_INT_C'::h5tbinsert_field_int_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
   integer(hid_t), intent(in)   :: field_type                       ! field type
   integer, intent(in) :: field_index                               ! field_index
-  integer, intent(in), dimension(*) :: buf                         ! data buffer 
+  integer, intent(in), dimension(*) :: buf                         ! data buffer
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_int_c
@@ -1423,7 +1423,7 @@ subroutine h5tbinsert_field_f_int(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbinsert_field_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
 
@@ -1446,15 +1446,15 @@ end subroutine h5tbinsert_field_f_int
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbinsert_field_f_float(loc_id,& 
+subroutine h5tbinsert_field_f_float(loc_id,&
                                   dset_name,&
-                                  field_name,& 
+                                  field_name,&
                                   field_type,&
                                   field_index,&
                                   buf,&
-                                  errcode ) 
+                                  errcode )
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1462,12 +1462,12 @@ subroutine h5tbinsert_field_f_float(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
  integer(hid_t), intent(in)   :: field_type                       ! field type
  integer, intent(in) :: field_index                               ! field_index
- real, intent(in), dimension(*) :: buf                            ! data buffer 
+ real, intent(in), dimension(*) :: buf                            ! data buffer
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1476,19 +1476,19 @@ subroutine h5tbinsert_field_f_float(loc_id,&
  interface
   integer function h5tbinsert_field_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_FL_C'::h5tbinsert_field_fl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
   integer(hid_t), intent(in)   :: field_type                       ! field type
   integer, intent(in) :: field_index                               ! field_index
-  real, intent(in), dimension(*) :: buf                            ! data buffer 
+  real, intent(in), dimension(*) :: buf                            ! data buffer
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_fl_c
@@ -1496,7 +1496,7 @@ subroutine h5tbinsert_field_f_float(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbinsert_field_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
 
@@ -1519,15 +1519,15 @@ end subroutine h5tbinsert_field_f_float
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbinsert_field_f_double(loc_id,& 
+subroutine h5tbinsert_field_f_double(loc_id,&
                                   dset_name,&
-                                  field_name,& 
+                                  field_name,&
                                   field_type,&
                                   field_index,&
                                   buf,&
-                                  errcode ) 
+                                  errcode )
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1535,12 +1535,12 @@ subroutine h5tbinsert_field_f_double(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
  integer(hid_t), intent(in)   :: field_type                       ! field type
  integer, intent(in) :: field_index                               ! field_index
- double precision, intent(in), dimension(*) :: buf                ! data buffer 
+ double precision, intent(in), dimension(*) :: buf                ! data buffer
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1549,19 +1549,19 @@ subroutine h5tbinsert_field_f_double(loc_id,&
  interface
   integer function h5tbinsert_field_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_DL_C'::h5tbinsert_field_dl_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
   integer(hid_t), intent(in)   :: field_type                       ! field type
   integer, intent(in) :: field_index                               ! field_index
-  double precision, intent(in), dimension(*) :: buf                ! data buffer 
+  double precision, intent(in), dimension(*) :: buf                ! data buffer
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_dl_c
@@ -1569,7 +1569,7 @@ subroutine h5tbinsert_field_f_double(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbinsert_field_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
 
@@ -1593,15 +1593,15 @@ end subroutine h5tbinsert_field_f_double
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbinsert_field_f_string(loc_id,& 
+subroutine h5tbinsert_field_f_string(loc_id,&
                                   dset_name,&
-                                  field_name,& 
+                                  field_name,&
                                   field_type,&
                                   field_index,&
                                   buf,&
-                                  errcode ) 
+                                  errcode )
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1609,12 +1609,12 @@ subroutine h5tbinsert_field_f_string(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
  integer(hid_t), intent(in)   :: field_type                       ! field type
  integer, intent(in) :: field_index                               ! field_index
- character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+ character(len=*), intent(in), dimension(*) :: buf                ! data buffer
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
  integer :: errcode                                               ! error code
@@ -1623,19 +1623,19 @@ subroutine h5tbinsert_field_f_string(loc_id,&
  interface
   integer function h5tbinsert_field_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBINSERT_FIELD_ST_C'::h5tbinsert_field_st_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+  integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+  character(len=*), intent(in) :: dset_name                        ! name of the dataset
   character(len=*), intent(in) :: field_name                       ! name of the field
   integer(hid_t), intent(in)   :: field_type                       ! field type
   integer, intent(in) :: field_index                               ! field_index
-  character(len=*), intent(in), dimension(*) :: buf                ! data buffer 
+  character(len=*), intent(in), dimension(*) :: buf                ! data buffer
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
   end function h5tbinsert_field_st_c
@@ -1643,7 +1643,7 @@ subroutine h5tbinsert_field_f_string(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbinsert_field_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
    field_type,field_index,buf)
 
@@ -1667,12 +1667,12 @@ end subroutine h5tbinsert_field_f_string
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbdelete_field_f(loc_id,& 
+subroutine h5tbdelete_field_f(loc_id,&
                               dset_name,&
                               field_name,&
-                              errcode ) 
+                              errcode )
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1680,8 +1680,8 @@ subroutine h5tbdelete_field_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier 
- character(len=*), intent(in) :: dset_name                        ! name of the dataset 
+ integer(hid_t),   intent(in) :: loc_id                           ! file or group identifier
+ character(len=*), intent(in) :: dset_name                        ! name of the dataset
  character(len=*), intent(in) :: field_name                       ! name of the field
  integer :: namelen                                               ! name length
  integer :: namelen1                                              ! name length
@@ -1690,15 +1690,15 @@ subroutine h5tbdelete_field_f(loc_id,&
 
  interface
   integer function h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name)
- 
+
   use h5global
   !DEC$ IF DEFINED(HDF5F90_WINDOWS)
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBDELETE_FIELD_C'::h5tbdelete_field_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   !DEC$ATTRIBUTES reference :: field_name
-  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier 
-  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset 
+  integer(HID_T),   intent(IN) :: loc_id                           ! file or group identifier
+  character(LEN=*), intent(IN) :: dset_name                        ! name of the dataset
   character(LEN=*), intent(IN) :: field_name                       ! name of the field
   integer :: namelen                                               ! name length
   integer :: namelen1                                              ! name length length
@@ -1707,7 +1707,7 @@ subroutine h5tbdelete_field_f(loc_id,&
 
  namelen  = len(dset_name)
  namelen1 = len(field_name)
- 
+
  errcode = h5tbdelete_field_c(loc_id,namelen,dset_name,namelen1,field_name)
 
 end subroutine h5tbdelete_field_f
@@ -1731,14 +1731,14 @@ end subroutine h5tbdelete_field_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbget_table_info_f(loc_id,& 
+subroutine h5tbget_table_info_f(loc_id,&
                                 dset_name,&
                                 nfields,&
                                 nrecords,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1746,10 +1746,10 @@ subroutine h5tbget_table_info_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
- character(len=*), intent(in) :: dset_name          ! name of the dataset 
- integer(hsize_t), intent(inout):: nfields          ! nfields 
- integer(hsize_t), intent(inout):: nrecords         ! nrecords 
+ integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+ character(len=*), intent(in) :: dset_name          ! name of the dataset
+ integer(hsize_t), intent(inout):: nfields          ! nfields
+ integer(hsize_t), intent(inout):: nrecords         ! nrecords
  integer :: errcode                                 ! error code
  integer :: namelen                                 ! name length
 
@@ -1760,10 +1760,10 @@ subroutine h5tbget_table_info_f(loc_id,&
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBGET_TABLE_INFO_C'::h5tbget_table_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier 
-  character(len=*), intent(in) :: dset_name          ! name of the dataset 
-  integer(hsize_t), intent(inout):: nfields          ! nfields 
-  integer(hsize_t), intent(inout):: nrecords         ! nrecords 
+  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
+  character(len=*), intent(in) :: dset_name          ! name of the dataset
+  integer(hsize_t), intent(inout):: nfields          ! nfields
+  integer(hsize_t), intent(inout):: nrecords         ! nrecords
   integer :: namelen                                 ! name length
   end function h5tbget_table_info_c
  end interface
@@ -1791,17 +1791,17 @@ end subroutine h5tbget_table_info_f
 !
 !-------------------------------------------------------------------------
 
-subroutine h5tbget_field_info_f(loc_id,& 
+subroutine h5tbget_field_info_f(loc_id,&
                                 dset_name,&
                                 nfields,&
                                 field_names,&
 								field_sizes,&
 								field_offsets,&
 								type_size,&
-                                errcode ) 
+                                errcode )
 
  implicit none
- 
+
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
@@ -1809,13 +1809,13 @@ subroutine h5tbget_field_info_f(loc_id,&
 !DEC$endif
 !
 
- integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier 
- character(len=*), intent(in) :: dset_name                             ! name of the dataset 
- integer(hsize_t), intent(in):: nfields                                ! nfields 
+ integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier
+ character(len=*), intent(in) :: dset_name                             ! name of the dataset
+ integer(hsize_t), intent(in):: nfields                                ! nfields
  character(len=*), dimension(nfields), intent(inout) :: field_names    ! field names
  integer(size_t),  dimension(nfields), intent(inout) :: field_sizes    ! field sizes
  integer(size_t),  dimension(nfields), intent(inout) :: field_offsets  ! field offsets
- integer(size_t),  intent(inout):: type_size                           ! type size 
+ integer(size_t),  intent(inout):: type_size                           ! type size
  integer :: errcode                                                    ! error code
  integer :: namelen                                                    ! name length
  integer, dimension(nfields) :: namelen2                               ! name lengths
@@ -1830,13 +1830,13 @@ subroutine h5tbget_field_info_f(loc_id,&
   !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TBGET_FIELD_INFO_C'::h5tbget_field_info_c
   !DEC$ ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
-  integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier 
-  character(len=*), intent(in) :: dset_name                             ! name of the dataset 
-  integer(hsize_t), intent(in):: nfields                                ! nfields 
+  integer(hid_t),   intent(in) :: loc_id                                ! file or group identifier
+  character(len=*), intent(in) :: dset_name                             ! name of the dataset
+  integer(hsize_t), intent(in):: nfields                                ! nfields
   character(len=*), dimension(nfields), intent(inout) :: field_names    ! field names
   integer(size_t),  dimension(nfields), intent(inout) :: field_sizes    ! field sizes
   integer(size_t),  dimension(nfields), intent(inout) :: field_offsets  ! field offsets
-  integer(size_t),  intent(inout):: type_size                           ! type size 
+  integer(size_t),  intent(inout):: type_size                           ! type size
   integer :: namelen                                                    ! name length
   integer, dimension(nfields) :: namelen2                               ! name lengths
   end function h5tbget_field_info_c
@@ -1856,9 +1856,9 @@ end subroutine h5tbget_field_info_f
 !  end
 !
 end module H5TB
-            
 
-                                     
+
+
 
 
 
diff --git a/hl/fortran/test/tstimage.f90 b/hl/fortran/test/tstimage.f90
index 9eee787..3794bbf 100755
--- a/hl/fortran/test/tstimage.f90
+++ b/hl/fortran/test/tstimage.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,21 +11,21 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! This file contains the FORTRAN90 tests for H5LT 
+! This file contains the FORTRAN90 tests for H5LT
 !
 
 program image_test
 
 call make_image1()
 
-end program image_test 
+end program image_test
 
 
 !-------------------------------------------------------------------------
-! make_image1 
+! make_image1
 !-------------------------------------------------------------------------
 
 subroutine make_image1()
@@ -39,7 +39,7 @@ character(len=8), parameter :: filename = "f1img.h5" ! file name
 character(len=4), parameter :: dsetname1 = "img1"    ! dataset name
 character(len=4), parameter :: dsetname2 = "img2"    ! dataset name
 character(len=15), parameter :: il ="INTERLACE_PIXEL"! dataset name
-integer(hid_t) :: file_id                            ! file identifier 
+integer(hid_t) :: file_id                            ! file identifier
 integer(hsize_t), parameter :: width  = 500          ! width of image
 integer(hsize_t), parameter :: height = 200          ! height of image
 integer, parameter :: pal_entries = 9                ! palette number of entries
@@ -47,39 +47,39 @@ integer, dimension(width*height) :: buf1             ! data buffer
 integer, dimension(width*height) :: bufr1            ! data buffer
 integer, dimension(width*height*3) :: buf2           ! data buffer
 integer, dimension(width*height*3) :: bufr2          ! data buffer
-integer(hsize_t) :: widthr                           ! width of image  
+integer(hsize_t) :: widthr                           ! width of image
 integer(hsize_t) :: heightr                          ! height of image
 integer(hsize_t) :: planesr                          ! color planes
 integer(hsize_t) :: npalsr                           ! palettes
-character(len=15) :: interlacer                      ! interlace 
+character(len=15) :: interlacer                      ! interlace
 integer :: errcode                                   ! error flag
 integer :: is_image                                  ! error flag
 integer :: i, j, n                                   ! general purpose integers
 !
 ! palette
-! create a 9 entry palette 
+! create a 9 entry palette
 !
 character(len=4), parameter :: pal_name = "pal1"     ! dataset name
 integer(hsize_t), dimension(2) :: pal_dims = (/pal_entries,3/) ! palette dimensions
 integer(hsize_t), dimension(2) :: pal_dims_out       ! palette dimensions
 integer, dimension(pal_entries*3) :: pal_data_out    ! data buffer
 integer(hsize_t) :: npals                            ! number of palettes
-integer          :: pal_number                       ! palette number 
-integer          :: is_palette                       ! is palette 
+integer          :: pal_number                       ! palette number
+integer          :: is_palette                       ! is palette
 integer          :: space
 integer, dimension(pal_entries*3) :: pal_data_in = (/&
- 0,0,168,&      ! dark blue 
- 0,0,252,&      ! blue 
- 0,168,252,&    ! ocean blue 
- 84,252,252,&   ! light blue 
- 168,252,168,&  ! light green 
- 0,252,168,&    ! green 
- 252,252,84,&   ! yellow 
- 252,168,0,&    ! orange 
- 252,0,0/)      ! red 
+ 0,0,168,&      ! dark blue
+ 0,0,252,&      ! blue
+ 0,168,252,&    ! ocean blue
+ 84,252,252,&   ! light blue
+ 168,252,168,&  ! light green
+ 0,252,168,&    ! green
+ 252,252,84,&   ! yellow
+ 252,168,0,&    ! orange
+ 252,0,0/)      ! red
 
 
-! create an 8bit image of 9 values divided evenly by the array 
+! create an 8bit image of 9 values divided evenly by the array
 !
 space = width*height / pal_entries;
 n = 0; j = 0;
@@ -110,7 +110,7 @@ end do
 
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -119,17 +119,17 @@ call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 
 
 !-------------------------------------------------------------------------
-! indexed image 
+! indexed image
 !-------------------------------------------------------------------------
 
 call test_begin(' Make/Read image 8bit           ')
 
 !
-! write image. 
+! write image.
 !
 call h5immake_image_8bit_f(file_id,dsetname1,width,height,buf1,errcode)
 !
-! read image. 
+! read image.
 !
 call h5imread_image_f(file_id,dsetname1,bufr1,errcode)
 !
@@ -144,7 +144,7 @@ do i = 1, width*height
 end do
 
 !
-! get image info. 
+! get image info.
 !
 call h5imget_image_info_f(file_id,dsetname1,widthr,heightr,planesr,interlacer,npalsr,errcode)
 
@@ -163,18 +163,18 @@ endif
 call passed()
 
 !-------------------------------------------------------------------------
-! true color image 
+! true color image
 !-------------------------------------------------------------------------
 
 call test_begin(' Make/Read image 24bit          ')
 
 !
-! write image. 
+! write image.
 !
 call h5immake_image_24bit_f(file_id,dsetname2,width,height,il,buf2,errcode)
 
 !
-! read image. 
+! read image.
 !
 call h5imread_image_f(file_id,dsetname2,bufr2,errcode)
 
@@ -190,7 +190,7 @@ do i = 1, width*height*3
 end do
 
 !
-! get image info. 
+! get image info.
 !
 call h5imget_image_info_f(file_id,dsetname2,widthr,heightr,planesr,interlacer,npalsr,errcode)
 
@@ -210,15 +210,15 @@ endif
 call passed()
 
 !-------------------------------------------------------------------------
-! palette 
+! palette
 !-------------------------------------------------------------------------
 
 call test_begin(' Make palette                   ')
 
 !
-! make palette. 
+! make palette.
 !
-call h5immake_palette_f(file_id,pal_name,pal_dims,pal_data_in,errcode)           
+call h5immake_palette_f(file_id,pal_name,pal_dims,pal_data_in,errcode)
 
 call passed()
 
@@ -226,13 +226,13 @@ call passed()
 call test_begin(' Link/Unlink palette            ')
 
 !
-! link palette. 
+! link palette.
 !
 call h5imlink_palette_f(file_id,dsetname1,pal_name,errcode)
 
 
 !
-! read palette. 
+! read palette.
 !
 pal_number = 0
 call h5imget_palette_f(file_id,dsetname1,pal_number,pal_data_out,errcode)
@@ -251,7 +251,7 @@ end do
 !
 ! get number of palettes
 !
-call h5imget_npalettes_f(file_id,dsetname1,npals,errcode) 
+call h5imget_npalettes_f(file_id,dsetname1,npals,errcode)
 
 if ( npals /= 1) then
  print *, 'h5imget_npalettes_f bad value'
@@ -262,7 +262,7 @@ endif
 ! get palette info
 !
 pal_number = 0
-call h5imget_palette_info_f(file_id,dsetname1,pal_number,pal_dims_out,errcode) 
+call h5imget_palette_info_f(file_id,dsetname1,pal_number,pal_dims_out,errcode)
 
 if ( (pal_dims_out(1) /= pal_dims(1)) .or. (pal_dims_out(2) /= pal_dims(2))) then
  print *, 'h5imget_palette_info_f bad value'
@@ -270,9 +270,9 @@ if ( (pal_dims_out(1) /= pal_dims(1)) .or. (pal_dims_out(2) /= pal_dims(2))) the
 endif
 
 !
-! is palette 
+! is palette
 !
-is_palette = h5imis_palette_f(file_id,pal_name) 
+is_palette = h5imis_palette_f(file_id,pal_name)
 
 if ( is_palette /= 1 ) then
  print *, 'h5imis_palette_f bad value'
@@ -280,14 +280,14 @@ if ( is_palette /= 1 ) then
 endif
 
 !
-! unlink palette. 
+! unlink palette.
 !
 call h5imunlink_palette_f(file_id,dsetname1,pal_name,errcode)
 
 !
 ! get number of palettes
 !
-call h5imget_npalettes_f(file_id,dsetname1,npals,errcode ) 
+call h5imget_npalettes_f(file_id,dsetname1,npals,errcode )
 
 if ( npals /= 0) then
  print *, 'h5imget_npalettes_f bad value'
@@ -304,7 +304,7 @@ call passed()
 
 
 !-------------------------------------------------------------------------
-! end 
+! end
 !-------------------------------------------------------------------------
 
 !
@@ -323,17 +323,17 @@ call h5close_f(errcode)
 end subroutine make_image1
 
 !-------------------------------------------------------------------------
-! test_begin 
+! test_begin
 !-------------------------------------------------------------------------
 
 subroutine test_begin(string)
 character(len=*), intent(in) :: string
 write(*, fmt = '(14a)', advance = 'no') string
-write(*, fmt = '(40x,a)', advance = 'no') ' ' 
+write(*, fmt = '(40x,a)', advance = 'no') ' '
 end subroutine test_begin
 
 !-------------------------------------------------------------------------
-! passed 
+! passed
 !-------------------------------------------------------------------------
 
 subroutine passed()
diff --git a/hl/fortran/test/tstlite.f90 b/hl/fortran/test/tstlite.f90
index c261ad8..37ce9b2 100644
--- a/hl/fortran/test/tstlite.f90
+++ b/hl/fortran/test/tstlite.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,10 +11,10 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! This file contains the FORTRAN90 tests for H5LT 
+! This file contains the FORTRAN90 tests for H5LT
 !
 
 program lite_test
@@ -25,16 +25,16 @@ call test_dataset3D()
 call test_datasets()
 call test_attributes()
 
-end program lite_test 
+end program lite_test
 
 
 !-------------------------------------------------------------------------
-! test_dataset1D 
+! test_dataset1D
 !-------------------------------------------------------------------------
 
 subroutine test_dataset1D()
 
-use H5LT ! module of H5LT 
+use H5LT ! module of H5LT
 use HDF5 ! module of HDF5 library
 
 implicit none
@@ -44,7 +44,7 @@ character(len=9), parameter :: filename = "dsetf1.h5"! File name
 character(LEN=5), parameter :: dsetname1 = "dset1"   ! Dataset name
 character(LEN=5), parameter :: dsetname2 = "dset2"   ! Dataset name
 character(LEN=5), parameter :: dsetname3 = "dset3"   ! Dataset name
-integer(HID_T) :: file_id                            ! File identifier 
+integer(HID_T) :: file_id                            ! File identifier
 integer(HSIZE_T), dimension(1) :: dims = (/DIM1/)    ! Dataset dimensions
 integer        :: rank = 1                           ! Dataset rank
 integer, dimension(DIM1) :: buf1                     ! Data buffer
@@ -72,7 +72,7 @@ end do
 !
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -80,16 +80,16 @@ call h5open_f(errcode)
 call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 
 !-------------------------------------------------------------------------
-! H5T_NATIVE_INTEGER 
+! H5T_NATIVE_INTEGER
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf1, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr1, dims, errcode)
 
@@ -105,16 +105,16 @@ do i = 1, DIM1
 end do
 
 !-------------------------------------------------------------------------
-! H5T_NATIVE_REAL 
+! H5T_NATIVE_REAL
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname2, rank, dims, H5T_NATIVE_REAL, buf2, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname2, H5T_NATIVE_REAL, bufr2, dims, errcode)
 
@@ -130,16 +130,16 @@ do i = 1, DIM1
 end do
 
 !-------------------------------------------------------------------------
-! H5T_NATIVE_DOUBLE 
+! H5T_NATIVE_DOUBLE
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname3, rank, dims, H5T_NATIVE_DOUBLE, buf3, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname3, H5T_NATIVE_DOUBLE, bufr3, dims, errcode)
 
@@ -169,14 +169,14 @@ call passed()
 ! end function.
 !
 end subroutine test_dataset1D
- 
+
 !-------------------------------------------------------------------------
-! test_dataset2D 
+! test_dataset2D
 !-------------------------------------------------------------------------
 
 subroutine test_dataset2D()
 
-use H5LT ! module of H5LT 
+use H5LT ! module of H5LT
 use HDF5 ! module of HDF5 library
 
 implicit none
@@ -189,7 +189,7 @@ character(LEN=5), parameter :: dsetname1 = "dset1"   ! Dataset name
 character(LEN=5), parameter :: dsetname2 = "dset2"   ! Dataset name
 character(LEN=5), parameter :: dsetname3 = "dset3"   ! Dataset name
 character(LEN=5), parameter :: dsetname4 = "dset4"   ! Dataset name
-integer(HID_T) :: file_id                            ! File identifier 
+integer(HID_T) :: file_id                            ! File identifier
 integer(HSIZE_T), dimension(2) :: dims = (/4,6/)     ! Dataset dimensions
 integer        :: rank = 2                           ! Dataset rank
 integer, dimension(DIM1*DIM2) :: buf                 ! Data buffer
@@ -222,12 +222,12 @@ do i = 1, dims(1)
   buf4(i,j) = (i-1)*dims(2) + j;
  end do
 end do
-     
+
 
 !
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -239,12 +239,12 @@ call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr, dims, errcode)
 
@@ -264,12 +264,12 @@ end do
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname2, rank, dims, H5T_NATIVE_INTEGER, buf2, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname2, H5T_NATIVE_INTEGER, buf2r, dims, errcode)
 
@@ -291,12 +291,12 @@ end do
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname3, rank, dims, H5T_NATIVE_REAL, buf3, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname3, H5T_NATIVE_REAL, buf3r, dims, errcode)
 
@@ -318,12 +318,12 @@ end do
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname4, rank, dims, H5T_NATIVE_DOUBLE, buf4, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname4, H5T_NATIVE_DOUBLE, buf4r, dims, errcode)
 
@@ -354,7 +354,7 @@ call passed()
 !
 ! end function.
 !
-end subroutine test_dataset2D 
+end subroutine test_dataset2D
 
 
 !-------------------------------------------------------------------------
@@ -364,7 +364,7 @@ end subroutine test_dataset2D
 
 subroutine test_dataset3D()
 
-use H5LT ! module of H5LT 
+use H5LT ! module of H5LT
 use HDF5 ! module of HDF5 library
 
 implicit none
@@ -377,7 +377,7 @@ character(LEN=5), parameter :: dsetname1 = "dset1"          ! Dataset name
 character(LEN=5), parameter :: dsetname2 = "dset2"          ! Dataset name
 character(LEN=5), parameter :: dsetname3 = "dset3"          ! Dataset name
 character(LEN=5), parameter :: dsetname4 = "dset4"          ! Dataset name
-integer(HID_T) :: file_id                                   ! File identifier 
+integer(HID_T) :: file_id                                   ! File identifier
 integer(HSIZE_T), dimension(3) :: dims = (/DIM1,DIM2,DIM3/) ! Dataset dimensions
 integer, dimension(DIM1*DIM2*DIM3) :: buf                   ! Data buffer
 integer, dimension(DIM1*DIM2*DIM3) :: bufr                  ! Data buffer
@@ -418,7 +418,7 @@ end do
 !
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -430,12 +430,12 @@ call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname1, rank, dims, H5T_NATIVE_INTEGER, buf, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname1, H5T_NATIVE_INTEGER, bufr, dims, errcode)
 
@@ -455,12 +455,12 @@ end do
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname2, rank, dims, H5T_NATIVE_INTEGER, buf2, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname2, H5T_NATIVE_INTEGER, buf2r, dims, errcode)
 
@@ -484,12 +484,12 @@ end do
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname3, rank, dims, H5T_NATIVE_REAL, buf3, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname3, H5T_NATIVE_REAL, buf3r, dims, errcode)
 
@@ -513,12 +513,12 @@ end do
 !-------------------------------------------------------------------------
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_f(file_id, dsetname4, rank, dims, H5T_NATIVE_DOUBLE, buf4, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_f(file_id, dsetname4, H5T_NATIVE_DOUBLE, buf4r, dims, errcode)
 
@@ -561,13 +561,13 @@ end subroutine test_dataset3D
 
 subroutine test_datasets()
 
-use H5LT ! module of H5LT 
+use H5LT ! module of H5LT
 use HDF5 ! module of HDF5 library
 
 implicit none
 
 character(len=9), parameter :: filename = "dsetf4.h5"! File name
-integer(HID_T) :: file_id                            ! File identifier 
+integer(HID_T) :: file_id                            ! File identifier
 integer        :: errcode                            ! Error flag
 integer, parameter :: DIM1 = 10;                     ! Dimension of array
 character(LEN=5), parameter :: dsetname1 = "dset1"   ! Dataset name
@@ -594,7 +594,7 @@ integer(SIZE_T)  :: type_size
 !
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -613,18 +613,18 @@ do i = 1, DIM1
 end do
 
 !-------------------------------------------------------------------------
-! int 
+! int
 !-------------------------------------------------------------------------
 
 call test_begin(' Make/Read datasets (integer)   ')
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_int_f(file_id, dsetname2, rank, dims, buf2, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_int_f(file_id, dsetname2, bufr2, dims, errcode)
 
@@ -642,19 +642,19 @@ end do
 call passed()
 
 !-------------------------------------------------------------------------
-! real 
+! real
 !-------------------------------------------------------------------------
 
 call test_begin(' Make/Read datasets (float)     ')
 
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_float_f(file_id, dsetname3, rank, dims, buf3, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_float_f(file_id, dsetname3, bufr3, dims, errcode)
 
@@ -672,19 +672,19 @@ end do
 call passed()
 
 !-------------------------------------------------------------------------
-! double 
+! double
 !-------------------------------------------------------------------------
 
 call test_begin(' Make/Read datasets (double)    ')
 
 
 !
-! write dataset. 
+! write dataset.
 !
 call h5ltmake_dataset_double_f(file_id, dsetname4, rank, dims, buf4, errcode)
 
 !
-! read dataset. 
+! read dataset.
 !
 call h5ltread_dataset_double_f(file_id, dsetname4, bufr4, dims, errcode)
 
@@ -704,7 +704,7 @@ call passed()
 call test_begin(' Get dataset dimensions         ')
 
 !-------------------------------------------------------------------------
-! h5ltget_dataset_ndims_f 
+! h5ltget_dataset_ndims_f
 !-------------------------------------------------------------------------
 
 call h5ltget_dataset_ndims_f(file_id, dsetname4, rankr, errcode)
@@ -742,22 +742,22 @@ call passed()
 ! end function.
 !
 end subroutine test_datasets
- 
- 
+
+
 
 !-------------------------------------------------------------------------
-! test_attributes 
+! test_attributes
 !-------------------------------------------------------------------------
 
 subroutine test_attributes()
 
-use H5LT ! module of H5LT 
+use H5LT ! module of H5LT
 use HDF5 ! module of HDF5 library
 
 implicit none
 
 character(len=9), parameter :: filename = "dsetf4.h5"! File name
-integer(HID_T) :: file_id                            ! File identifier 
+integer(HID_T) :: file_id                            ! File identifier
 integer, parameter :: DIM1 = 10;                     ! Dimension of array
 character(LEN=5), parameter :: attrname1 = "attr1"   ! Attribute name
 character(LEN=5), parameter :: attrname2 = "attr2"   ! Attribute name
@@ -786,13 +786,13 @@ integer, dimension(DIM1)    :: buf                   ! Data buffer
 !
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 !
 ! Create a new file using default properties.
 !
 call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 !
-! make a dataset. 
+! make a dataset.
 !
 call h5ltmake_dataset_int_f(file_id, dsetname1, rank, dims, buf, errcode)
 
@@ -817,12 +817,12 @@ call test_begin(' Set/Get attributes int         ')
 
 
 !
-! write attribute. 
+! write attribute.
 !
 call h5ltset_attribute_int_f(file_id,dsetname1,attrname2,buf2,size,errcode)
 
 !
-! read attribute. 
+! read attribute.
 !
 call h5ltget_attribute_int_f(file_id,dsetname1,attrname2,bufr2,errcode)
 
@@ -847,12 +847,12 @@ call test_begin(' Set/Get attributes float       ')
 
 
 !
-! write attribute. 
+! write attribute.
 !
 call h5ltset_attribute_float_f(file_id,dsetname1,attrname3,buf3,size,errcode)
 
 !
-! read attribute. 
+! read attribute.
 !
 call h5ltget_attribute_float_f(file_id,dsetname1,attrname3,bufr3,errcode)
 
@@ -878,12 +878,12 @@ call test_begin(' Set/Get attributes double      ')
 
 
 !
-! write attribute. 
+! write attribute.
 !
 call h5ltset_attribute_double_f(file_id,dsetname1,attrname4,buf4,size,errcode)
 
 !
-! read attribute. 
+! read attribute.
 !
 call h5ltget_attribute_double_f(file_id,dsetname1,attrname4,bufr4,errcode)
 
@@ -908,7 +908,7 @@ call passed()
 call test_begin(' Get attribute rank             ')
 
 
-call h5ltget_attribute_ndims_f(file_id,dsetname1,attrname2,rankr,errcode) 
+call h5ltget_attribute_ndims_f(file_id,dsetname1,attrname2,rankr,errcode)
 
 if ( rankr .ne. 1 ) then
  print *, 'h5ltget_attribute_ndims_f return error'
@@ -937,17 +937,17 @@ end subroutine test_attributes
 
 
 !-------------------------------------------------------------------------
-! test_begin 
+! test_begin
 !-------------------------------------------------------------------------
 
 subroutine test_begin(string)
 character(LEN=*), intent(IN) :: string
 write(*, fmt = '(14a)', advance = 'no') string
-write(*, fmt = '(40x,a)', advance = 'no') ' ' 
+write(*, fmt = '(40x,a)', advance = 'no') ' '
 end subroutine test_begin
 
 !-------------------------------------------------------------------------
-! passed 
+! passed
 !-------------------------------------------------------------------------
 
 subroutine passed()
diff --git a/hl/fortran/test/tsttable.f90 b/hl/fortran/test/tsttable.f90
index c9c6b33..a6ce27f 100755
--- a/hl/fortran/test/tsttable.f90
+++ b/hl/fortran/test/tsttable.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -11,10 +11,10 @@
 !   is linked from the top-level documents page.  It can also be found at     *
 !   http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
 !   access to either file, you may request a copy from help@hdfgroup.org.     *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! This file contains the FORTRAN90 tests for H5LT 
+! This file contains the FORTRAN90 tests for H5LT
 !
 
 program table_test
@@ -22,23 +22,23 @@ program table_test
 call test_table1()
 
 
-end program table_test 
+end program table_test
 
 
 !-------------------------------------------------------------------------
-! test_table1 
+! test_table1
 !-------------------------------------------------------------------------
 
 subroutine test_table1()
 
-use H5TB ! module of H5TB 
+use H5TB ! module of H5TB
 use HDF5 ! module of HDF5 library
 
 implicit none
 
 character(len=8), parameter :: filename = "f1tab.h5"   ! File name
 character(LEN=5), parameter :: dsetname1 = "dset1"     ! Dataset name
-integer(HID_T) :: file_id                              ! File identifier 
+integer(HID_T) :: file_id                              ! File identifier
 integer(HSIZE_T), parameter :: nfields  = 4;           ! nfields
 integer(HSIZE_T), parameter :: nrecords = 5;           ! nrecords
 character(LEN=6), dimension(nfields) :: field_names    ! field names
@@ -49,7 +49,7 @@ integer, parameter :: compress = 0                     ! compress
 integer            :: errcode                          ! Error flag
 integer            :: i                                ! general purpose integer
 integer(SIZE_T)    :: type_size                        ! Size of the datatype
-integer(SIZE_T)    :: type_sizec                       ! Size of the character datatype 
+integer(SIZE_T)    :: type_sizec                       ! Size of the character datatype
 integer(SIZE_T)    :: type_sizei                       ! Size of the integer datatype
 integer(SIZE_T)    :: type_sized                       ! Size of the double precision datatype
 integer(SIZE_T)    :: type_sizer                       ! Size of the real datatype
@@ -84,7 +84,7 @@ end do
 !
 ! Initialize FORTRAN predefined datatypes.
 !
-call h5open_f(errcode) 
+call h5open_f(errcode)
 
 !
 ! Create a new file using default properties.
@@ -142,9 +142,9 @@ call test_begin(' Make table                     ')
 
 
 call h5tbmake_table_f(dsetname1,&
-                      file_id,& 
+                      file_id,&
                       dsetname1,&
-                      nfields,& 
+                      nfields,&
                       nrecords,&
                       type_size,&
                       field_names,&
@@ -163,7 +163,7 @@ call passed()
 call test_begin(' Read/Write field by name       ')
 
 call h5tbwrite_field_name_f(file_id,dsetname1,field_names(1),start,nrecords,type_sizec,&
-                            bufs,errcode) 
+                            bufs,errcode)
 
 call h5tbwrite_field_name_f(file_id,dsetname1,field_names(2),start,nrecords,type_sizei,&
                             bufi,errcode)
@@ -236,7 +236,7 @@ do i = 1, nrecords
   endif
 end do
 
-                     
+
 call passed()
 
 
@@ -247,7 +247,7 @@ call passed()
 call test_begin(' Read/Write field by index      ')
 
 call h5tbwrite_field_index_f(file_id,dsetname1,1,start,nrecords,type_sizec,&
-                            bufs,errcode) 
+                            bufs,errcode)
 
 call h5tbwrite_field_index_f(file_id,dsetname1,2,start,nrecords,type_sizei,&
                             bufi,errcode)
@@ -320,12 +320,12 @@ do i = 1, nrecords
   endif
 end do
 
-                     
+
 call passed()
 
 
 !-------------------------------------------------------------------------
-! Insert field 
+! Insert field
 ! we insert a field callsed "field5" with the same type and buffer as field 4 (Real)
 !-------------------------------------------------------------------------
 
@@ -362,12 +362,12 @@ call passed()
 
 
 !-------------------------------------------------------------------------
-! Gets the number of records and fields 
+! Gets the number of records and fields
 !-------------------------------------------------------------------------
 
 call test_begin(' Get table info                 ')
 
-call h5tbget_table_info_f(file_id,dsetname1,nfieldsr,nrecordsr,errcode ) 
+call h5tbget_table_info_f(file_id,dsetname1,nfieldsr,nrecordsr,errcode )
 
 if ( nfieldsr .ne. nfields .and. nrecordsr .ne. nrecords ) then
  print *, 'h5tbget_table_info_f return error'
@@ -384,7 +384,7 @@ call passed()
 !call test_begin(' Get fields info                ')
 
 !call h5tbget_field_info_f(file_id,dsetname1,nfields,field_namesr,field_sizesr,&
-!						  field_offsetr,type_sizeout,errcode ) 
+!						  field_offsetr,type_sizeout,errcode )
 
 
 !call passed()
@@ -416,17 +416,17 @@ end subroutine test_table1
 
 
 !-------------------------------------------------------------------------
-! test_begin 
+! test_begin
 !-------------------------------------------------------------------------
 
 subroutine test_begin(string)
 character(LEN=*), intent(IN) :: string
 write(*, fmt = '(14a)', advance = 'no') string
-write(*, fmt = '(40x,a)', advance = 'no') ' ' 
+write(*, fmt = '(40x,a)', advance = 'no') ' '
 end subroutine test_begin
 
 !-------------------------------------------------------------------------
-! passed 
+! passed
 !-------------------------------------------------------------------------
 
 subroutine passed()
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index d760675..2fec7e0 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -575,62 +575,62 @@ herr_t H5IMlink_palette( hid_t loc_id,
  {
   if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
    goto out;
-  
+
   if((attr_type = H5Aget_type(attr_id)) < 0)
    goto out;
-  
+
   if((attr_class = H5Tget_class(attr_type)) < 0)
    goto out;
-  
+
   /* Get and save the old reference(s) */
   if((attr_space_id = H5Aget_space(attr_id)) < 0)
    goto out;
-  
+
   n_refs = H5Sget_simple_extent_npoints(attr_space_id);
-  
+
   dim_ref = n_refs + 1;
-  
+
   refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref );
-  
+
   if ( H5Aread( attr_id, attr_type, refbuf ) < 0)
    goto out;
- 
+
   /* The attribute must be deleted, in order to the new one can reflect the changes*/
   if(H5Adelete(image_id, "PALETTE") < 0)
    goto out;
-  
+
   /* Create a new reference for this palette. */
   if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, -1 ) < 0)
    goto out;
-  
+
   refbuf[n_refs] = ref;
-  
+
   /* Create the data space for the new references */
   if(H5Sclose(attr_space_id) < 0)
    goto out;
-  
+
   if((attr_space_id = H5Screate_simple(1, &dim_ref, NULL)) < 0)
    goto out;
-  
+
   /* Create the attribute again with the changes of space */
   if(H5Aclose(attr_id) < 0)
    goto out;
 
   if((attr_id = H5Acreate2(image_id, "PALETTE", attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
    goto out;
-  
+
   /* Write the attribute with the new references */
   if(H5Awrite(attr_id, attr_type, refbuf) < 0)
    goto out;
-  
+
   /* close */
   if(H5Sclose(attr_space_id) < 0)
    goto out;
   if(H5Aclose(attr_id) < 0)
    goto out;
-  
+
   free( refbuf );
- 
+
  } /* ok_pal ==  1 */
 
   /* Close the image dataset. */
@@ -869,51 +869,51 @@ herr_t H5IMget_palette_info( hid_t loc_id,
  hid_t      pal_id;
  hid_t      pal_space_id;
  hsize_t    pal_maxdims[2];
- 
+
  /* Open the dataset. */
  if((image_id = H5Dopen2(loc_id, image_name, H5P_DEFAULT)) < 0)
   return -1;
- 
+
  /* Try to find the attribute "PALETTE" on the >>image<< dataset */
  has_pal = H5IM_find_palette(image_id);
- 
+
  if(has_pal ==  1)
  {
   if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
    goto out;
-  
+
   if((attr_type = H5Aget_type(attr_id)) < 0)
    goto out;
-  
+
   if((attr_class = H5Tget_class(attr_type)) < 0)
    goto out;
-  
+
   /* Get the reference(s) */
   if((attr_space_id = H5Aget_space(attr_id)) < 0)
    goto out;
-  
+
   n_refs = H5Sget_simple_extent_npoints(attr_space_id);
-  
+
   dim_ref = n_refs;
-  
+
   refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref );
-  
+
   if ( H5Aread( attr_id, attr_type, refbuf ) < 0)
    goto out;
-  
+
   /* Get the actual palette */
   if ( (pal_id = H5Rdereference( image_id, H5R_OBJECT, &refbuf[pal_number] )) < 0)
    goto out;
-  
+
   if ( (pal_space_id = H5Dget_space( pal_id )) < 0)
    goto out;
-  
+
   if ( H5Sget_simple_extent_ndims( pal_space_id ) < 0)
    goto out;
-  
+
   if ( H5Sget_simple_extent_dims( pal_space_id, pal_dims, pal_maxdims ) < 0)
    goto out;
-  
+
   /* close */
   if (H5Dclose(pal_id)<0)
    goto out;
@@ -926,23 +926,23 @@ herr_t H5IMget_palette_info( hid_t loc_id,
   if ( H5Aclose( attr_id ) < 0)
    goto out;
   free( refbuf );
-  
-   
+
+
  }
- 
+
  /* Close the image dataset. */
  if ( H5Dclose( image_id ) < 0)
   return -1;
- 
+
  return 0;
- 
+
 out:
  H5Dclose( image_id );
  H5Sclose( attr_space_id );
  H5Tclose( attr_type );
  H5Aclose( attr_id );
  return -1;
- 
+
 }
 
 
@@ -993,30 +993,30 @@ herr_t H5IMget_palette( hid_t loc_id,
  {
   if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0)
    goto out;
-  
+
   if((attr_type = H5Aget_type(attr_id)) < 0)
    goto out;
-  
+
   if((attr_class = H5Tget_class(attr_type)) < 0)
    goto out;
-  
+
   /* Get the reference(s) */
   if((attr_space_id = H5Aget_space(attr_id)) < 0)
    goto out;
-  
+
   n_refs = H5Sget_simple_extent_npoints(attr_space_id);
-  
+
   dim_ref = n_refs;
-  
+
   refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref );
-  
+
   if ( H5Aread( attr_id, attr_type, refbuf ) < 0)
    goto out;
-  
+
   /* Get the palette id */
   if ( (pal_id = H5Rdereference( image_id, H5R_OBJECT, &refbuf[pal_number] )) < 0)
    goto out;
-  
+
   /* Read the palette dataset */
   if ( H5Dread( pal_id, H5Dget_type(pal_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data ) < 0)
    goto out;
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index f46b9ea..9e9eec2 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -849,7 +849,7 @@ hbool_t        first_quote = 1;
 /* For Lex and Yacc */
 /*int  input_len;
 char *myinput;*/
-    
+
 #define TAG_STRING 1
 
 #line 834 "H5LTanalyze.c"
@@ -1288,17 +1288,17 @@ YY_RULE_SETUP
 case 40:
 YY_RULE_SETUP
 #line 121 "H5LTanalyze.l"
-{return token(H5T_STR_NULLTERM_TOKEN);} 
+{return token(H5T_STR_NULLTERM_TOKEN);}
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 122 "H5LTanalyze.l"
-{return token(H5T_STR_NULLPAD_TOKEN);} 
+{return token(H5T_STR_NULLPAD_TOKEN);}
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 123 "H5LTanalyze.l"
-{return token(H5T_STR_SPACEPAD_TOKEN);} 
+{return token(H5T_STR_SPACEPAD_TOKEN);}
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
@@ -1363,12 +1363,12 @@ YY_RULE_SETUP
 case 55:
 YY_RULE_SETUP
 #line 139 "H5LTanalyze.l"
-{    
-                        if( is_str_size || (is_enum && is_enum_memb) || 
+{
+                        if( is_str_size || (is_enum && is_enum_memb) ||
                             is_opq_size || (asindex>-1 && arr_stack[asindex].is_dim) ||
                             (csindex>-1 && cmpd_stack[csindex].is_field) ) {
                             H5LTyylval.ival = atoi(yytext);
-                            return NUMBER; 
+                            return NUMBER;
                         } else
                             REJECT;
                  }
@@ -1378,7 +1378,7 @@ YY_RULE_SETUP
 #line 149 "H5LTanalyze.l"
 {
                     /*if it's first quote, and is a compound field name or an enum symbol*/
-                    if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) 
+                    if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field))
                         && first_quote) {
                         first_quote = 0;
                         BEGIN TAG_STRING;
@@ -2323,8 +2323,8 @@ int main()
 int my_yyinput(char *buf, int max_size)
 {
    int ret;
-    
-   memcpy(buf, myinput, input_len); 
+
+   memcpy(buf, myinput, input_len);
    ret = input_len;
    return ret;
 }
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 35c4670..9f67175 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char const 
+static char const
 yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
 #endif
 #include <stdlib.h>
@@ -92,7 +92,7 @@ struct arr_info {
 };
 /*stack for nested array type*/
 struct arr_info arr_stack[STACK_SIZE];
-int asindex = -1;               /*pointer to the top of array stack*/ 
+int asindex = -1;               /*pointer to the top of array stack*/
 
 hbool_t     is_str_size = 0;        /*flag to lexer for string size*/
 hbool_t     is_str_pad = 0;         /*flag to lexer for string padding*/
@@ -100,7 +100,7 @@ H5T_pad_t   str_pad;                /*variable for string padding*/
 H5T_cset_t  str_cset;               /*variable for string character set*/
 hbool_t     is_variable = 0;        /*variable for variable-length string*/
 size_t      str_size;               /*variable for string size*/
-   
+
 hid_t       enum_id;                /*type ID*/
 hbool_t     is_enum = 0;            /*flag to lexer for enum type*/
 hbool_t     is_enum_memb = 0;       /*flag to lexer for enum member*/
@@ -823,9 +823,9 @@ case 46:
 break;
 case 47:
 #line 156 "H5LTparse.y"
-{ yyval.ival = cmpd_stack[csindex].id; 
+{ yyval.ival = cmpd_stack[csindex].id;
                               cmpd_stack[csindex].id = 0;
-                              cmpd_stack[csindex].first_memb = 1; 
+                              cmpd_stack[csindex].first_memb = 1;
                               csindex--;
                             }
 break;
@@ -835,7 +835,7 @@ case 50:
 break;
 case 51:
 #line 167 "H5LTparse.y"
-{   
+{
                             size_t origin_size, new_size;
                             hid_t dtype_id = cmpd_stack[csindex].id;
 
@@ -849,7 +849,7 @@ case 51:
                                 cmpd_stack[csindex].first_memb = 0;
                             } else {
                                 origin_size = H5Tget_size(dtype_id);
-                                
+
                                 if(yyvsp[-1].ival == 0) {
                                     new_size = origin_size + H5Tget_size(yyvsp[-6].ival);
                                     H5Tset_size(dtype_id, new_size);
@@ -860,10 +860,10 @@ case 51:
                                     H5Tinsert(dtype_id, yyvsp[-3].sval, yyvsp[-1].ival, yyvsp[-6].ival);
                                 }
                             }
-                          
+
                             cmpd_stack[csindex].is_field = 0;
                             H5Tclose(yyvsp[-6].ival);
-                             
+
                             new_size = H5Tget_size(dtype_id);
                         }
 break;
@@ -887,7 +887,7 @@ case 56:
 break;
 case 57:
 #line 213 "H5LTparse.y"
-{ 
+{
                           yyval.ival = H5Tarray_create2(yyvsp[-1].ival, arr_stack[asindex].ndims, arr_stack[asindex].dims);
                           arr_stack[asindex].ndims = 0;
                           asindex--;
@@ -901,9 +901,9 @@ break;
 case 61:
 #line 224 "H5LTparse.y"
 { unsigned ndims = arr_stack[asindex].ndims;
-                                  arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; 
+                                  arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival;
                                   arr_stack[asindex].ndims++;
-                                  arr_stack[asindex].is_dim = 0; 
+                                  arr_stack[asindex].is_dim = 0;
                                 }
 break;
 case 64:
@@ -916,10 +916,10 @@ case 65:
 break;
 case 66:
 #line 241 "H5LTparse.y"
-{   
+{
                                 size_t size = (size_t)yylval.ival;
                                 yyval.ival = H5Tcreate(H5T_OPAQUE, size);
-                                is_opq_size = 0;    
+                                is_opq_size = 0;
                             }
 break;
 case 67:
@@ -928,7 +928,7 @@ case 67:
 break;
 case 68:
 #line 247 "H5LTparse.y"
-{  
+{
                                 H5Tset_tag(yyvsp[-6].ival, yylval.sval);
                                 is_opq_tag = 0;
                             }
@@ -943,12 +943,12 @@ case 72:
 break;
 case 73:
 #line 260 "H5LTparse.y"
-{  
+{
                                 if(yyvsp[-1].ival == H5T_VARIABLE_TOKEN)
                                     is_variable = 1;
-                                else 
+                                else
                                     str_size = yylval.ival;
-                                is_str_size = 0; 
+                                is_str_size = 0;
                             }
 break;
 case 74:
@@ -964,7 +964,7 @@ case 74:
 break;
 case 75:
 #line 277 "H5LTparse.y"
-{  
+{
                                 if(yyvsp[-1].ival == H5T_CSET_ASCII_TOKEN)
                                     str_cset = H5T_CSET_ASCII;
                                 else if(yyvsp[-1].ival == H5T_CSET_UTF8_TOKEN)
@@ -982,7 +982,7 @@ case 76:
 break;
 case 77:
 #line 291 "H5LTparse.y"
-{   
+{
                                 hid_t str_id = yyvsp[-1].ival;
 
                                 /*set string size*/
@@ -991,12 +991,12 @@ case 77:
                                     is_variable = 0;
                                 } else
                                     H5Tset_size(str_id, str_size);
-                                
+
                                 /*set string padding and character set*/
                                 H5Tset_strpad(str_id, str_pad);
                                 H5Tset_cset(str_id, str_cset);
 
-                                yyval.ival = str_id; 
+                                yyval.ival = str_id;
                             }
 break;
 case 78:
@@ -1043,7 +1043,7 @@ case 91:
 #line 330 "H5LTparse.y"
 {
                                                 is_enum_memb = 1; /*indicate member of enum*/
-                                                enum_memb_symbol = strdup(yylval.sval); 
+                                                enum_memb_symbol = strdup(yylval.sval);
                                             }
 break;
 case 92:
@@ -1056,7 +1056,7 @@ case 92:
                                 long_long llong_val=(long_long)yylval.ival;
                                 hid_t super = H5Tget_super(enum_id);
                                 hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND);
-                                
+
                                 if(is_enum && is_enum_memb) { /*if it's an enum member*/
                                     /*To handle machines of different endianness*/
                                     if(H5Tequal(native, H5T_NATIVE_SCHAR) || H5Tequal(native, H5T_NATIVE_UCHAR))
@@ -1070,7 +1070,7 @@ case 92:
                                     else if(H5Tequal(native, H5T_NATIVE_LLONG) || H5Tequal(native, H5T_NATIVE_ULLONG))
                                         H5Tenum_insert(enum_id, enum_memb_symbol, &llong_val);
 
-                                    is_enum_memb = 0; 
+                                    is_enum_memb = 0;
                                     if(enum_memb_symbol) free(enum_memb_symbol);
                                 }
 
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index 2119cca..bb2cf1e 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -215,8 +215,8 @@ out:
  * Modifications:
  *
  * 		John Mainzer -- 4/23/08
- * 		Added error check on malloc of table, initialized fields 
- * 		in table to keep lower level code from choking on bogus 
+ * 		Added error check on malloc of table, initialized fields
+ * 		in table to keep lower level code from choking on bogus
  * 		data in error cases.
  *
  *-------------------------------------------------------------------------
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index e80f86c..bbe9be5 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -61,7 +61,7 @@ static hid_t H5TB_create_type(hid_t loc_id,
  *
  * Date: January 17, 2001
  *
- * Comments: 
+ * Comments:
  *
  * Modifications:
  *
@@ -113,7 +113,7 @@ herr_t H5TBmake_table( const char *table_title,
  }
 
  /* Create a simple data space with unlimited size */
- if((sid = H5Screate_simple( 1, dims, maxdims )) < 0) 
+ if((sid = H5Screate_simple( 1, dims, maxdims )) < 0)
   return -1;
 
  /* Modify dataset creation properties, i.e. enable chunking  */
@@ -2306,7 +2306,7 @@ herr_t H5TBinsert_field( hid_t loc_id,
   if(inserted )
    idx = i - 1;
 
-  if(i == position ) { 
+  if(i == position ) {
    /* Get the new member size */
    new_member_size = H5Tget_size( field_type );
 
@@ -2854,7 +2854,7 @@ herr_t H5TBdelete_field( hid_t loc_id,
  * We have to read field by field of the old dataset and save it into the new one
  *-------------------------------------------------------------------------
  */
- for ( i = 0; i < nfields; i++) { 
+ for ( i = 0; i < nfields; i++) {
   /* Get the member name */
   member_name = H5Tget_member_name(type_id1, (unsigned)i);
 
@@ -3437,20 +3437,20 @@ int H5TB_find_field( const char *field, const char *field_list )
 {
     const char *start = field_list;
     const char *end;
-    
-    while ( (end = strstr( start, "," )) != 0 ) 
+
+    while ( (end = strstr( start, "," )) != 0 )
     {
         size_t count = end - start;
         if(strncmp(start, field, count) == 0 && count == strlen(field) )
             return 1;
         start = end + 1;
     }
-    
+
     if(strcmp( start, field ) == 0 )
         return 1;
-    
+
     return -1;
-    
+
 }
 
 
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index 9645bad..2a365e2 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -68,15 +68,15 @@ unsigned char *image_data = NULL;
 int main(void)
 {
     int nerrors=0;
-    
+
     nerrors += test_simple()<0  ?1:0;
     nerrors += test_data()<0  ?1:0;
     nerrors += test_generate()<0  ?1:0;
-    
+
     if (nerrors) goto error;
     printf("All image tests passed.\n");
     return 0;
-    
+
 error:
     printf("***** %d IMAGE TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
     return 1;
@@ -96,21 +96,21 @@ static int test_simple(void)
     int           i, j, n, space;
     char          interlace[20];
     hssize_t      npals;
-    
+
     /* 8-bit image */
     unsigned char buf1 [ WIDTH*HEIGHT ];
     unsigned char pal[ PAL_ENTRIES * 3 ];        /* palette array */
     hsize_t       pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
-    
+
     /* 24-bit image */
     unsigned char buf2 [ WIDTH*HEIGHT*3 ];
-    
+
     /* read data */
     unsigned char buf1_out [ WIDTH*HEIGHT ];
     unsigned char buf2_out [ WIDTH*HEIGHT*3 ];
     unsigned char pal_out[ PAL_ENTRIES * 3 ];    /* palette array */
     hsize_t       pal_dims_out[2];               /* palette dimensions */
-    
+
     /* create an image */
     space = WIDTH*HEIGHT / PAL_ENTRIES;
     for (i=0, j=0, n=0; i < WIDTH*HEIGHT; i++, j++ )
@@ -121,10 +121,10 @@ static int test_simple(void)
             n++;
             j=0;
         }
-        
+
     }
-    
-    
+
+
     /* create an image */
     space = WIDTH*HEIGHT / 256;
     for (i=0, j=0, n=0; i < WIDTH*HEIGHT*3; i+=3, j++ )
@@ -141,9 +141,9 @@ static int test_simple(void)
             j=0;
         }
     }
-    
+
    /*-------------------------------------------------------------------------
-    * define a palette, blue to red tones 
+    * define a palette, blue to red tones
     *-------------------------------------------------------------------------
     */
     for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
@@ -152,140 +152,140 @@ static int test_simple(void)
         pal[i+1]=0;      /* green */
         pal[i+2]=255-n;  /* blue */
     }
-    
+
     /* Create a new HDF5 file using default properties. */
     fid = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
-    
+
    /*-------------------------------------------------------------------------
     * Indexed image test
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING("indexed image");
-    
+
     /* Write image */
     if ( H5IMmake_image_8bit( fid, IMAGE1_NAME, width, height, buf1 ) < 0 )
         goto out;
-    
+
     /* Make a palette */
     if ( H5IMmake_palette( fid, PAL_NAME, pal_dims, pal ) < 0 )
         goto out;
-    
+
     /* Attach a palette to the image dataset */
     if ( H5IMlink_palette( fid, IMAGE1_NAME, PAL_NAME ) < 0 )
         goto out;
-    
+
     /* Read image */
     if ( H5IMget_image_info( fid, IMAGE1_NAME, &width, &height, &planes, interlace, &npals ) < 0 )
         goto out;
-    
+
     if ( H5IMread_image( fid, IMAGE1_NAME, buf1_out ) < 0 )
         goto out;
-    
-    for (i = 0; i < height*width*planes; i++) 
+
+    for (i = 0; i < height*width*planes; i++)
     {
-        if ( buf1[i] != buf1_out[i] ) 
+        if ( buf1[i] != buf1_out[i] )
             goto out;
- 
+
     }
-    
-    
+
+
     PASSED();
-    
+
    /*-------------------------------------------------------------------------
     * True color image test
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING("true color image");
-    
+
     /* Write image */
     if ( H5IMmake_image_24bit( fid, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", buf2 ) )
         goto out;
-    
+
     /* Read image */
     if ( H5IMget_image_info( fid, IMAGE2_NAME, &width, &height, &planes, interlace, &npals ) < 0 )
         goto out;
-    
+
     if ( H5IMread_image( fid, IMAGE2_NAME, buf2_out ) < 0 )
         goto out;
-    
-    for (i = 0; i < height*width*planes; i++) 
+
+    for (i = 0; i < height*width*planes; i++)
     {
-        if ( buf2[i] != buf2_out[i] ) 
+        if ( buf2[i] != buf2_out[i] )
             goto out;
     }
-    
-    
+
+
     PASSED();
-    
+
    /*-------------------------------------------------------------------------
     * H5IMget_npalettes test
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING("pallete functions");
-    
+
     if ( H5IMget_npalettes( fid, IMAGE1_NAME, &npals ) < 0 )
         goto out;
-    
+
    /*-------------------------------------------------------------------------
     * H5IMget_palette_info test
     *-------------------------------------------------------------------------
     */
-    
+
     if ( H5IMget_palette_info( fid, IMAGE1_NAME, 0, pal_dims_out ) < 0 )
         goto out;
-    
-    for (i = 0; i < 2; i++) 
+
+    for (i = 0; i < 2; i++)
     {
-        if ( pal_dims[i] != pal_dims_out[i] ) 
+        if ( pal_dims[i] != pal_dims_out[i] )
             goto out;
     }
-    
+
    /*-------------------------------------------------------------------------
     * H5IMget_palette test
     *-------------------------------------------------------------------------
     */
-    
+
     if ( H5IMget_palette( fid, IMAGE1_NAME, 0, pal_out ) < 0 )
         goto out;
-    
-    for (i = 0; i < PAL_ENTRIES * 3; i++) 
+
+    for (i = 0; i < PAL_ENTRIES * 3; i++)
     {
-        if ( pal[i] != pal_out[i] ) 
+        if ( pal[i] != pal_out[i] )
             goto out;
     }
-    
+
    /*-------------------------------------------------------------------------
     * H5IMis_image test
     *-------------------------------------------------------------------------
     */
-    
+
     if ( H5IMis_image( fid, IMAGE1_NAME ) < 0 )
         goto out;
-    
+
     if ( H5IMis_image( fid, IMAGE2_NAME ) < 0 )
         goto out;
-    
+
    /*-------------------------------------------------------------------------
     * H5IMis_palette test
     *-------------------------------------------------------------------------
     */
-    
+
     if ( H5IMis_palette( fid, PAL_NAME ) < 0 )
         goto out;
-    
+
    /*-------------------------------------------------------------------------
     * end tests
     *-------------------------------------------------------------------------
     */
-    
+
     /* Close the file. */
-    if(H5Fclose( fid ) < 0) 
+    if(H5Fclose( fid ) < 0)
         goto out;
-    
-    
+
+
     PASSED();
 
     return 0;
@@ -314,60 +314,60 @@ static int test_data(void)
     unsigned char  pal[256*3]; /* buffer to hold an HDF5 palette */
     rgb_t          rgb[256];   /* buffer to hold a .pal file palette */
     int            i, n;
-    
+
     /* create a file using default properties */
     if ((fid=H5Fcreate(FILE2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
         goto out;
-    
+
     printf("Testing read ascii image data and generate images\n");
-    
+
    /*-------------------------------------------------------------------------
     * read 8bit image data
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("make indexed image");
-    
+
     /* read first data file */
     if (read_data(DATA_FILE1,&width,&height)<0)
         goto out;
-    
+
     /* make an image */
     if (H5IMmake_image_8bit(fid,IMAGE1_NAME,width,height,image_data)<0)
         goto out;
-    
+
     PASSED();
-    
-    
+
+
     TESTING2("attaching palettes");
-    
+
    /*-------------------------------------------------------------------------
     * palette #1. rainbow palette. data is contained in "pal_rgb.h"
     *-------------------------------------------------------------------------
     */
-    
+
     /* initialize the palette data */
     pal_dims[0] = 256;
     pal_dims[1] = 3;
-    
+
     /* make a palette */
     if (H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb)<0)
         goto out;
-    
+
     /* attach a palette to the image dataset */
     if (H5IMlink_palette(fid,IMAGE1_NAME,PAL1_NAME)<0)
         goto out;
-    
+
    /*-------------------------------------------------------------------------
     * palette #2. sepia palette.
     * read a PAL file and attach the palette to the HDF5 file
     *-------------------------------------------------------------------------
     */
-    
+
     /* read a PAL file */
     if (read_palette(PAL2_FILE, rgb, sizeof(rgb))<0)
         goto out;
-    
+
     /* transfer to the HDF5 buffer */
     for ( i=0, n=0; i<256*3; i+=3, n++)
     {
@@ -375,25 +375,25 @@ static int test_data(void)
         pal[i+1]=rgb[n].g;
         pal[i+2]=rgb[n].b;
     }
-    
+
     /* make a palette */
     if (H5IMmake_palette(fid,PAL2_NAME,pal_dims,pal)<0)
         goto out;
-    
+
     /* attach the palette to the image dataset */
     if (H5IMlink_palette(fid,IMAGE1_NAME,PAL2_NAME)<0)
         goto out;
-    
+
    /*-------------------------------------------------------------------------
     * palette #3. earth palette.
     * read a PAL file and attach the palette to the HDF5 file
     *-------------------------------------------------------------------------
     */
-    
+
     /* read a PAL file */
     if (read_palette(PAL3_FILE, rgb, sizeof(rgb))<0)
         goto out;
-    
+
     /* transfer to the HDF5 buffer */
     for ( i=0, n=0; i<256*3; i+=3, n++)
     {
@@ -401,18 +401,18 @@ static int test_data(void)
         pal[i+1]=rgb[n].g;
         pal[i+2]=rgb[n].b;
     }
-    
+
     /* make a palette */
     if (H5IMmake_palette(fid,PAL3_NAME,pal_dims,pal)<0)
         goto out;
-    
+
     /* attach the palette to the image dataset */
     if (H5IMlink_palette(fid,IMAGE1_NAME,PAL3_NAME)<0)
         goto out;
-    
+
     PASSED();
-    
-    
+
+
    /*-------------------------------------------------------------------------
     * palette #4. blue-red
     * make a palette whith blue to red colors
@@ -424,60 +424,60 @@ static int test_data(void)
         pal[i+1]=0;
         pal[i+2]=255-n;
     }
-    
+
     /* make a palette */
     if (H5IMmake_palette(fid,PAL4_NAME,pal_dims,pal)<0)
         goto out;
-    
+
     /* attach the palette to the image dataset */
     if (H5IMlink_palette(fid,IMAGE1_NAME,PAL4_NAME)<0)
         goto out;
-    
-    
+
+
    /*-------------------------------------------------------------------------
     * true color image example with pixel interlace
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("make true color image with pixel interlace");
-    
+
     /* read second data file */
     if ((read_data(DATA_FILE2,&width,&height))<0)
         goto out;
-    
+
     /* make image */
     if ((H5IMmake_image_24bit(fid,IMAGE2_NAME,width,height,"INTERLACE_PIXEL",image_data))<0)
         goto out;
-    
+
     PASSED();
-    
+
     /*-------------------------------------------------------------------------
     * True color image example with plane interlace
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("make true color image with plane interlace");
-    
+
     /* read third data file */
     if ((read_data(DATA_FILE3,&width,&height))<0)
         goto out;
-    
+
     /* make image */
     if ((H5IMmake_image_24bit(fid,IMAGE3_NAME,width,height,"INTERLACE_PLANE",image_data))<0)
         goto out;
-    
+
     PASSED();
-    
-    
+
+
    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
     if (H5Fclose(fid)<0)
         goto out;
-    
+
     return 0;
-    
+
     /* error zone, gracefully close */
 out:
     H5E_BEGIN_TRY {
@@ -512,13 +512,13 @@ static int test_generate(void)
     char     *srcdir = getenv("srcdir"); /* the source directory */
     char     data_file[512]="";          /* buffer to hold name of existing data file */
     int      i;
-    
+
     /* create a file using default properties */
     if ((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
         goto out;
-    
+
     printf("Testing read and process data and make indexed images\n");
-    
+
    /*-------------------------------------------------------------------------
     * compose the name of the file to open, using the srcdir, if appropriate
     *-------------------------------------------------------------------------
@@ -529,12 +529,12 @@ static int test_generate(void)
         strcat(data_file, "/");
     }
     strcat(data_file,DATA_FILE4);
-    
+
     /*-------------------------------------------------------------------------
     * read data; the file data format is described below
     *-------------------------------------------------------------------------
     */
-    
+
     f  = fopen( data_file, "r" ) ;
     if ( f == NULL )
     {
@@ -581,44 +581,44 @@ static int test_generate(void)
 
     fscanf( f, "%d %d %d", &imax, &jmax, &kmax );
     fscanf( f, "%f %f %f", &valex, &xmin, &xmax );
-    
+
     data = (float*) malloc ( imax * jmax * kmax * sizeof( float ));
     image_data = (unsigned char*) malloc ( imax * jmax * kmax * sizeof( unsigned char ));
-    
+
     for ( i = 0; i < imax * jmax * kmax; i++ )
     {
         fscanf( f, "%f ", &value );
         data[i] = value;
     }
     fclose( f );
-    
+
    /*-------------------------------------------------------------------------
     * transform the data from floating point to unsigned char
     * we are processing all the data here
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("make indexed image from all the data");
-    
+
     for ( i = 0; i < imax * jmax * kmax; i++ )
     {
         image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / (xmax - xmin ));
     }
-    
+
     /* Make the image */
     if ((H5IMmake_image_8bit(fid,"All data",(hsize_t)imax,(hsize_t)jmax,image_data))<0)
         goto out;
-    
+
     PASSED();
-    
+
    /*-------------------------------------------------------------------------
     * transform the data from floating point to unsigned char
     * here we just process the land data
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("make indexed image from land data");
-    
+
     for ( i = 0; i < imax * jmax * kmax; i++ )
     {
         if ( data[i] < 0 )
@@ -626,21 +626,21 @@ static int test_generate(void)
         else
             image_data[i] = (unsigned char)(( 255 * (data[i] ) ) / xmax );
     }
-    
+
     /* make the image */
     if ((H5IMmake_image_8bit(fid,"Land data",(hsize_t)imax,(hsize_t)jmax,image_data))<0)
         goto out;
-    
+
     PASSED();
-    
+
    /*-------------------------------------------------------------------------
     * transform the data from floating point to unsigned char
     * here we just process the sea data
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("make indexed image from sea data");
-    
+
     for ( i = 0; i < imax * jmax * kmax; i++ )
     {
         if ( data[i] > 0 )
@@ -648,24 +648,24 @@ static int test_generate(void)
         else
             image_data[i] = (unsigned char)(( 255 * (data[i] - xmin ) ) / xmin );
     }
-    
+
     /* make the image */
     if ((H5IMmake_image_8bit(fid,"Sea data",(hsize_t)imax,(hsize_t)jmax,image_data))<0)
         goto out;
-    
+
     PASSED();
-    
+
    /*-------------------------------------------------------------------------
     * make a palette and attach it to the datasets
     *-------------------------------------------------------------------------
     */
-    
+
     TESTING2("attaching palettes");
-    
+
     /* make a palette */
     if ((H5IMmake_palette(fid,PAL1_NAME,pal_dims,pal_rgb))<0)
         goto out;
-    
+
     /* attach the palette to the image datasets */
     if ((H5IMlink_palette(fid,"All data",PAL1_NAME))<0)
         goto out;
@@ -673,19 +673,19 @@ static int test_generate(void)
         goto out;
     if ((H5IMlink_palette(fid,"Sea data",PAL1_NAME))<0)
         goto out;
-    
+
     PASSED();
-    
-    
+
+
    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
     if (H5Fclose(fid)<0)
         goto out;
-    
+
     return 0;
-    
+
     /* error zone, gracefully close */
 out:
     H5E_BEGIN_TRY {
@@ -724,7 +724,7 @@ static int read_data( const char* fname, /*IN*/
     int    w, h;
     char   *srcdir = getenv("srcdir"); /* the source directory */
     char   data_file[512]="";          /* buffer to hold name of existing data file */
-    
+
    /*-------------------------------------------------------------------------
     * compose the name of the file to open, using "srcdir", if appropriate
     *-------------------------------------------------------------------------
@@ -736,46 +736,46 @@ static int read_data( const char* fname, /*IN*/
         strcat(data_file, "/");
     }
     strcat(data_file,fname);
-    
+
    /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     f = fopen(data_file, "r");
     if ( f == NULL )
     {
         printf( "Could not open file %s. Try set $srcdir \n", data_file );
         return -1;
     }
-    
+
     fscanf( f, "%s", str );
     fscanf( f, "%d", &color_planes );
     fscanf( f, "%s", str );
     fscanf( f, "%d", &h);
     fscanf( f, "%s", str );
     fscanf( f, "%d", &w);
-    
+
     *width = (hsize_t)w;
     *height = (hsize_t)h;
-    
+
     if ( image_data )
     {
         free( image_data );
         image_data=NULL;
     }
-    
+
     image_data = (unsigned char*) malloc (w * h * color_planes * sizeof( unsigned char ));
-    
+
     for (i = 0; i < h * w * color_planes ; i++)
     {
         fscanf( f, "%d",&n );
         image_data[i] = (unsigned char)n;
     }
     fclose(f);
-    
+
     return 1;
-    
+
 }
 
 
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 7b594ca..7a612a8 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -820,7 +820,7 @@ test_compress(void)
     err = H5PTclose(table);
     if( err < 0) TEST_ERROR;
 
-    /* Open the packet table as a regular dataset and make sure that the 
+    /* Open the packet table as a regular dataset and make sure that the
      * compression filter is set.
      */
     dset_id = H5Dopen2(fid1, "Compressed Test Dataset", H5P_DEFAULT);
@@ -850,7 +850,7 @@ test_compress(void)
     err = H5PTclose(table);
     if( err < 0) TEST_ERROR;
 
-    /* Open the packet table as a regular dataset and make sure that the 
+    /* Open the packet table as a regular dataset and make sure that the
      * compression filter is not set.
      */
     dset_id = H5Dopen2(fid1, "Uncompressed Dataset", H5P_DEFAULT);
@@ -887,7 +887,7 @@ error:
        H5Tclose(part_t);
        H5PTclose(table);
        H5Fclose(fid1);
-    } H5E_END_TRY    
+    } H5E_END_TRY
     H5_FAILED();
     return -1;
 }
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 16172c4..1b36b15 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -591,7 +591,7 @@ int test_table(hid_t fid, int write)
   wbufd[i].pressure = wbuf[i].pressure;
   wbufd[i].temperature = wbuf[i].temperature;
   strcpy(wbufd[i].name, wbuf[i].name );
-  
+
  }
 
 
@@ -935,8 +935,8 @@ int test_table(hid_t fid, int write)
   goto out;
 
   {
-   
-   
+
+
    /* compare the read values with the initial values */
    for( i = 0; i < NRECORDS; i++ )
    {
@@ -1098,7 +1098,7 @@ int test_table(hid_t fid, int write)
   }
  }
 
- 
+
 
  PASSED();
 
diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 24aaf31..c7e4ab6 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -53,7 +53,7 @@ main(int argv , char *argc[])
     {
         print_version("gif2h5");
         exit(EXIT_SUCCESS);
-        
+
     }
 
     if (argv < 3) {
@@ -120,7 +120,7 @@ main(int argv , char *argc[])
 
         if (gifImageDesc.Image != NULL)
             free(gifImageDesc.Image);
-        
+
         if (GifMemoryStruct.GifImageDesc[i] != NULL)
         {
             free(GifMemoryStruct.GifImageDesc[i]);
diff --git a/hl/tools/gif2h5/h52gifgentst.c b/hl/tools/gif2h5/h52gifgentst.c
index e0a50a1..eb83335 100644
--- a/hl/tools/gif2h5/h52gifgentst.c
+++ b/hl/tools/gif2h5/h52gifgentst.c
@@ -45,7 +45,7 @@
  *-------------------------------------------------------------------------
  */
 
-int main(void) 
+int main(void)
 {
     hid_t         fid;
     int           i, j, n, space;
@@ -55,7 +55,7 @@ int main(void)
     hsize_t       width  = WIDTH;
     hsize_t       height = HEIGHT;
 
-    
+
     /* create a file  */
     if ((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0)
         return 1;
@@ -70,7 +70,7 @@ int main(void)
             n++;
             j=0;
         }
-        
+
     }
 
     /* make the image */
@@ -78,7 +78,7 @@ int main(void)
         return 1;
 
    /*-------------------------------------------------------------------------
-    * define a palette, blue to red tones 
+    * define a palette, blue to red tones
     *-------------------------------------------------------------------------
     */
     for ( i=0, n=0; i<PAL_ENTRIES*3; i+=3, n++)
@@ -87,18 +87,18 @@ int main(void)
         pal[i+1]=0;      /* green */
         pal[i+2]=255-n;  /* blue */
     }
-    
+
     /* make a palette */
     if (H5IMmake_palette( fid, PAL_NAME, pal_dims, pal )<0)
         return 1;
-    
+
     /* attach the palette to the image */
     if (H5IMlink_palette( fid, IMAGE1_NAME, PAL_NAME )<0)
         return 1;
-    
+
     if(H5Fclose(fid)<0)
         return 1;
-    
+
     return 0;
 }
 
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index 7def4f0..9c252e1 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -38,7 +38,7 @@ usage(void)
     fprintf(stdout, "       h52gif -V \n");
     fprintf(stdout, "        Print HDF5 library version and exit\n");
     printf("h52gif expects *at least* one h5_image.\n");
-   
+
 }
 
 FILE *fpGif = NULL;
@@ -69,16 +69,16 @@ int main(int argc , char **argv)
     int bool_is_image = 0; /* 0 = false , 1 = true */
     char *image_name = NULL;
     int idx;
-    
+
     if ( argv[1] && (strcmp("-V",argv[1])==0) )
     {
         print_version("gif2h5");
         exit(EXIT_SUCCESS);
-        
+
     }
 
 
-    if (argc < 4) 
+    if (argc < 4)
     {
         /* they didn't supply at least one image -- bail */
         usage();
@@ -89,14 +89,14 @@ int main(int argc , char **argv)
     GIFName = argv[2];
 
     /* get the options */
-    while (arg_index++ < argc - 1) 
+    while (arg_index++ < argc - 1)
     {
         if (!strcmp(argv[arg_index] , "-i")) {
             bool_is_image = 1;
             continue;
         }
 
-        if (bool_is_image) 
+        if (bool_is_image)
         {
             /* allocate space to store the image name */
             size_t len = strlen(argv[arg_index]);
@@ -118,7 +118,7 @@ int main(int argc , char **argv)
     b = (BYTE *) &idx;
     EndianOrder = (b[0] ? 1:0);
 
-    if (!(fpGif = fopen(GIFName , "wb"))) 
+    if (!(fpGif = fopen(GIFName , "wb")))
     {
         printf("Error opening gif file for output. Aborting.\n");
         goto out;
@@ -132,19 +132,19 @@ int main(int argc , char **argv)
         hssize_t      npals;
         hsize_t       pal_dims[2];
         unsigned char *pal;
-       
-        if ((fid = H5Fopen(HDFName , H5F_ACC_RDONLY , H5P_DEFAULT)) < 0) 
+
+        if ((fid = H5Fopen(HDFName , H5F_ACC_RDONLY , H5P_DEFAULT)) < 0)
         {
             fprintf(stderr , "Unable to open HDF file for input. Aborting.\n");
             goto out;
         }
-        
+
         /* read image */
         if ( H5IMget_image_info( fid, image_name, &width, &height, &planes, interlace, &npals ) < 0 )
             goto out;
 
         Image = (BYTE*) malloc( (size_t) width * (size_t) height );
-        
+
         if ( H5IMread_image( fid, image_name, Image ) < 0 )
             goto out;
 
@@ -154,7 +154,7 @@ int main(int argc , char **argv)
                 goto out;
 
             pal = (BYTE*) malloc( (size_t) pal_dims[0] * (size_t) pal_dims[1] );
-            
+
             if ( H5IMget_palette( fid, image_name, 0, pal ) < 0 )
                 goto out;
 
@@ -169,9 +169,9 @@ int main(int argc , char **argv)
 
             free(pal);
         }
-        
+
         H5Fclose(fid);
-        
+
         RWidth  = (int)width;
         RHeight = (int)height;
 
@@ -185,17 +185,17 @@ int main(int argc , char **argv)
          *      palette
          *   2. Check for palettes in any of the other images.
          */
-        if (!npals) 
+        if (!npals)
         {
             numcols = 256;
-            for (i = 0 ; i < numcols ; i++) 
+            for (i = 0 ; i < numcols ; i++)
             {
                 Red[i] = 255 - i;
                 Green[i] = 255 - i;
                 Blue[i] = 255 - i;
             }
-        } 
-        else 
+        }
+        else
         {
             for (i = 0 ; i < numcols ; i++)
             {
@@ -205,7 +205,7 @@ int main(int argc , char **argv)
             }
         }
 
-        for (i = 0; i < numcols; i++) 
+        for (i = 0; i < numcols; i++)
         {
             pc2nc[i] = r1[i] = g1[i] = b1[i] = 0;
         }
@@ -213,16 +213,16 @@ int main(int argc , char **argv)
         /* compute number of unique colors */
         nc = 0;
 
-        for (i = 0; i < numcols; i++) 
+        for (i = 0; i < numcols; i++)
         {
             /* see if color #i is already used */
-            for (j = 0; j < i; j++) 
+            for (j = 0; j < i; j++)
             {
                 if (Red[i] == Red[j] && Green[i] == Green[j] && Blue[i] == Blue[j])
                     break;
             }
-            
-            if (j==i) 
+
+            if (j==i)
             {
                 /* wasn't found */
                 pc2nc[i] = nc;
@@ -230,15 +230,15 @@ int main(int argc , char **argv)
                 g1[nc] = Green[i];
                 b1[nc] = Blue[i];
                 nc++;
-            } 
-            else 
+            }
+            else
             {
                 pc2nc[i] = pc2nc[j];
             }
         }
 
         /* figure out 'BitsPerPixel' */
-        for (i = 1; i < 8; i++) 
+        for (i = 1; i < 8; i++)
         {
             if ((1<<i) >= nc)
                 break;
@@ -252,23 +252,23 @@ int main(int argc , char **argv)
         else
             InitCodeSize = BitsPerPixel;
 
-        if (!fpGif) 
+        if (!fpGif)
         {
             fprintf(stderr,  "WriteGIF: file not open for writing\n" );
             goto out;
         }
 
-      
+
         fwrite("GIF87a", sizeof( char ), 6, fpGif);  /* the GIF magic number */
-        
+
         putword(RWidth, fpGif);             /* screen descriptor */
         putword(RHeight, fpGif);
-        
+
         i = 0x00;                   /* No, there is no color map */
         i |= (8-1)<<4;              /* OR in the color resolution (hardwired 8) */
         i |= (BitsPerPixel - 1);    /* OR in the # of bits per pixel */
         fputc(i,fpGif);
-        
+
         fputc(Background,fpGif);    /* background color */
         fputc(0, fpGif);            /* future expansion byte */
 
@@ -286,7 +286,7 @@ int main(int argc , char **argv)
         /* since we always have a local color palette ... */
         fputc((0x80 | (BitsPerPixel - 1)) , fpGif);
 
-        for (i = 0; i < ColorMapSize; i++) 
+        for (i = 0; i < ColorMapSize; i++)
         {
             /* write out Global colormap */
             fputc(r1[i], fpGif);
@@ -301,7 +301,7 @@ int main(int argc , char **argv)
         free(Image);
     }
 
-    if (fputc(';',fpGif) == EOF) 
+    if (fputc(';',fpGif) == EOF)
     {
         /* Write GIF file terminator */
         fprintf(stderr , "Error!");
diff --git a/hl/tools/gif2h5/writehdf.c b/hl/tools/gif2h5/writehdf.c
index 7c2b063..a150b3c 100644
--- a/hl/tools/gif2h5/writehdf.c
+++ b/hl/tools/gif2h5/writehdf.c
@@ -83,7 +83,7 @@ WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName , char *GIFFileName)
         /* size of the palette is tablesize (rows) X 3 (columns) */
         dims[0] = gifHead.TableSize;
         dims[1] = 3;
-        
+
         /* make a palette */
         if (H5IMmake_palette(file_id,PAL_NAME,dims,(unsigned char *)gifHead.HDFPalette)<0)
          return -1;
@@ -102,11 +102,11 @@ WriteHDF(GIFTOMEM GifMemoryStruct, char *HDFName , char *GIFFileName)
 
         /* create the image name */
         sprintf(ImageName , "Image%d" , i);
-        
+
         /* write image */
         if (H5IMmake_image_8bit(file_id,ImageName,dims[1],dims[0],(gifImageDesc->Image))<0)
          return -1;
-      
+
         /* attach the palette to the image dataset */
         if (has_pal)
         {
diff --git a/hl/tools/h52jpeg/h52jpeg.c b/hl/tools/h52jpeg/h52jpeg.c
index c4dacd1..80269ce 100644
--- a/hl/tools/h52jpeg/h52jpeg.c
+++ b/hl/tools/h52jpeg/h52jpeg.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/* 
+/*
  * Include file for users of JPEG library.
  * system headers that define at least the typedefs FILE and size_t are needed before
  */
@@ -52,7 +52,7 @@ static struct long_options l_opts[] = {
 
 
 /* a structure that contains h52jpeg options */
-typedef struct 
+typedef struct
 {
  const char  *file_name;
  const char  *template_name;
@@ -69,7 +69,7 @@ static int h52jpeg(h52jpeg_opt_t opt);
 static void make_jpeg_name( const char* template_name, const char* image_name, char* jpeg_name);
 static int do_object(hid_t fid, h52jpeg_opt_t opt, const char* image_name);
 static int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_name);
-static void write_JPEG_file(char *filename, JSAMPLE *image_buffer, int image_height, int image_width, int planes);               
+static void write_JPEG_file(char *filename, JSAMPLE *image_buffer, int image_height, int image_width, int planes);
 static void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsigned char* pbuf, unsigned char* tbuf);
 
 /*-------------------------------------------------------------------------
@@ -77,7 +77,7 @@ static void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf,
  *
  * Purpose: h52jpeg main program
  *
- * main reads command line options and calls h52jpeg 
+ * main reads command line options and calls h52jpeg
  *
  * Programmer: Pedro Vicente, pvn@hdfgroup.org
  *
@@ -94,11 +94,11 @@ int main(int argc, const char *argv[])
 
     /* initialze options to 0 */
     memset(&opt,0,sizeof(h52jpeg_opt_t));
-   
+
     /* parse command line options */
-    while ((op = get_option(argc, argv, s_opts, l_opts)) != EOF) 
+    while ((op = get_option(argc, argv, s_opts, l_opts)) != EOF)
     {
-        switch ((char)op) 
+        switch ((char)op)
         {
 
         case 'h':
@@ -111,32 +111,32 @@ int main(int argc, const char *argv[])
 
         case 'v':
             opt.verbose = 1;
-            break;  
-            
+            break;
+
         case 'i':
             opt.image_name = opt_arg;
             break;
-       
+
         case 'c':
             opt.convert_true = 1;
-            
+
             break;
         case 'p':
             opt.idx_palette = atoi(opt_arg);
             break;
-            
+
         } /* switch */
-        
-        
+
+
     } /* while */
-    
+
     /* check for file names to be processed */
-    if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) 
+    if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL )
     {
         opt.file_name = argv[ opt_ind ];
-        opt.template_name = argv[ opt_ind + 1 ];    
+        opt.template_name = argv[ opt_ind + 1 ];
     }
-    
+
     else
     {
         usage(progname);
@@ -145,8 +145,8 @@ int main(int argc, const char *argv[])
 
     if ( h52jpeg(opt) < 0 )
         return 1;
-    
-    
+
+
     return 0;
 }
 
@@ -173,9 +173,9 @@ static void usage(const char *prog)
     printf("   -i, --image             Image name (full path in HDF5 file)\n");
     printf("   -c, --convert           Convert image from graycolor to truecolor\n");
     printf("   -p P, --palette=P       Use HDF5 palette index P in conversion -c\n");
-    
+
     printf("\n");
-    
+
     printf("  P - is an integer, the palette index in the HDF5 image. Default is 0\n");
     printf("  template - is a string used to name the jpeg file name; this name is made\n");
     printf("             by concatenating this template with the HDF5 image name\n");
@@ -198,8 +198,8 @@ static void usage(const char *prog)
     printf("\n");
     printf("   Exports the HDF5 image named <image> to a true color jpeg image, using\n");
     printf("    the palette of index 1 in that image to do the conversion\n");
-    
-    
+
+
 }
 
 /*-------------------------------------------------------------------------
@@ -218,10 +218,10 @@ static int h52jpeg(h52jpeg_opt_t opt)
     hid_t         fid;
     trav_table_t  *travt = NULL;
     size_t        i;
-   
+
 
     /* open the HDF5 file */
-    if (( fid = h5tools_fopen(opt.file_name, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) 
+    if (( fid = h5tools_fopen(opt.file_name, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0)
     {
         error_msg(progname, "cannot open file <%s>\n", opt.file_name );
         return -1;
@@ -231,81 +231,81 @@ static int h52jpeg(h52jpeg_opt_t opt)
     * object name was specified at command line
     *-------------------------------------------------------------------------
     */
-    
+
     if ( opt.image_name )
     {
         /* read object, save jpeg image */
         do_object(fid, opt, opt.image_name);
-        
+
     }
-    
+
     /*-------------------------------------------------------------------------
     * object name was not specified; traverse the file
     *-------------------------------------------------------------------------
     */
-    
+
     else
-        
+
     {
-        
+
         /* initialize traversal table */
         trav_table_init(&travt);
-        
+
         /* get the list of objects in the file */
         if ( h5trav_gettable(fid, travt) < 0 )
             goto out;
-        
+
         /* search for images/datasets in file */
-        for ( i = 0; i < travt->nobjs; i++) 
+        for ( i = 0; i < travt->nobjs; i++)
         {
-            
-            switch ( travt->objs[i].type ) 
+
+            switch ( travt->objs[i].type )
             {
             default:
                 printf( "unknown object. Exiting ...\n" );
                 goto out;
-                
+
             case H5TRAV_TYPE_GROUP:
             case H5TRAV_TYPE_NAMED_DATATYPE:
             case H5TRAV_TYPE_LINK:
             case H5TRAV_TYPE_UDLINK:
-                
+
                 break;
-                
+
             case H5TRAV_TYPE_DATASET:
 
                 /* read object, save jpeg image */
                 do_object(fid, opt, travt->objs[i].name);
 
-                break; /* H5TRAV_TYPE_DATASET */                               
-                
-        } /* switch */                
-        
-    } /* i */    
-    
-    
+                break; /* H5TRAV_TYPE_DATASET */
+
+        } /* switch */
+
+    } /* i */
+
+
     /* HDfree table */
     trav_table_free(travt);
-    
+
     } /* opt.image_name */
-    
-    
+
+
     /* close */
     if ( H5Fclose(fid) < 0 )
         return -1;
-    
+
     return 0;
-    
+
 out:
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
        H5Fclose(fid);
-        
+
     } H5E_END_TRY;
 
     trav_table_free(travt);
 
-    
+
     return -1;
 }
 
@@ -329,29 +329,29 @@ int do_object(hid_t fid, h52jpeg_opt_t opt, const char* object_name)
 {
     int  done=0; /* return value from do_image */
     char jpeg_name[1024];
-        
+
     /* build the jpeg file name */
     make_jpeg_name( opt.template_name, object_name, jpeg_name);
-        
+
     if ( opt.verbose)
     {
         printf("%s ...", object_name );
     }
-    
+
     /*-------------------------------------------------------------------------
     * HDF5 Image
     *-------------------------------------------------------------------------
     */
-    
+
     if ( H5IMis_image( fid, object_name ) )
     {
         /* read image, save jpeg image */
         done = do_image(fid, opt, object_name, jpeg_name);
     }
-           
-    
+
+
     if ( opt.verbose)
-    {                
+    {
         if ( done )
         {
             printf("saved to %s\n", jpeg_name );
@@ -360,12 +360,12 @@ int do_object(hid_t fid, h52jpeg_opt_t opt, const char* object_name)
         {
             printf("\n");
         }
-        
+
     }
-    
+
     return 0;
 
-    
+
 }
 
 
@@ -394,22 +394,22 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na
     const char*    name;
     int            done;
     unsigned char* ibuf=NULL;
-    
+
     name = image_name;
-    
-    done = 0;  
-    
+
+    done = 0;
+
     if ( H5IMget_image_info( fid, name, &width, &height, &planes, interlace, &npals ) < 0 )
         goto out;
-    
-    if (NULL == (ibuf = HDmalloc( (int)width * (int)height * (int)planes ))) 
+
+    if (NULL == (ibuf = HDmalloc( (int)width * (int)height * (int)planes )))
         goto out;
-    
+
     if ( H5IMread_image( fid, name, ibuf ) < 0 )
     {
         goto out;
     }
-    
+
     /*-------------------------------------------------------------------------
     * no conversion to true color requested or true color image, just save what we found
     * this will result either in
@@ -422,12 +422,12 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na
     if ( planes == 3 || !opt.convert_true )
     {
         /* write the jpeg file */
-        write_JPEG_file (jpeg_name, 
-            ibuf,	               
-            (int) height,	       
-            (int) width,           
-            (int) planes); 
-        
+        write_JPEG_file (jpeg_name,
+            ibuf,
+            (int) height,
+            (int) width,
+            (int) planes);
+
         done = 1;
     }
     /*-------------------------------------------------------------------------
@@ -444,12 +444,12 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na
         unsigned char *pbuf=NULL;/* palette array */
         unsigned char *tbuf=NULL;/* true color array */
         int           ipal;      /* palette to use */
-        
+
         if ( H5IMget_npalettes( fid, name, &npals ) < 0 )
         {
             goto out;
         }
-        
+
         /*-------------------------------------------------------------------------
         * there are palettes
         *-------------------------------------------------------------------------
@@ -463,68 +463,68 @@ int do_image(hid_t fid, h52jpeg_opt_t opt, const char* image_name, char* jpeg_na
             if ( opt.idx_palette >= npals )
             {
                 ipal = 0;
-                
+
                 if ( opt.verbose )
-                {                
-                    printf("palette index <%d> does not exist. Using default...", 
+                {
+                    printf("palette index <%d> does not exist. Using default...",
                         opt.idx_palette );
                 }
             }
-                
-            
+
+
             if ( H5IMget_palette_info( fid, name, ipal, pdims ) < 0 )
                 goto out;
-            
-            if (NULL == (pbuf = HDmalloc( (size_t)pdims[0] * (size_t)pdims[1] ))) 
+
+            if (NULL == (pbuf = HDmalloc( (size_t)pdims[0] * (size_t)pdims[1] )))
                 goto out;
-            
-            if (NULL == (tbuf = HDmalloc( (int)width * (int)height * 3 ))) 
+
+            if (NULL == (tbuf = HDmalloc( (int)width * (int)height * 3 )))
                 goto out;
-            
+
             if ( H5IMget_palette( fid, name, ipal, pbuf ) < 0 )
                 goto out;
-            
+
             /* convert indexed image to true color image */
             convert_to_true(width, height, ibuf, pbuf, tbuf);
-            
+
             /* write the jpeg file */
-            write_JPEG_file (jpeg_name, 
-                tbuf,	               
-                (int) height,	       
-                (int) width,           
-                3); 
-            
+            write_JPEG_file (jpeg_name,
+                tbuf,
+                (int) height,
+                (int) width,
+                3);
+
             done = 1;
-            
+
             HDfree( pbuf );
             HDfree( tbuf );
             pbuf = NULL;
-            tbuf = NULL;  
+            tbuf = NULL;
         }
         /*-------------------------------------------------------------------------
         * there are no palettes
         *-------------------------------------------------------------------------
         */
         else
-        {    
+        {
             done = 0;
             if ( opt.verbose )
-            {                
+            {
                 printf("image <%s> has no palette...", name );
             }
         } /* no palettes */
-        
+
     } /* conversion to truecolor  */
-    
+
     HDfree( ibuf );
     ibuf = NULL;
- 
+
     return done;
-    
+
 out:
-    
+
     return -1;
-    
+
 }
 
 /*-------------------------------------------------------------------------
@@ -533,7 +533,7 @@ out:
  * Parameters: template name (IN), image name (IN), jpeg name (IN/OUT)
  *
  * Purpose: build a name for the jpeg image file upon a template name
- *  and the HDF5 image name. Replace the special characters 
+ *  and the HDF5 image name. Replace the special characters
  *  '%', '@', '$', '/', ':', '&', ' ', and '*' with '_'
  *
  * Return: void
@@ -550,7 +550,7 @@ void make_jpeg_name( const char* template_name, const char* image_name, char* jp
     HDstrcat( jpeg_name, image_name );
     HDstrcat( jpeg_name, ".jpeg" );
     len = HDstrlen( jpeg_name);
-    
+
     /* HDF5 path names might contain '/', replace with '_' */
     for (j = 0; j < len; j++)
     {
@@ -563,11 +563,11 @@ void make_jpeg_name( const char* template_name, const char* image_name, char* jp
              (jpeg_name[j] == '&') ||
              (jpeg_name[j] == ' ') ||
              (jpeg_name[j] == '*') )
-        {  
-            jpeg_name[j] = '_'; 
+        {
+            jpeg_name[j] = '_';
         }
     }
-    
+
 }
 
 /*-------------------------------------------------------------------------
@@ -589,8 +589,8 @@ static
 void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsigned char* pbuf, unsigned char* tbuf)
 {
     hsize_t  i, j;
-   
-    for ( i = 0, j = 0; i < width * height; i++, j += 3) 
+
+    for ( i = 0, j = 0; i < width * height; i++, j += 3)
     {
         unsigned char idx;
         unsigned char r;
@@ -609,10 +609,10 @@ void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsign
         tbuf[j] = r;
         tbuf[j+1] = g;
         tbuf[j+2] = b;
-        
+
     }
-    
-    
+
+
 }
 
 
@@ -633,12 +633,12 @@ void convert_to_true( hsize_t width, hsize_t height, unsigned char* ibuf, unsign
  *-------------------------------------------------------------------------
  */
 
-static 
+static
 void write_JPEG_file(char *filename,        /* JPEG file name */
                      JSAMPLE *image_buffer, /* Points to large array of R,G,B-order data */
                      int image_height,      /* Number of rows in image */
                      int image_width,       /* Number of columns in image */
-                     int planes)            /* # of color components per pixel */           
+                     int planes)            /* # of color components per pixel */
 {
     /* This struct contains the JPEG compression parameters and pointers to
     * working space (which is allocated as needed by the JPEG library).
@@ -660,9 +660,9 @@ void write_JPEG_file(char *filename,        /* JPEG file name */
     FILE * outfile;		/* target file */
     JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */
     int row_stride;		/* physical row width in image buffer */
-    
+
     /* Step 1: allocate and initialize JPEG compression object */
-    
+
     /* We have to set up the error handler first, in case the initialization
     * step fails.  (Unlikely, but it could happen if you are out of memory.)
     * This routine fills in the contents of struct jerr, and returns jerr's
@@ -671,10 +671,10 @@ void write_JPEG_file(char *filename,        /* JPEG file name */
     cinfo.err = jpeg_std_error(&jerr);
     /* Now we can initialize the JPEG compression object. */
     jpeg_create_compress(&cinfo);
-    
+
     /* Step 2: specify data destination (eg, a file) */
     /* Note: steps 2 and 3 can be done in either order. */
-    
+
     /* Here we use the library-supplied code to send compressed data to a
     * stdio stream.  You can also write your own code to do something else.
     * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
@@ -685,22 +685,22 @@ void write_JPEG_file(char *filename,        /* JPEG file name */
         exit(1);
     }
     jpeg_stdio_dest(&cinfo, outfile);
-    
+
     /* Step 3: set parameters for compression */
-    
+
     /* First we supply a description of the input image.
     * Four fields of the cinfo struct must be filled in:
     */
     cinfo.image_width = image_width; 	/* image width and height, in pixels */
     cinfo.image_height = image_height;
     cinfo.input_components = planes;		/* # of color components per pixel */
-    
+
     /* colorspace of input image */
     if (planes == 3)
-        cinfo.in_color_space = JCS_RGB; 
+        cinfo.in_color_space = JCS_RGB;
     else if (planes == 1)
-        cinfo.in_color_space = JCS_GRAYSCALE; 
-    
+        cinfo.in_color_space = JCS_GRAYSCALE;
+
     /* Now use the library's routine to set default compression parameters.
     * (You must set at least cinfo.in_color_space before calling this,
     * since the defaults depend on the source color space.)
@@ -710,24 +710,24 @@ void write_JPEG_file(char *filename,        /* JPEG file name */
     * Here we just illustrate the use of quality (quantization table) scaling:
     */
     jpeg_set_quality(&cinfo, 100, TRUE /* limit to baseline-JPEG values */);
-    
+
     /* Step 4: Start compressor */
-    
+
     /* TRUE ensures that we will write a complete interchange-JPEG file.
     * Pass TRUE unless you are very sure of what you're doing.
     */
     jpeg_start_compress(&cinfo, TRUE);
-    
+
     /* Step 5: while (scan lines remain to be written) */
     /*           jpeg_write_scanlines(...); */
-    
+
     /* Here we use the library's state variable cinfo.next_scanline as the
     * loop counter, so that we don't have to keep track ourselves.
     * To keep things simple, we pass one scanline per call; you can pass
     * more if you wish, though.
     */
     row_stride = image_width * planes;	/* JSAMPLEs per row in image_buffer */
-    
+
     while (cinfo.next_scanline < cinfo.image_height) {
     /* jpeg_write_scanlines expects an array of pointers to scanlines.
     * Here the array is only one element long, but you could pass
@@ -736,18 +736,18 @@ void write_JPEG_file(char *filename,        /* JPEG file name */
         row_pointer[0] = & image_buffer[cinfo.next_scanline * row_stride];
         (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
     }
-    
+
     /* Step 6: Finish compression */
-    
+
     jpeg_finish_compress(&cinfo);
     /* After finish_compress, we can close the output file. */
     fclose(outfile);
-    
+
     /* Step 7: release JPEG compression object */
-    
+
     /* This is an important step since it will release a good deal of memory. */
     jpeg_destroy_compress(&cinfo);
-    
+
     /* And we're done! */
 }
 
diff --git a/hl/tools/h52jpeg/h52jpegtst.c b/hl/tools/h52jpeg/h52jpegtst.c
index 08ad7d4..e043277 100644
--- a/hl/tools/h52jpeg/h52jpegtst.c
+++ b/hl/tools/h52jpeg/h52jpegtst.c
@@ -45,20 +45,20 @@ unsigned char *gbuf = NULL;  /* global buffer for image data */
 int main( void )
 {
     hid_t fid; /* HDF5 file identifier */
-    
+
     /* create a new HDF5 file using default properties. */
-    if (( fid = H5Fcreate( "h52jpegtst.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT )) < 0 ) 
+    if (( fid = H5Fcreate( "h52jpegtst.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT )) < 0 )
         return 1;
-    
+
     /* make images */
     if ( make_images( fid ) < 0 )
         goto out;
-      
+
     /* close the file. */
     H5Fclose( fid );
-    
+
     return 0;
-    
+
 out:
     printf("Error on return function...Exiting\n");
     H5Fclose( fid );
@@ -68,7 +68,7 @@ out:
 /*-------------------------------------------------------------------------
  * Function: make_images
  *
- * Purpose: generate images 
+ * Purpose: generate images
  *
  *-------------------------------------------------------------------------
  */
@@ -81,24 +81,24 @@ static int make_images( hid_t fid )
     hsize_t        pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
     unsigned char  pal[ PAL_ENTRIES * 3 ];        /* palette array */
     int            i, n;
-    
+
     /*-------------------------------------------------------------------------
-    * indexed image with 1 palette 
+    * indexed image with 1 palette
     *-------------------------------------------------------------------------
     */
-    
+
     /* read first data file */
     if ( read_data( "image8.txt", &width, &height ) < 0 )
         goto out;
-    
+
     /* make the image */
     if ( H5IMmake_image_8bit( fid, IM_1PAL, width, height, gbuf ) < 0 )
         goto out;
-    
+
     /* make a palette */
     if ( H5IMmake_palette( fid, PAL1, pal_dims, pal_rgb ) < 0 )
         goto out;
-    
+
     /* attach the 1st palette to the image */
     if ( H5IMlink_palette( fid, IM_1PAL, PAL1 ) < 0 )
     {
@@ -119,7 +119,7 @@ static int make_images( hid_t fid )
     {
         goto out;
     }
-    
+
     /*-------------------------------------------------------------------------
     * define another palette, green tones
     *-------------------------------------------------------------------------
@@ -134,12 +134,12 @@ static int make_images( hid_t fid )
     /* save the palette */
     if ( H5IMmake_palette( fid, PAL2, pal_dims, pal ) < 0 )
         goto out;
-    
+
     /* attach the palette to the image */
     if ( H5IMlink_palette( fid, IM_2PAL, PAL2 ) < 0 )
     {
         goto out;
-    }  
+    }
 
     /*-------------------------------------------------------------------------
     * make another image, in a group and no palette
@@ -155,23 +155,23 @@ static int make_images( hid_t fid )
 
     H5Gclose(gid);
 
-    
+
     /*-------------------------------------------------------------------------
     * true color image with pixel interlace in RGB type
     *-------------------------------------------------------------------------
     */
-    
+
     /* read second data file */
     if ( read_data( "image24pixel.txt", &width, &height ) < 0 )
         goto out;
-    
+
     /* make dataset */
     if ( H5IMmake_image_24bit( fid, "img24", width, height, "INTERLACE_PIXEL", gbuf ) < 0 )
         goto out;
-    
+
     return 0;
-    
-out:    
+
+out:
     printf("Error on return function...Exiting\n");
     return -1;
 }
@@ -208,7 +208,7 @@ static int read_data( const char* fname, /*IN*/
     int    w, h;
     char   *srcdir = getenv("srcdir"); /* the source directory */
     char   data_file[512]="";          /* buffer to hold name of existing data file */
-    
+
     /*-------------------------------------------------------------------------
     * compose the name of the file to open, using "srcdir", if appropriate
     *-------------------------------------------------------------------------
@@ -220,46 +220,46 @@ static int read_data( const char* fname, /*IN*/
         strcat(data_file, "/");
     }
     strcat(data_file,fname);
-    
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     f = fopen(data_file, "r");
     if ( f == NULL )
     {
         printf( "Could not open file %s. Try set $srcdir \n", data_file );
         return -1;
     }
-    
+
     fscanf( f, "%s", str );
     fscanf( f, "%d", &color_planes );
     fscanf( f, "%s", str );
     fscanf( f, "%d", &h);
     fscanf( f, "%s", str );
     fscanf( f, "%d", &w);
-    
+
     *width = (hsize_t)w;
     *height = (hsize_t)h;
-    
+
     if ( gbuf )
     {
         free( gbuf );
         gbuf=NULL;
     }
-    
+
     gbuf = (unsigned char*) malloc (w * h * color_planes * sizeof( unsigned char ));
-    
+
     for (i = 0; i < h * w * color_planes ; i++)
     {
         fscanf( f, "%d",&n );
         gbuf[i] = (unsigned char)n;
     }
     fclose(f);
-    
+
     return 1;
-    
+
 }
 
 
diff --git a/hl/tools/h52jpeg/h52jpegtst.h b/hl/tools/h52jpeg/h52jpegtst.h
index 749e571..6931cb7 100644
--- a/hl/tools/h52jpeg/h52jpegtst.h
+++ b/hl/tools/h52jpeg/h52jpegtst.h
@@ -276,7 +276,7 @@ const unsigned char pal_rgb[PAL_ENTRIES*3] = {0,0,0,
 131,0,0,
 127,0,0
 };
- 
+
 
 
 #endif /* _PAL_RGB_H */
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 6f300c8..e409f04 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -612,7 +612,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
         else {
             bytes_begin[0] = 0;
 
-            if(!parms->h5_use_chunks || parms->io_type==PHDF5) 
+            if(!parms->h5_use_chunks || parms->io_type==PHDF5)
                 bytes_begin[1] = (off_t)(blk_size*pio_mpi_rank_g);
             else
                 bytes_begin[1] = (off_t)(blk_size*blk_size*pio_mpi_rank_g);
@@ -684,7 +684,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
             /* Commit partial buffer derived type */
             mrc = MPI_Type_commit(&mpi_partial_buffer_cont);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
-            
+
             /* Build contiguous file's derived type */
             mrc = MPI_Type_vector((int)blk_size, (int)1, (int)(snbytes/buf_size),
                 mpi_partial_buffer_cont, &mpi_cont_type);
@@ -721,7 +721,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
             mrc = MPI_Type_commit(&mpi_full_buffer);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
 
-            /* Build full chunk derived type */               
+            /* Build full chunk derived type */
             mrc = MPI_Type_contiguous((int)(blk_size*blk_size), MPI_BYTE,
                 &mpi_full_chunk);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -730,7 +730,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
             mrc = MPI_Type_commit(&mpi_full_chunk);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
 
-            /* Build chunk interleaved file's derived type */             
+            /* Build chunk interleaved file's derived type */
             mrc = MPI_Type_vector((int)(buf_size/blk_size), (int)1, (int)(snbytes/blk_size),
                 mpi_full_chunk, &mpi_chunk_inter_type);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -1025,7 +1025,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         file_offset_advance = (off_t)snbytes;
                     } /* end if */
                     /* Interleaved access pattern */
@@ -1038,7 +1038,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         file_offset_advance = (off_t)snbytes;
                     } /* end else */
                 } /* end if */
@@ -1052,7 +1052,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         file_offset_advance = 0;
                     } /* end if */
                     /*Interleaved access pattern */
@@ -1071,7 +1071,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         /* file_offset_advance = (off_t)(snbytes/blk_size*(blk_size*blk_size)); */
                         file_offset_advance = (off_t)(snbytes*blk_size);
                     } /* end else */
@@ -1213,7 +1213,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         mpi_offset_advance = snbytes;
 
                         /* MPI type to be used for collective access */
@@ -1228,7 +1228,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         mpi_offset_advance = snbytes;
 
                         /* MPI type to be used for collective access */
@@ -1245,7 +1245,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         mpi_offset_advance = 0;
 
                         /* MPI type to be used for collective access */
@@ -1267,7 +1267,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         /* mpi_offset_advance = (MPI_Offset)(snbytes/blk_size*(blk_size*blk_size)); */
                         mpi_offset_advance = (MPI_Offset)(snbytes*blk_size);
 
@@ -1438,7 +1438,7 @@ done:
             /* Free full chunk type */
             mrc = MPI_Type_free(&mpi_full_chunk);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_FREE");
-        
+
             /* Free chunk interleaved file type */
             mrc = MPI_Type_free(&mpi_chunk_inter_type);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_FREE");
@@ -1584,7 +1584,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
         else {
             bytes_begin[0] = 0;
 
-            if (!parms->h5_use_chunks || parms->io_type==PHDF5) 
+            if (!parms->h5_use_chunks || parms->io_type==PHDF5)
                 bytes_begin[1] = (off_t)(blk_size*pio_mpi_rank_g);
             else
                 bytes_begin[1] = (off_t)(blk_size*blk_size*pio_mpi_rank_g);
@@ -1650,7 +1650,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
             /* Commit partial buffer derived type */
             mrc = MPI_Type_commit(&mpi_partial_buffer_cont);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
-            
+
             /* Build contiguous file's derived type */
             mrc = MPI_Type_vector((int)blk_size, (int)1, (int)(snbytes/buf_size),
                 mpi_partial_buffer_cont, &mpi_cont_type);
@@ -1687,7 +1687,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
             mrc = MPI_Type_commit(&mpi_full_buffer);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
 
-            /* Build full chunk derived type */               
+            /* Build full chunk derived type */
             mrc = MPI_Type_contiguous((int)(blk_size*blk_size), MPI_BYTE,
                 &mpi_full_chunk);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -1696,7 +1696,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
             mrc = MPI_Type_commit(&mpi_full_chunk);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
 
-            /* Build chunk interleaved file's derived type */             
+            /* Build chunk interleaved file's derived type */
             mrc = MPI_Type_vector((int)(buf_size/blk_size), (int)1, (int)(snbytes/blk_size),
                 mpi_full_chunk, &mpi_chunk_inter_type);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -1949,7 +1949,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         file_offset_advance = (off_t)snbytes;
                     } /* end if */
                     /* Interleaved access pattern */
@@ -1962,7 +1962,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         file_offset_advance = (off_t)snbytes;
                     } /* end else */
                 } /* end if */
@@ -1976,7 +1976,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         file_offset_advance = 0;
                     } /* end if */
                     /*Interleaved access pattern */
@@ -1995,7 +1995,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         /* file_offset_advance = (off_t)(snbytes/blk_size*(blk_size*blk_size)); */
                         file_offset_advance = (off_t)(snbytes*blk_size);
                     } /* end else */
@@ -2136,7 +2136,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         mpi_offset_advance = snbytes;
 
                         /* MPI type to be used for collective access */
@@ -2151,7 +2151,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         mpi_offset_advance = snbytes;
 
                         /* MPI type to be used for collective access */
@@ -2168,7 +2168,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * buf_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         mpi_offset_advance = 0;
 
                         /* MPI type to be used for collective access */
@@ -2190,7 +2190,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
                         /* Number of bytes to be transferred per I/O operation */
                         nbytes_xfer_advance = blk_size * blk_size;
 
-                        /* Global offset advance after each I/O operation */                            
+                        /* Global offset advance after each I/O operation */
                         /* mpi_offset_advance = (MPI_Offset)(snbytes/blk_size*(blk_size*blk_size)); */
                         mpi_offset_advance = (MPI_Offset)(snbytes*blk_size);
 
@@ -2386,7 +2386,7 @@ done:
             /* Free full chunk type */
             mrc = MPI_Type_free(&mpi_full_chunk);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_FREE");
-        
+
             /* Free chunk interleaved file type */
             mrc = MPI_Type_free(&mpi_chunk_inter_type);
             VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_FREE");
@@ -2551,7 +2551,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
         }
 
         break;
-    } 
+    }
 
 done:
     return ret_code;
diff --git a/perform/sio_engine.c b/perform/sio_engine.c
index b3a5b2a..928a325 100644
--- a/perform/sio_engine.c
+++ b/perform/sio_engine.c
@@ -13,7 +13,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Author: Christian Chilan, April 2008 
+ * Author: Christian Chilan, April 2008
  */
 
 #include <sys/types.h>
@@ -137,7 +137,7 @@ static off_t offset[MAX_DIMS];       /* dataset size in bytes     */
 static size_t buf_offset[MAX_DIMS];   /* dataset size in bytes     */
 static int order[MAX_DIMS];        /* dimension access order */
 static size_t      linear_buf_size;        /* linear buffer size     */
-static int         cont_dim;       /* lowest dimension for contiguous POSIX  
+static int         cont_dim;       /* lowest dimension for contiguous POSIX
                                       access */
 static size_t      cont_size;      /* size of contiguous POSIX access */
 static hid_t       fapl;           /* file access list */
@@ -159,7 +159,7 @@ static hid_t       h5dxpl = -1;            /* Dataset transfer property list */
  * Function:        do_sio
  * Purpose:         SIO Engine where IO are executed.
  * Return:          results
- * Programmer:      Christian Chilan, April, 2008 
+ * Programmer:      Christian Chilan, April, 2008
  * Modifications:
  */
     results
@@ -202,7 +202,7 @@ do_sio(parameters param)
         GOTOERROR(FAIL);
     }
 
-    nbytes = param.num_bytes;     
+    nbytes = param.num_bytes;
     linear_buf_size = 1;
 
     for (i=0; i<param.rank; i++){
@@ -232,14 +232,14 @@ do_sio(parameters param)
     }
 
     /* Allocate transfer buffer */
-    buffer2 = malloc(linear_buf_size); 
+    buffer2 = malloc(linear_buf_size);
     if ((buffer = malloc(linear_buf_size)) == NULL){
         HDfprintf(stderr, "malloc for transfer buffer size (%Hd) failed\n",
         (long_long)(linear_buf_size));
         GOTOERROR(FAIL);
     }
 
-    if (sio_debug_level >= 4) 
+    if (sio_debug_level >= 4)
 
     /* output all of the times for all iterations */
         fprintf(output, "Timer details:\n");
@@ -291,7 +291,7 @@ do_sio(parameters param)
         set_time(res.timers, HDF5_GROSS_READ_FIXED_DIMS, STOP);
         VRFY((hrc == SUCCESS), "do_fclose failed");
     }
-    
+
     do_cleanupfile(iot, fname);
 
 done:
@@ -335,8 +335,8 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
     const char *prefix, *suffix="";
     char *ptr, last = '\0';
     size_t i, j;
-    vfdtype vfd; 
-    vfd = param->vfd; 
+    vfdtype vfd;
+    vfd = param->vfd;
 
     if (!base_name || !fullname || size < 1)
     return NULL;
@@ -437,7 +437,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
  * Function:        do_write
  * Purpose:         Write the required amount of data to the file.
  * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008 
+ * Programmer:      Christian Chilan, April, 2008
  * Modifications:
  */
 static herr_t
@@ -476,7 +476,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
 
             /* determine lowest dimension for contiguous POSIX access */
             cont_dim = rank;
-            
+
             for (i=rank-1; i>=0; i--) {
                 if (parms->buf_size[i]==parms->dset_size[i])
                     cont_dim = i;
@@ -484,7 +484,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
                     break;
             }
 
-            /* determine size of the contiguous POSIX access */ 
+            /* determine size of the contiguous POSIX access */
             cont_size = (!cont_dim)? 1 : parms->buf_size[cont_dim-1];
             for (i=cont_dim; i<rank; i++)
                 cont_size *= parms->buf_size[i];
@@ -501,7 +501,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
             h5count[i] = parms->buf_size[i];
             h5chunk[i] = parms->chk_size[i];
             h5maxdims[i] = H5S_UNLIMITED;
-            
+
         }
 
         if (parms->h5_use_chunks && parms->h5_extendable) {
@@ -514,7 +514,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
         }
 
         hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-                    h5start, h5stride, h5count, h5block); 
+                    h5start, h5stride, h5count, h5block);
         VRFY((hrc >= 0), "H5Sselect_hyperslab");
 
         /* Create the memory dataspace that corresponds to the xfer buffer */
@@ -528,7 +528,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
             GOTOERROR(FAIL);
         }
 
-        break;        
+        break;
     } /* end switch */
 
 
@@ -578,7 +578,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
 
     /* Perform write */
     hrc = dset_write(rank-1, fd, parms, buffer);
-    
+
     if (hrc < 0) {
         fprintf(stderr, "Error in dataset write\n");
         GOTOERROR(FAIL);
@@ -640,7 +640,7 @@ done:
 
 /*
  * Function:        dset_write
- * Purpose:         Write buffer into the dataset. 
+ * Purpose:         Write buffer into the dataset.
  * Return:          SUCCESS or FAIL
  * Programmer:      Christian Chilan, April, 2008
  * Modifications:
@@ -655,11 +655,11 @@ static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void
     long i,j;
     herr_t hrc;
 
-    /* iterates according to the dimensions in order array */ 
+    /* iterates according to the dimensions in order array */
     for (i=0; i < parms->dset_size[cur_dim]; i += parms->buf_size[cur_dim]){
 
         h5offset[cur_dim] = offset[cur_dim] = i;
-            
+
         if (local_dim > 0){
 
             dset_write(local_dim-1, fd, parms, buffer);
@@ -697,7 +697,7 @@ static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void
                         }
                     }
                 }
-                /* applies offset */               
+                /* applies offset */
                 hrc = H5Soffset_simple(h5dset_space_id, h5offset);
                 VRFY((hrc >= 0), "H5Soffset_simple");
 
@@ -716,7 +716,7 @@ done:
 }
 
 /*
- * Function:        posix_buffer_write 
+ * Function:        posix_buffer_write
  * Purpose:         Write buffer into the POSIX file considering contiguity.
  * Return:          SUCCESS or FAIL
  * Programmer:      Christian Chilan, April, 2008
@@ -780,7 +780,7 @@ done:
  * Function:        do_read
  * Purpose:         Read the required amount of data to the file.
  * Return:          SUCCESS or FAIL
- * Programmer:      Christian Chilan, April, 2008 
+ * Programmer:      Christian Chilan, April, 2008
  * Modifications:
  */
 static herr_t
@@ -811,7 +811,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
     switch (parms->io_type) {
     case POSIXIO:
             cont_dim = rank;
-            
+
             for (i=rank-1; i>=0; i--) {
                 if (parms->buf_size[i]==parms->dset_size[i])
                     cont_dim = i;
@@ -838,7 +838,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
         VRFY((h5dset_space_id >= 0), "H5Screate_simple");
 
         hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-                    h5start, h5stride, h5count, h5block); 
+                    h5start, h5stride, h5count, h5block);
         VRFY((hrc >= 0), "H5Sselect_hyperslab");
 
         /* Create the memory dataspace that corresponds to the xfer buffer */
@@ -852,7 +852,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
             GOTOERROR(FAIL);
         }
 
-        break;        
+        break;
     } /* end switch */
 
 
@@ -950,12 +950,12 @@ static herr_t dset_read(int local_dim, file_descr *fd, parameters *parms, void *
     long i,j;
     herr_t hrc;
 
-    /* iterate on the current dimension */ 
+    /* iterate on the current dimension */
     for (i=0; i < parms->dset_size[cur_dim]; i += parms->buf_size[cur_dim]){
 
         h5offset[cur_dim] = offset[cur_dim] = i;
-        
-        /* if traverse in order array is incomplete, recurse */     
+
+        /* if traverse in order array is incomplete, recurse */
         if (local_dim > 0){
 
             ret_code = dset_read(local_dim-1, fd, parms, buffer);
@@ -981,7 +981,7 @@ static herr_t dset_read(int local_dim, file_descr *fd, parameters *parms, void *
                 hrc = H5Dread(h5ds_id, ELMT_H5_TYPE, h5mem_space_id,
                     h5dset_space_id, h5dxpl, buffer);
                 VRFY((hrc >= 0), "H5Dread");
-#if 0 
+#if 0
                 for (j=0; j<linear_buf_size; j++) {
                      buf_p = (unsigned char*)buffer;
                      if (buf_p[j]!=buffer2[j])
@@ -1043,7 +1043,7 @@ static herr_t posix_buffer_read(int local_dim, file_descr *fd, parameters *parms
         rc = ((ssize_t)cont_size ==
              POSIXREAD(fd->posixfd, buf_p, cont_size));
         VRFY((rc != 0), "POSIXREAD");
-#if 0 
+#if 0
         for (j=0; j<cont_size; j++) {
             if (buf_p[j]!=buf2_p[j])
                 printf("Inconsistent data in %d\n", j);
@@ -1108,18 +1108,18 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             GOTOERROR(FAIL);
         }
         break;
-    } 
+    }
 
 done:
     return ret_code;
 }
 
 /*
- * Function:    set_vfd 
- * Purpose:     Sets file driver. 
+ * Function:    set_vfd
+ * Purpose:     Sets file driver.
  * Return:      SUCCESS or FAIL
- * Programmer:  Christian Chilan, April, 2008 
- * Modifications: 
+ * Programmer:  Christian Chilan, April, 2008
+ * Modifications:
  */
 
 hid_t
@@ -1296,7 +1296,7 @@ do_cleanupfile(iotype iot, char *filename)
             }
             H5Pclose(fapl);
             break;
-      }   
+      }
 }
 }
 
diff --git a/perform/sio_perf.c b/perform/sio_perf.c
index a83e4ab..720f4cb 100644
--- a/perform/sio_perf.c
+++ b/perform/sio_perf.c
@@ -389,7 +389,7 @@ finish:
  * Return:      Nothing
  * Programmer:  Bill Wendling, 30. October 2001
  * Modifications:
- *    Added multidimensional testing (Christian Chilan, April, 2008) 
+ *    Added multidimensional testing (Christian Chilan, April, 2008)
  */
 static void
 run_test_loop(struct options *opts)
@@ -397,7 +397,7 @@ run_test_loop(struct options *opts)
     parameters parms;
     int i;
     int doing_sio;      /* if this process is doing SIO */
-    size_t      buf_bytes;     
+    size_t      buf_bytes;
     /* load options into parameter structure */
     parms.num_files = opts->num_files;
     parms.num_dsets = opts->num_dsets;
@@ -901,7 +901,7 @@ report_parameters(struct options *opts)
         else {
             HDfprintf(output, "Contiguous\n");
         }
-        
+
         HDfprintf(output, "HDF5 file driver=");
         if (opts->vfd==sec2) {
             HDfprintf(output, "sec2\n");
@@ -943,7 +943,7 @@ parse_command_line(int argc, char *argv[])
     cl_opts->output_file = NULL;
     cl_opts->io_types =  0;    /* will set default after parsing options */
     cl_opts->num_iters = 1;
- 
+
     default_rank = 2;
 
     cl_opts->dset_rank = 0;
@@ -959,7 +959,7 @@ parse_command_line(int argc, char *argv[])
     }
 
     cl_opts->vfd = sec2;
-   
+
     cl_opts->print_times = FALSE;   /* Printing times is off by default */
     cl_opts->print_raw = FALSE;     /* Printing raw data throughput is off by default */
     cl_opts->h5_alignment = 1;      /* No alignment for HDF5 objects by default */
diff --git a/src/H5A.c b/src/H5A.c
index 774b660..77ed0a2 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -711,7 +711,7 @@ done:
  *
  * Purpose:
  *      Finishes initializing an attributes the open
- *      
+ *
  * Usage:
  *  herr_t H5A_open_common(loc, name, dxpl_id)
  *      const H5G_loc_t *loc;   IN: Pointer to group location for object
@@ -832,7 +832,7 @@ done:
  * Function:	H5A_open_by_name
  *
  * Purpose:	Open an attribute in an object header, according to it's name
- *      
+ *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	Quincey Koziol
@@ -1405,7 +1405,7 @@ done:
  NAME
     H5A_get_name
  PURPOSE
-    Private function for H5Aget_name.  Gets a copy of the name for an 
+    Private function for H5Aget_name.  Gets a copy of the name for an
     attribute
  RETURNS
     This function returns the length of the attribute's name (which may be
@@ -2391,7 +2391,7 @@ H5A_free(H5A_t *attr)
 	    HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release dataspace info")
         attr->shared->ds = NULL;
     }
-    if(attr->shared->data) 
+    if(attr->shared->data)
         attr->shared->data = H5FL_BLK_FREE(attr_buf, attr->shared->data);
 
 done:
@@ -2429,7 +2429,7 @@ H5A_close(H5A_t *attr)
     if(attr->obj_opened && (H5O_close(&(attr->shared->oloc)) < 0))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release object header info")
 
-    /* Reference count can be 0.  It only happens when H5A_create fails. */ 
+    /* Reference count can be 0.  It only happens when H5A_create fails. */
     if(1 >= attr->shared->nrefs) {
         /* Free dynamicly allocated items */
         if(H5A_free(attr) < 0)
diff --git a/src/H5AC.c b/src/H5AC.c
index 59b2e60..4ee9060 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -746,9 +746,9 @@ done:
  *		Added code to free the auxiliary structure and its
  *		associated slist if present.
  *						   JRM - 6/28/05
- *		
+ *
  *		Added code to close the trace file if it is present.
- *		
+ *
  *						    JRM - 6/8/06
  *
  *-------------------------------------------------------------------------
@@ -830,15 +830,15 @@ done:
  *              6/30/06
  *
  * Modifications:
- *		
+ *
  *		None.
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC_expunge_entry(H5F_t *f, 
-		   hid_t dxpl_id, 
-		   const H5AC_class_t *type, 
+H5AC_expunge_entry(H5F_t *f,
+		   hid_t dxpl_id,
+		   const H5AC_class_t *type,
 		   haddr_t addr)
 {
     herr_t   result;
@@ -862,8 +862,8 @@ H5AC_expunge_entry(H5F_t *f,
     cache_ptr = f->shared->cache;
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the expunge entry call, only the addr, and type id are really 
-     * necessary in the trace file.  Write the return value to catch occult 
+    /* For the expunge entry call, only the addr, and type id are really
+     * necessary in the trace file.  Write the return value to catch occult
      * errors.
      */
     if ( ( cache_ptr != NULL ) &&
@@ -1002,8 +1002,8 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
     /* For the flush, only the flags are really necessary in the trace file.
      * Write the result to catch occult errors.
      */
-    if ( ( f != NULL ) && 
-         ( f->shared != NULL ) && 
+    if ( ( f != NULL ) &&
+         ( f->shared != NULL ) &&
 	 ( f->shared->cache != NULL ) &&
 	 ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
 	 ( trace_file_ptr != NULL ) ) {
@@ -1281,8 +1281,8 @@ H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *
     HDassert(thing);
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the insert, only the addr, size, type id and flags are really 
-     * necessary in the trace file.  Write the result to catch occult 
+    /* For the insert, only the addr, size, type id and flags are really
+     * necessary in the trace file.  Write the result to catch occult
      * errors.
      *
      * Note that some data is not available right now -- put what we can
@@ -1369,8 +1369,8 @@ done:
 #if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %d\n", trace, 
-                  (int)trace_entry_size, 
+	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
+                  (int)trace_entry_size,
 		  (int)ret_value);
     }
 #endif /* H5AC__TRACE_FILE_ENABLED */
@@ -1417,8 +1417,8 @@ H5AC_mark_pinned_entry_dirty(H5F_t * f,
     FUNC_ENTER_NOAPI(H5AC_mark_pinned_entry_dirty, FAIL)
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the mark pinned entry dirty call, only the addr, size_changed, 
-     * and new_size are really necessary in the trace file. Write the result 
+    /* For the mark pinned entry dirty call, only the addr, size_changed,
+     * and new_size are really necessary in the trace file. Write the result
      * to catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -1539,7 +1539,7 @@ H5AC_mark_pinned_or_protected_entry_dirty(H5F_t * f,
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the mark pinned or protected entry dirty call, only the addr
-     * is really necessary in the trace file.  Write the result to catch 
+     * is really necessary in the trace file.  Write the result to catch
      * occult errors.
      */
     if ( ( f != NULL ) &&
@@ -1671,7 +1671,7 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_ad
     HDassert(H5F_addr_ne(old_addr, new_addr));
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the rename call, only the old addr and new addr are really 
+    /* For the rename call, only the old addr and new addr are really
      * necessary in the trace file.  Include the type id so we don't have to
      * look it up.  Also write the result to catch occult errors.
      */
@@ -1776,7 +1776,7 @@ H5AC_pin_protected_entry(H5F_t * f,
     FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL)
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the pin protected entry call, only the addr is really necessary 
+    /* For the pin protected entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -1873,11 +1873,11 @@ done:
  *		Added trace file support.
  *
  *		JRM - 3/18/07
- *		Modified code to support the new flags parameter for 
- *		H5C_protect().  For now, that means passing in the 
+ *		Modified code to support the new flags parameter for
+ *		H5C_protect().  For now, that means passing in the
  *		H5C_READ_ONLY_FLAG if rw == H5AC_READ.
  *
- *		Also updated the trace file output to save the 
+ *		Also updated the trace file output to save the
  *		rw parameter, since we are now doing something with it.
  *
  *-------------------------------------------------------------------------
@@ -1917,9 +1917,9 @@ H5AC_protect(H5F_t *f,
 	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the protect call, only the addr and type id is really necessary 
-     * in the trace file.  Include the size of the entry protected as a 
-     * sanity check.  Also indicate whether the call was successful to 
+    /* For the protect call, only the addr and type id is really necessary
+     * in the trace file.  Include the size of the entry protected as a
+     * sanity check.  Also indicate whether the call was successful to
      * catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -1986,7 +1986,7 @@ done:
 #if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %d\n", trace, 
+	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
                   (int)trace_entry_size,
                   (int)(ret_value != NULL));
     }
@@ -2030,8 +2030,8 @@ H5AC_resize_pinned_entry(H5F_t * f,
     FUNC_ENTER_NOAPI(H5AC_resize_pinned_entry, FAIL)
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the resize pinned entry call, only the addr, and new_size are 
-     * really necessary in the trace file. Write the result to catch 
+    /* For the resize pinned entry call, only the addr, and new_size are
+     * really necessary in the trace file. Write the result to catch
      * occult errors.
      */
     if ( ( f != NULL ) &&
@@ -2141,7 +2141,7 @@ H5AC_unpin_entry(H5F_t * f,
     FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL)
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the unpin entry call, only the addr is really necessary 
+    /* For the unpin entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -2302,7 +2302,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
 
 #if H5AC__TRACE_FILE_ENABLED
     /* For the unprotect call, only the addr, type id, flags, and possible
-     * new size are really necessary in the trace file.  Write the return 
+     * new size are really necessary in the trace file.  Write the return
      * value to catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -2413,8 +2413,8 @@ done:
 #if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %x %d\n", 
-		  trace, 
+	HDfprintf(trace_file_ptr, "%s %d %x %d\n",
+		  trace,
 		  (int)trace_new_size,
 		  (unsigned)trace_flags,
 		  (int)ret_value);
@@ -2539,11 +2539,11 @@ done:
  *
  *		JRM - 7/28/07
  *		Added support for the new evictions enabled related fields.
- *		
- *		Observe that H5AC_get_cache_auto_resize_config() and 
+ *
+ *		Observe that H5AC_get_cache_auto_resize_config() and
  *		H5AC_set_cache_auto_resize_config() are becoming generic
- *		metadata cache configuration routines as they gain 
- *		switches for functions that are only tenuously related 
+ *		metadata cache configuration routines as they gain
+ *		switches for functions that are only tenuously related
  *		to auto resize configuration.
  *
  *		JRM - 1/2/08
@@ -2808,7 +2808,7 @@ done:
  *              Updated for the addition of H5AC_cache_config_t.
  *
  *		John Mainzer -- 10/25/05
- *		Added support for the new dirty_bytes_threshold field of 
+ *		Added support for the new dirty_bytes_threshold field of
  *		both H5AC_cache_config_t and H5AC_aux_t.
  *
  *		John Mainzer -- 6/7/06
@@ -2816,15 +2816,15 @@ done:
  *
  *		John Mainzer -- 7/28/07
  *		Added support for the new evictions enabled related fields.
- *		
- *		Observe that H5AC_get_cache_auto_resize_config() and 
+ *
+ *		Observe that H5AC_get_cache_auto_resize_config() and
  *		H5AC_set_cache_auto_resize_config() are becoming generic
- *		metadata cache configuration routines as they gain 
- *		switches for functions that are only tenuously related 
+ *		metadata cache configuration routines as they gain
+ *		switches for functions that are only tenuously related
  *		to auto resize configuration.
  *
  *		John Mainzer -- 1/3/07
- *		Updated trace file code to record the new flash cache 
+ *		Updated trace file code to record the new flash cache
  *		size increase related fields.
  *
  *-------------------------------------------------------------------------
@@ -2971,16 +2971,16 @@ H5AC_set_cache_auto_resize_config(H5AC_t * cache_ptr,
 done:
 
 #if H5AC__TRACE_FILE_ENABLED
-    /* For the set cache auto resize config call, only the contents 
-     * of the config is necessary in the trace file. Write the return 
+    /* For the set cache auto resize config call, only the contents
+     * of the config is necessary in the trace file. Write the return
      * value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
          ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-	HDfprintf(trace_file_ptr, 
-                  "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d %d\n", 
+	HDfprintf(trace_file_ptr,
+                  "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d %d\n",
 		  "H5AC_set_cache_auto_resize_config",
 		  trace_config.version,
 		  (int)(trace_config.rpt_fcn_enabled),
@@ -3048,9 +3048,9 @@ done:
  *              are applied.
  *              					JRM - 5/15/06
  *
- *	      - Added code testing the evictions enabled field.  At 
- *	        present this consists of verifying that if 
- *	        evictions_enabled is FALSE, then automatic cache 
+ *	      - Added code testing the evictions enabled field.  At
+ *	        present this consists of verifying that if
+ *	        evictions_enabled is FALSE, then automatic cache
  *		resizing in disabled.
  *
  *	        					JRM - 7/28/07
@@ -3103,7 +3103,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
     /* don't bother to test trace_file_name unless open_trace_file is TRUE */
     if ( config_ptr->open_trace_file ) {
 
-	/* Can't really test the trace_file_name field without trying to 
+	/* Can't really test the trace_file_name field without trying to
 	 * open the file, so we will content ourselves with a couple of
 	 * sanity checks on the length of the file name.
 	 */
@@ -3129,7 +3129,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
     }
 
     if ( ( config_ptr->evictions_enabled == FALSE ) &&
-	 ( ( config_ptr->incr_mode != H5C_incr__off ) || 
+	 ( ( config_ptr->incr_mode != H5C_incr__off ) ||
 	   ( config_ptr->flash_incr_mode != H5C_flash_incr__off ) ||
 	   ( config_ptr->decr_mode != H5C_decr__off ) ) ) {
 
diff --git a/src/H5AC2.c b/src/H5AC2.c
index 25a3109..1be2c89 100644
--- a/src/H5AC2.c
+++ b/src/H5AC2.c
@@ -41,8 +41,8 @@
  *	facilitate re-use.  Re-worked this file again to use H5C.
  *
  *	John Mainzer, 10/18/07
- *	Copied H5AC2.c to H5AC22.c and reworked to use H5C2 instead of H5C.  
- *	All this is in support of cache API modifications needed for 
+ *	Copied H5AC2.c to H5AC22.c and reworked to use H5C2 instead of H5C.
+ *	All this is in support of cache API modifications needed for
  *	journaling.
  *
  *-------------------------------------------------------------------------
@@ -183,7 +183,7 @@ static herr_t H5AC2_log_inserted_entry(H5F_t * f,
                                       H5AC2_t * cache_ptr,
                                       H5AC2_info_t * entry_ptr,
                                       const H5AC2_class_t * type,
-                                      haddr_t addr, 
+                                      haddr_t addr,
                                       size_t size);
 
 static herr_t H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
@@ -482,11 +482,11 @@ H5AC2_term_interface(void)
  *              API.
  *              				JRM - 10/18/07
  *
- *		Added the dxpl_id parameter, and updated for parameter 
+ *		Added the dxpl_id parameter, and updated for parameter
  *		list changes in H5C2_create().
  *						JRM - 3/26/08
  *
- *		Updated code for the removal of the f, dxpl_id, and 
+ *		Updated code for the removal of the f, dxpl_id, and
  *		journal_recovered parameters for H5C2_create().
  *
  *						JRM 7/10/08
@@ -769,13 +769,13 @@ done:
  *		Added code to free the auxiliary structure and its
  *		associated slist if present.
  *						   JRM - 6/28/05
- *		
+ *
  *		Added code to close the trace file if it is present.
- *		
+ *
  *						    JRM - 6/8/06
- *		
+ *
  *              JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -847,7 +847,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5AC2_begin_transaction()
  *
- * Purpose:	Mark the beginning of a transaction.  
+ * Purpose:	Mark the beginning of a transaction.
  *
  * 		This function is just a wrapper for H5C2_begin_transaction().
  *
@@ -857,7 +857,7 @@ done:
  *              4/12/08
  *
  * Modifications:
- *		
+ *
  *              None.
  *
  *-------------------------------------------------------------------------
@@ -979,7 +979,7 @@ done:
 #if H5AC2__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %llu %d\n", trace, 
+	HDfprintf(trace_file_ptr, "%s %llu %d\n", trace,
                   *trans_num_ptr, (int)ret_value);
     }
 #endif /* H5AC2__TRACE_FILE_ENABLED */
@@ -996,7 +996,7 @@ done:
  *              Fail if it exists and the journal recovered flag is
  *              not set.
  *
- * 		This function is just a wrapper for 
+ * 		This function is just a wrapper for
  * 		H5C2_check_for_journaling().
  *
  * Return:      Non-negative on success/Negative on failure
@@ -1005,7 +1005,7 @@ done:
  *              7/4/08
  *
  * Modifications:
- *		
+ *
  *              None.
  *
  *-------------------------------------------------------------------------
@@ -1032,14 +1032,14 @@ H5AC2_check_for_journaling(H5F_t * f,
 
 #if H5AC2__TRACE_FILE_ENABLED
     /* For the end transaction call, only the journal_recovered
-     * parameter is really needed.  Write the return value to catch 
+     * parameter is really needed.  Write the return value to catch
      * occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
          ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_check_for_journaling %d ", 
+        sprintf(trace, "H5AC2_check_for_journaling %d ",
 		(int)journal_recovered);
     }
 #endif /* H5AC2__TRACE_FILE_ENABLED */
@@ -1050,7 +1050,7 @@ H5AC2_check_for_journaling(H5F_t * f,
      * time.
      */
 
-    result = H5C2_check_for_journaling(f, dxpl_id, cache_ptr, 
+    result = H5C2_check_for_journaling(f, dxpl_id, cache_ptr,
 		                       journal_recovered);
 
     if ( result != SUCCEED ) {
@@ -1084,7 +1084,7 @@ done:
  *              8/15/08
  *
  * Modifications:
- *		
+ *
  *              None.
  *
  *-------------------------------------------------------------------------
@@ -1112,11 +1112,11 @@ H5AC2_deregister_mdjsc_callback(H5F_t * file_ptr,
     }
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the deregister metadata journaling status change callback 
-     * call, only the idx is really needed.  Write the return value to 
+    /* For the deregister metadata journaling status change callback
+     * call, only the idx is really needed.  Write the return value to
      * catch occult errors.
      */
-    if ( ( cache_ptr != NULL ) 
+    if ( ( cache_ptr != NULL )
          &&
          ( H5C2_get_trace_file_ptr((H5C2_t *)cache_ptr, &trace_file_ptr) >= 0 )
          &&
@@ -1151,7 +1151,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5AC2_end_transaction()
  *
- * Purpose:	Mark the end of a transaction.  
+ * Purpose:	Mark the end of a transaction.
  *
  * 		This function is just a wrapper for H5C2_end_transaction().
  *
@@ -1161,7 +1161,7 @@ done:
  *              4/12/08
  *
  * Modifications:
- *		
+ *
  *              None.
  *
  *-------------------------------------------------------------------------
@@ -1192,14 +1192,14 @@ H5AC2_end_transaction(hbool_t do_transaction,
 
 #if H5AC2__TRACE_FILE_ENABLED
     /* For the end transaction call, only the transaction number and the
-     * api call name are really needed.  Write the return value to catch 
+     * api call name are really needed.  Write the return value to catch
      * occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
          ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_end_transaction %s %llu", 
+        sprintf(trace, "H5AC2_end_transaction %s %llu",
                 api_call_name, trans_num);
     }
 #endif /* H5AC2__TRACE_FILE_ENABLED */
@@ -1220,7 +1220,7 @@ H5AC2_end_transaction(hbool_t do_transaction,
 
             cache_ptr = f->shared->cache2;
 
-            result = H5C2_end_transaction(f, dxpl_id, cache_ptr, 
+            result = H5C2_end_transaction(f, dxpl_id, cache_ptr,
 			                  trans_num, api_call_name);
 
             if ( result < 0 ) {
@@ -1232,7 +1232,7 @@ H5AC2_end_transaction(hbool_t do_transaction,
 
 	if ( id_oloc_open ) {
 
-	    result = H5O_close(id_oloc_ptr); 
+	    result = H5O_close(id_oloc_ptr);
 
 	    if ( result < 0 ) {
 
@@ -1269,17 +1269,17 @@ done:
  *              6/30/06
  *
  * Modifications:
- *		
+ *
  *              JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_expunge_entry(H5F_t *f, 
-		   hid_t dxpl_id, 
-		   const H5AC2_class_t *type, 
+H5AC2_expunge_entry(H5F_t *f,
+		   hid_t dxpl_id,
+		   const H5AC2_class_t *type,
 		   haddr_t addr)
 {
     herr_t    result;
@@ -1301,8 +1301,8 @@ H5AC2_expunge_entry(H5F_t *f,
     cache_ptr = f->shared->cache2;
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the expunge entry call, only the addr, and type id are really 
-     * necessary in the trace file.  Write the return value to catch occult 
+    /* For the expunge entry call, only the addr, and type id are really
+     * necessary in the trace file.  Write the return value to catch occult
      * errors.
      */
     if ( ( cache_ptr != NULL ) &&
@@ -1414,7 +1414,7 @@ done:
  * 		Added trace file support.
  *
  *              JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -1444,8 +1444,8 @@ H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
     /* For the flush, only the flags are really necessary in the trace file.
      * Write the result to catch occult errors.
      */
-    if ( ( f != NULL ) && 
-         ( f->shared != NULL ) && 
+    if ( ( f != NULL ) &&
+         ( f->shared != NULL ) &&
 	 ( f->shared->cache2 != NULL ) &&
 	 ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) &&
 	 ( trace_file_ptr != NULL ) ) {
@@ -1567,7 +1567,7 @@ done:
  * Modifications:
  *
  *              JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -1693,7 +1693,7 @@ done:
  *              Added trace file support.
  *
  *              JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -1725,8 +1725,8 @@ H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size
     HDassert(thing);
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the insert, only the addr, size, type id and flags are really 
-     * necessary in the trace file.  Write the result to catch occult 
+    /* For the insert, only the addr, size, type id and flags are really
+     * necessary in the trace file.  Write the result to catch occult
      * errors.
      *
      * Note that some data is not available right now -- put what we can
@@ -1813,8 +1813,8 @@ done:
 #if H5AC2__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %d\n", trace, 
-                  (int)trace_entry_size, 
+	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
+                  (int)trace_entry_size,
 		  (int)ret_value);
     }
 #endif /* H5AC2__TRACE_FILE_ENABLED */
@@ -1857,8 +1857,8 @@ H5AC2_mark_pinned_entry_dirty(void *  thing,
     HDassert(thing);
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the mark pinned entry dirty call, only the addr, size_changed, 
-     * and new_size are really necessary in the trace file. Write the result 
+    /* For the mark pinned entry dirty call, only the addr, size_changed,
+     * and new_size are really necessary in the trace file. Write the result
      * to catch occult errors.
      */
     if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
@@ -1929,13 +1929,13 @@ H5AC2_mark_pinned_or_protected_entry_dirty(void *thing)
     herr_t              ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(H5AC2_mark_pinned_or_protected_entry_dirty, FAIL)
-	
+
     /* Sanity check */
     HDassert(thing);
 
 #if H5AC2__TRACE_FILE_ENABLED
     /* For the mark pinned or protected entry dirty call, only the addr
-     * is really necessary in the trace file.  Write the result to catch 
+     * is really necessary in the trace file.  Write the result to catch
      * occult errors.
      */
     if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
@@ -2017,7 +2017,7 @@ done:
  *		Added trace file support.
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -2045,7 +2045,7 @@ H5AC2_rename(H5F_t *f, const H5AC2_class_t *type, haddr_t old_addr, haddr_t new_
     HDassert(H5F_addr_ne(old_addr, new_addr));
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the rename call, only the old addr and new addr are really 
+    /* For the rename call, only the old addr and new addr are really
      * necessary in the trace file.  Include the type id so we don't have to
      * look it up.  Also write the result to catch occult errors.
      */
@@ -2143,7 +2143,7 @@ H5AC2_pin_protected_entry(void *thing)
     FUNC_ENTER_NOAPI(H5AC2_pin_protected_entry, FAIL)
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the pin protected entry call, only the addr is really necessary 
+    /* For the pin protected entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
     if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
@@ -2226,15 +2226,15 @@ done:
  *		Added trace file support.
  *
  *		JRM - 3/18/07
- *		Modified code to support the new flags parameter for 
- *		H5C2_protect().  For now, that means passing in the 
+ *		Modified code to support the new flags parameter for
+ *		H5C2_protect().  For now, that means passing in the
  *		H5C2_READ_ONLY_FLAG if rw == H5AC2_READ.
  *
- *		Also updated the trace file output to save the 
+ *		Also updated the trace file output to save the
  *		rw parameter, since we are now doing something with it.
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -2273,9 +2273,9 @@ H5AC2_protect(H5F_t *f,
 	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the protect call, only the addr and type id is really necessary 
-     * in the trace file.  Include the size of the entry protected as a 
-     * sanity check.  Also indicate whether the call was successful to 
+    /* For the protect call, only the addr and type id is really necessary
+     * in the trace file.  Include the size of the entry protected as a
+     * sanity check.  Also indicate whether the call was successful to
      * catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -2341,7 +2341,7 @@ done:
 #if H5AC2__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %d\n", trace, 
+	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
                   (int)trace_entry_size,
                   (int)(ret_value != NULL));
     }
@@ -2358,7 +2358,7 @@ done:
  * Purpose:	Register a metadata journaling status change callback,
  *              and return the index assigned to the callback in *idx_ptr.
  *
- *		If config_ptr is not NULL, return the current metadata 
+ *		If config_ptr is not NULL, return the current metadata
  *		journaling configuration in *config_ptr.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2367,7 +2367,7 @@ done:
  *              8/15/08
  *
  * Modifications:
- *		
+ *
  *              None.
  *
  *-------------------------------------------------------------------------
@@ -2400,22 +2400,22 @@ H5AC2_register_mdjsc_callback(const H5F_t * file_ptr,
     }
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the register metadata journaling status change callback 
-     * call, fnc_ptr, data_ptr, and the returned idx are all that 
+    /* For the register metadata journaling status change callback
+     * call, fnc_ptr, data_ptr, and the returned idx are all that
      * are needed.  Write the return value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
          ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-       sprintf(trace, "H5AC2_register_mdjsc_callback 0x%lx 0x%lx ", 
+       sprintf(trace, "H5AC2_register_mdjsc_callback 0x%lx 0x%lx ",
                (unsigned long)(fcn_ptr), (unsigned long)(data_ptr));
     }
 #endif /* H5AC2__TRACE_FILE_ENABLED */
 
-    result = H5C2_register_mdjsc_callback(cache_ptr, 
+    result = H5C2_register_mdjsc_callback(cache_ptr,
                                           fcn_ptr,
-                                          data_ptr, 
+                                          data_ptr,
                                           idx_ptr);
 
     if ( result < 0 ) {
@@ -2440,7 +2440,7 @@ done:
 #if H5AC2__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %d\n", 
+	HDfprintf(trace_file_ptr, "%s %d %d\n",
                   trace, *idx_ptr, (int)ret_value);
     }
 #endif /* H5AC2__TRACE_FILE_ENABLED */
@@ -2478,8 +2478,8 @@ H5AC2_resize_pinned_entry(void *thing, size_t new_size)
     HDassert(thing);
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the resize pinned entry call, only the addr, and new_size are 
-     * really necessary in the trace file. Write the result to catch 
+    /* For the resize pinned entry call, only the addr, and new_size are
+     * really necessary in the trace file. Write the result to catch
      * occult errors.
      */
     if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
@@ -2551,7 +2551,7 @@ H5AC2_unpin_entry(void *thing)
     HDassert(thing);
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the unpin entry call, only the addr is really necessary 
+    /* For the unpin entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
     if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
@@ -2665,17 +2665,17 @@ done:
  *		Added support for the trace file.
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
- *              Note that the H5AC2__SIZE_CHANGED_FLAG must now be set if 
+ *              Note that the H5AC2__SIZE_CHANGED_FLAG must now be set if
  *              the size of the entry has changed.
  *
  *-------------------------------------------------------------------------
  */
 
 herr_t
-H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, 
+H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
 		haddr_t addr, size_t new_size, void *thing, unsigned flags)
 {
     herr_t		result;
@@ -2705,7 +2705,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
 
 #if H5AC2__TRACE_FILE_ENABLED
     /* For the unprotect call, only the addr, type id, flags, and possible
-     * new size are really necessary in the trace file.  Write the return 
+     * new size are really necessary in the trace file.  Write the return
      * value to catch occult errors.
      */
     if ( ( f != NULL ) &&
@@ -2725,7 +2725,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
     dirtied = ( ( (flags & H5AC2__DIRTIED_FLAG) == H5AC2__DIRTIED_FLAG ) ||
 		( ((H5AC2_info_t *)thing)->dirtied ) );
 
-    size_changed = ( (flags & H5AC2__SIZE_CHANGED_FLAG) == 
+    size_changed = ( (flags & H5AC2__SIZE_CHANGED_FLAG) ==
 		      H5AC2__SIZE_CHANGED_FLAG );
 
 #ifdef H5_HAVE_PARALLEL
@@ -2755,7 +2755,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
 
     result = H5C2_unprotect(f,
 		            dxpl_id,
-			    type, 
+			    type,
 			    addr,
 			    thing,
 			    flags,
@@ -2789,8 +2789,8 @@ done:
 #if H5AC2__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
-	HDfprintf(trace_file_ptr, "%s %d %x %d\n", 
-		  trace, 
+	HDfprintf(trace_file_ptr, "%s %d %x %d\n",
+		  trace,
 		  (int)new_size,
 		  (unsigned)flags,
 		  (int)ret_value);
@@ -2817,7 +2817,7 @@ done:
  * Modifications:
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -2875,7 +2875,7 @@ done:
  *		H5C_stats().
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -2924,15 +2924,15 @@ done:
  *
  *		JRM - 7/28/07
  *		Added support for the new evictions enabled related fields.
- *		
- *		Observe that H5AC2_get_cache_auto_resize_config() and 
+ *
+ *		Observe that H5AC2_get_cache_auto_resize_config() and
  *		H5AC2_set_cache_auto_resize_config() are becoming generic
- *		metadata cache configuration routines as they gain 
- *		switches for functions that are only tenuously related 
+ *		metadata cache configuration routines as they gain
+ *		switches for functions that are only tenuously related
  *		to auto resize configuration.
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *              JRM - 1/2/08
@@ -2942,7 +2942,7 @@ done:
  *              JRM -- 4/12/08
  *              Added support for the new journaling control fields.
  *
- *              JRM - 8/1/08 
+ *              JRM - 8/1/08
  *              Removed support for the new journaling control fields.
  *              This functionality is now handled through the
  *              H5AC2_jnl_config_t structure and the related calls.
@@ -2992,7 +2992,7 @@ H5AC2_get_cache_auto_resize_config(const H5AC2_t * cache_ptr,
                     "H5C2_get_cache_auto_resize_config() failed.")
     }
 
-    result = H5C2_get_evictions_enabled((const H5C2_t *)cache_ptr, 
+    result = H5C2_get_evictions_enabled((const H5C2_t *)cache_ptr,
 		                         &evictions_enabled);
 
     if ( result < 0 ) {
@@ -3063,12 +3063,12 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5AC2_get_jnl_config
  *
- * Purpose:     Get the current journaling configuration and load it into 
+ * Purpose:     Get the current journaling configuration and load it into
  * 		the supplied instance of H5AC2_jnl_config_t.
  *
- * 		For the moment, the only journaling we do is metadata 
- * 		journaling, so in effect this function is a wrapper 
- * 		function for H5C2_get_journal_config(). 
+ * 		For the moment, the only journaling we do is metadata
+ * 		journaling, so in effect this function is a wrapper
+ * 		function for H5C2_get_journal_config().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3078,7 +3078,7 @@ done:
  * Modifications:
  *
  *		JRM -- 8/14/08
- *		Reworked for change in argument list to 
+ *		Reworked for change in argument list to
  *		H5C2_get_journal_config().
  *
  *-------------------------------------------------------------------------
@@ -3169,7 +3169,7 @@ done:
  * Modifications:
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -3219,7 +3219,7 @@ done:
  * Modifications:
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -3263,7 +3263,7 @@ done:
  * Modifications:
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *-------------------------------------------------------------------------
@@ -3308,7 +3308,7 @@ done:
  *              Updated for the addition of H5AC2_cache_config_t.
  *
  *		John Mainzer -- 10/25/05
- *		Added support for the new dirty_bytes_threshold field of 
+ *		Added support for the new dirty_bytes_threshold field of
  *		both H5AC2_cache_config_t and H5AC2_aux_t.
  *
  *		John Mainzer -- 6/7/06
@@ -3316,15 +3316,15 @@ done:
  *
  *		John Mainzer -- 7/28/07
  *		Added support for the new evictions enabled related fields.
- *		
- *		Observe that H5AC2_get_cache_auto_resize_config() and 
+ *
+ *		Observe that H5AC2_get_cache_auto_resize_config() and
  *		H5AC2_set_cache_auto_resize_config() are becoming generic
- *		metadata cache configuration routines as they gain 
- *		switches for functions that are only tenuously related 
+ *		metadata cache configuration routines as they gain
+ *		switches for functions that are only tenuously related
  *		to auto resize configuration.
  *
  * 		JRM - 10/18/07
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
  *              John Mainzer -- 1/3/07
@@ -3336,7 +3336,7 @@ done:
  *              This required the addition of the dxpl_id parameter.
  *
  *              John Mainzer -- 8/1/08
- *              Pulled journaling configuration back out of the 
+ *              Pulled journaling configuration back out of the
  *              function, and teh dxpl_id parameter with it.
  *
  *-------------------------------------------------------------------------
@@ -3404,15 +3404,15 @@ H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
 done:
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the set cache auto resize config call, only the contents 
-     * of the config is necessary in the trace file. Write the return 
+    /* For the set cache auto resize config call, only the contents
+     * of the config is necessary in the trace file. Write the return
      * value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
          ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-	HDfprintf(trace_file_ptr, 
+	HDfprintf(trace_file_ptr,
                   "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %d %d %f %f %d %f %f %d %d %d %d %f %d %d\n",
 		  "H5AC2_set_cache_auto_resize_config",
 		  trace_config.version,
@@ -3459,7 +3459,7 @@ done:
  * Purpose:     Manage changes in journaling configuration.
  *
  * 		At present, metadata journaling is the only journaling we
- * 		do, so this function can be thought of as a wrapper for 
+ * 		do, so this function can be thought of as a wrapper for
  *		H5C2_begin_journaling() and H5C2_end_journaling().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
@@ -3470,17 +3470,17 @@ done:
  * Modifications:
  *
  * 		JRM -- 8/14/08
- * 		Revised code for the use of the H5C2_mdj_config_t 
+ * 		Revised code for the use of the H5C2_mdj_config_t
  * 		structure in H5C2_get_journal_config() and
- *		H5C2_begin_journaling().  
+ *		H5C2_begin_journaling().
  *
- *		Per Quincey's request, also added code to 
- *		throw an error if journaling is requested when 
+ *		Per Quincey's request, also added code to
+ *		throw an error if journaling is requested when
  *		it is already enabled, or if the end of journaling
  *		is requested when it is already disabled.
  *
- *		Note that this required the addition of the 
- *		initializing parameter, which allows us to 
+ *		Note that this required the addition of the
+ *		initializing parameter, which allows us to
  *		avoid generating an error on startup.
  *
  *-------------------------------------------------------------------------
@@ -3551,7 +3551,7 @@ H5AC2_set_jnl_config(H5F_t * f,
     if ( config_ptr->enable_journaling != internal_config.enable_journaling ) {
 
         /* we have work to do -- start or stop journaling as requested */
-	
+
 	if ( config_ptr->enable_journaling ) {
 
 	    internal_config.enable_journaling = config_ptr->enable_journaling;
@@ -3565,7 +3565,7 @@ H5AC2_set_jnl_config(H5F_t * f,
 	    internal_config.jbrb_buf_size       = config_ptr->jbrb_buf_size;
 	    internal_config.jbrb_num_bufs       = config_ptr->jbrb_num_bufs;
 	    internal_config.jbrb_use_aio        = config_ptr->jbrb_use_aio;
-	    internal_config.jbrb_human_readable = 
+	    internal_config.jbrb_human_readable =
 		    config_ptr->jbrb_human_readable;
 
 	    result = H5C2_begin_journaling(f,
@@ -3605,15 +3605,15 @@ H5AC2_set_jnl_config(H5F_t * f,
 done:
 
 #if H5AC2__TRACE_FILE_ENABLED
-    /* For the set cache journaling config call, only the fields 
-     * of the config that pretain to journaling are necessary in 
+    /* For the set cache journaling config call, only the fields
+     * of the config that pretain to journaling are necessary in
      * the trace file. Write the return value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
          ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-	HDfprintf(trace_file_ptr, 
+	HDfprintf(trace_file_ptr,
                   "%s %d %d \"%s\" %d %d %d %d %d %d\n",
 		  "H5AC2_set_jnl_config",
 		  trace_config.version,
@@ -3636,8 +3636,8 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5AC2_set_cache_config
  *
- * Purpose:     Handle all configuration switches in an instance of 
- * 		H5AC2_cache_config_t.  
+ * Purpose:     Handle all configuration switches in an instance of
+ * 		H5AC2_cache_config_t.
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3809,14 +3809,14 @@ done:
  *              are applied.
  *              					JRM - 5/15/06
  *
- *	      - Added code testing the evictions enabled field.  At 
- *	        present this consists of verifying that if 
- *	        evictions_enabled is FALSE, then automatic cache 
+ *	      - Added code testing the evictions enabled field.  At
+ *	        present this consists of verifying that if
+ *	        evictions_enabled is FALSE, then automatic cache
  *		resizing in disabled.
  *
  *	        					JRM - 7/28/07
  *
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *              					JRM - 10/18/07
  *
@@ -3870,7 +3870,7 @@ H5AC2_validate_config(H5AC2_cache_config_t * config_ptr)
     /* don't bother to test trace_file_name unless open_trace_file is TRUE */
     if ( config_ptr->open_trace_file ) {
 
-	/* Can't really test the trace_file_name field without trying to 
+	/* Can't really test the trace_file_name field without trying to
 	 * open the file, so we will content ourselves with a couple of
 	 * sanity checks on the length of the file name.
 	 */
@@ -3896,7 +3896,7 @@ H5AC2_validate_config(H5AC2_cache_config_t * config_ptr)
     }
 
     if ( ( config_ptr->evictions_enabled == FALSE ) &&
-	 ( ( config_ptr->incr_mode != H5C2_incr__off ) || 
+	 ( ( config_ptr->incr_mode != H5C2_incr__off ) ||
 	   ( config_ptr->incr_mode != H5C2_decr__off ) ) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
@@ -3939,7 +3939,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5AC2_validate_jnl_config()
  *
- * Purpose:     Run a sanity check on the contents of the supplied 
+ * Purpose:     Run a sanity check on the contents of the supplied
  * 		instance of H5AC2_jnl_config_t.
  *
  *              Do nothing and return SUCCEED if no errors are detected,
@@ -4000,7 +4000,7 @@ H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr)
 	if(NULL == config_ptr->journal_file_path)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->journal_file_path is NULL.")
 
-	/* Can't really test the journal_file_path field without trying to 
+	/* Can't really test the journal_file_path field without trying to
 	 * open the file, so we will content ourselves with a couple of
 	 * sanity checks on the length of the file name.
 	 */
@@ -4119,7 +4119,7 @@ H5AC2_validate_cache_config_ver(int version_num)
  *
  * Modifications:
  *
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *              					JRM - 10/18/07
  *
@@ -4184,7 +4184,7 @@ done:
  *
  * Modifications:
  *
- *              Modified code in support of revised cache API needed 
+ *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *              					JRM - 10/18/07
  *
@@ -5665,7 +5665,7 @@ H5AC2_receive_and_apply_clean_list(H5F_t *   f,
 
 
         /* mark the indicated entries as clean */
-        if ( H5C2_mark_entries_as_clean(f, dxpl_id, 
+        if ( H5C2_mark_entries_as_clean(f, dxpl_id,
                                         (int32_t)num_entries,
                                         &(haddr_buf_ptr[0])) < 0 ) {
 
diff --git a/src/H5AC2private.h b/src/H5AC2private.h
index 1708295..abd12ed 100644
--- a/src/H5AC2private.h
+++ b/src/H5AC2private.h
@@ -293,7 +293,7 @@ H5_DLL herr_t H5AC2_check_for_journaling(H5F_t * f,
 H5_DLL herr_t H5AC2_deregister_mdjsc_callback(H5F_t * file_ptr,
                                               int32_t idx);
 
-H5_DLL herr_t H5AC2_create(H5F_t *f, 
+H5_DLL herr_t H5AC2_create(H5F_t *f,
 			   H5AC2_cache_config_t *config_ptr);
 
 H5_DLL herr_t H5AC2_begin_transaction(hid_t id,
@@ -316,7 +316,7 @@ H5_DLL herr_t H5AC2_get_entry_status(H5F_t * f, haddr_t addr,
 				    unsigned * status_ptr);
 
 H5_DLL herr_t H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
-                        haddr_t addr, size_t len, void *thing, 
+                        haddr_t addr, size_t len, void *thing,
 			unsigned int flags);
 H5_DLL herr_t H5AC2_pin_protected_entry(void *  thing);
 H5_DLL void * H5AC2_protect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
diff --git a/src/H5AC2public.h b/src/H5AC2public.h
index 8c4051c..5a57913 100644
--- a/src/H5AC2public.h
+++ b/src/H5AC2public.h
@@ -55,7 +55,7 @@ extern "C" {
  * structure.
  *
  * Similarly, the open_trace_file, close_trace_file, and trace_file_name
- * fields do not appear in H5C2_auto_size_ctl_t, as most trace file 
+ * fields do not appear in H5C2_auto_size_ctl_t, as most trace file
  * issues are handled at the H5AC2 level.  The one exception is storage of
  * the pointer to the trace file, which is handled by H5C2.
  *
@@ -80,7 +80,7 @@ extern "C" {
  *
  * 	The trace file is a debuging feature that allow the capture of
  * 	top level metadata cache requests for purposes of debugging and/or
- * 	optimization.  This field should normally be set to FALSE, as 
+ * 	optimization.  This field should normally be set to FALSE, as
  * 	trace file collection imposes considerable overhead.
  *
  * 	This field should only be set to TRUE when the trace_file_name
@@ -98,7 +98,7 @@ extern "C" {
  * trace_file_name: Full path of the trace file to be opened if the
  * 	open_trace_file field is TRUE.
  *
- * 	In the parallel case, an ascii representation of the mpi rank of 
+ * 	In the parallel case, an ascii representation of the mpi rank of
  * 	the process will be appended to the file name to yield a unique
  * 	trace file name for each process.
  *
@@ -106,12 +106,12 @@ extern "C" {
  * 	characters.
  *
  * evictions_enabled:  Boolean field used to either report the current
- * 	evictions enabled status of the cache, or to set the cache's 
+ * 	evictions enabled status of the cache, or to set the cache's
  *	evictions enabled status.
  *
- * 	In general, the metadata cache should always be allowed to 
- * 	evict entries.  However, in some cases it is advantageous to 
- * 	disable evictions briefly, and thereby postpone metadata 
+ * 	In general, the metadata cache should always be allowed to
+ * 	evict entries.  However, in some cases it is advantageous to
+ * 	disable evictions briefly, and thereby postpone metadata
  * 	writes.  However, this must be done with care, as the cache
  * 	can grow quickly.  If you do this, re-enable evictions as
  * 	soon as possible and monitor cache size.
@@ -177,7 +177,7 @@ extern "C" {
  *              at its maximum size, or if the cache is not already using
  *              all available space.
  *
- *      Note that you must set decr_mode to H5C2_incr__off if you 
+ *      Note that you must set decr_mode to H5C2_incr__off if you
  *      disable metadata cache entry evictions.
  *
  * lower_hr_threshold: Lower hit rate threshold.  If the increment mode
@@ -291,7 +291,7 @@ extern "C" {
  *              over the last epoch exceeds the value provided in the
  *              upper_hr_threshold field.
  *
- *      Note that you must set decr_mode to H5C2_decr__off if you 
+ *      Note that you must set decr_mode to H5C2_decr__off if you
  *      disable metadata cache entry evictions.
  *
  * upper_hr_threshold: Upper hit rate threshold.  The use of this field
@@ -449,11 +449,11 @@ typedef struct H5AC2_cache_config_t
  * structure H5AC2_jnl_config_t
  *
  * H5AC2_jnl_config_t is a public structure intended for use in public APIs.
- * At least in its initial incarnation, it is intended to package all the 
- * data needed to configure metadata journaling.  In the future, we may 
+ * At least in its initial incarnation, it is intended to package all the
+ * data needed to configure metadata journaling.  In the future, we may
  * use it to package configuration data for other types of journaling as well.
  *
- * The fields of the structure are discussed individually below.  Note 
+ * The fields of the structure are discussed individually below.  Note
  * that the fields with the "jbrb_" prefix are used to configure the
  * journal buffer ring buffer -- a ring buffer of buffers used to buffer
  * output of journal messages.
@@ -463,17 +463,17 @@ typedef struct H5AC2_cache_config_t
  *      H5AC2_cache_config_t passed to the cache must have a known
  *      version number, or an error will be flagged.
  *
- * enable_journaling:  Boolean flag that is set to TRUE if journaling is 
- * 	to be enabled, and to FALSE otherwise.  
+ * enable_journaling:  Boolean flag that is set to TRUE if journaling is
+ * 	to be enabled, and to FALSE otherwise.
  *
  * 	When the cache configuration is reported, this field is TRUE iff
  * 	journaling is enabled.
  *
- * journal_file_path:  Full path of the file to be used to store the 
+ * journal_file_path:  Full path of the file to be used to store the
  * 	metadata journal.  This field is only defined if enable_journaling
  * 	is TRUE.
  *
- * 	At present, the length of the journal file path is restricted to 
+ * 	At present, the length of the journal file path is restricted to
  * 	no more than H5AC2__MAX_JOURNAL_FILE_NAME_LEN.
  *
  * journal_recovered:  Boolean flag use to indicate that we are opening
@@ -483,22 +483,22 @@ typedef struct H5AC2_cache_config_t
  * 	Unless you are the writer of a new journal recovery tool, you
  * 	should always set this field to FALSE.
  *
- * jbrb_buf_size: size_t containing the size of each individual buffer 
+ * jbrb_buf_size: size_t containing the size of each individual buffer
  * 	in the journal buffer ring buffer.  This size should be chosen
- * 	to be some multiple of the block size used by the file system 
+ * 	to be some multiple of the block size used by the file system
  * 	on which the journal file will be written.
  *
  * jbrb_num_bufs: Integer containing the number of buffers in the journal
  * 	buffer ring buffer.  If synchronous I/O is used, one or two buffers
  * 	is sufficient.  If asynchronous I/O is used, the number of buffers
- * 	should be sufficiently large that a write on buffer is likely to 
+ * 	should be sufficiently large that a write on buffer is likely to
  * 	complete before that buffer is needed again.
  *
- * jbrb_use_aio:  Boolean flag indicating whether we should use 
+ * jbrb_use_aio:  Boolean flag indicating whether we should use
  * 	asynchronous I/O for journal entry writes.
  *
  * jbrb_human_readable: Boolean flag which determines whether the journal
- * 	file will be written in human readable form.  In general, this 
+ * 	file will be written in human readable form.  In general, this
  * 	field should be set to false, as the human readable journal
  * 	file is at least twice a large as the machine readable version.
  *
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h
index 97be6f4..592b499 100644
--- a/src/H5ACpublic.h
+++ b/src/H5ACpublic.h
@@ -58,7 +58,7 @@ extern "C" {
  * structure.
  *
  * Similarly, the open_trace_file, close_trace_file, and trace_file_name
- * fields do not appear in H5C_auto_size_ctl_t, as most trace file 
+ * fields do not appear in H5C_auto_size_ctl_t, as most trace file
  * issues are handled at the H5AC level.  The one exception is storage of
  * the pointer to the trace file, which is handled by H5C.
  *
@@ -83,7 +83,7 @@ extern "C" {
  *
  * 	The trace file is a debuging feature that allow the capture of
  * 	top level metadata cache requests for purposes of debugging and/or
- * 	optimization.  This field should normally be set to FALSE, as 
+ * 	optimization.  This field should normally be set to FALSE, as
  * 	trace file collection imposes considerable overhead.
  *
  * 	This field should only be set to TRUE when the trace_file_name
@@ -101,7 +101,7 @@ extern "C" {
  * trace_file_name: Full path of the trace file to be opened if the
  * 	open_trace_file field is TRUE.
  *
- * 	In the parallel case, an ascii representation of the mpi rank of 
+ * 	In the parallel case, an ascii representation of the mpi rank of
  * 	the process will be appended to the file name to yield a unique
  * 	trace file name for each process.
  *
@@ -109,12 +109,12 @@ extern "C" {
  * 	characters.
  *
  * evictions_enabled:  Boolean field used to either report the current
- * 	evictions enabled status of the cache, or to set the cache's 
+ * 	evictions enabled status of the cache, or to set the cache's
  *	evictions enabled status.
  *
- * 	In general, the metadata cache should always be allowed to 
- * 	evict entries.  However, in some cases it is advantageous to 
- * 	disable evictions briefly, and thereby postpone metadata 
+ * 	In general, the metadata cache should always be allowed to
+ * 	evict entries.  However, in some cases it is advantageous to
+ * 	disable evictions briefly, and thereby postpone metadata
  * 	writes.  However, this must be done with care, as the cache
  * 	can grow quickly.  If you do this, re-enable evictions as
  * 	soon as possible and monitor cache size.
@@ -180,7 +180,7 @@ extern "C" {
  *              at its maximum size, or if the cache is not already using
  *              all available space.
  *
- *      Note that you must set decr_mode to H5C_incr__off if you 
+ *      Note that you must set decr_mode to H5C_incr__off if you
  *      disable metadata cache entry evictions.
  *
  * lower_hr_threshold: Lower hit rate threshold.  If the increment mode
@@ -217,7 +217,7 @@ extern "C" {
  *      The addition of the flash increment mode was occasioned by performance
  *      problems that appear when a local heap is increased to a size in excess
  *      of the current cache size.  While the existing re-size code dealt with
- *      this eventually, performance was very bad for the remainder of the 
+ *      this eventually, performance was very bad for the remainder of the
  *      epoch.
  *
  *      At present, there are two possible values for the flash_incr_mode:
@@ -242,20 +242,20 @@ extern "C" {
  *
  *      With a little thought, it should be obvious that the above flash
  *      cache size increase algorithm is not sufficient for all circumstances --
- *      for example, suppose the user round robins through 
+ *      for example, suppose the user round robins through
  *      (1/flash_threshold) +1 groups, adding one data set to each on each
  *      pass.  Then all will increase in size at about the same time, requiring
  *      the max cache size to at least double to maintain acceptable
  *      performance, however the above flash increment algorithm will not be
  *      triggered.
  *
- *      Hopefully, the add space algorithms detailed above will be sufficient 
- *      for the performance problems encountered to date.  However, we should 
+ *      Hopefully, the add space algorithms detailed above will be sufficient
+ *      for the performance problems encountered to date.  However, we should
  *      expect to revisit the issue.
  *
  * flash_multiple: Double containing the multiple described above in the
- *      H5C_flash_incr__add_space section of the discussion of the 
- *      flash_incr_mode section.  This field is ignored unless flash_incr_mode 
+ *      H5C_flash_incr__add_space section of the discussion of the
+ *      flash_incr_mode section.  This field is ignored unless flash_incr_mode
  *      is H5C_flash_incr__add_space.
  *
  * flash_threshold: Double containing the factor by which current max cache size
@@ -295,7 +295,7 @@ extern "C" {
  *              over the last epoch exceeds the value provided in the
  *              upper_hr_threshold field.
  *
- *      Note that you must set decr_mode to H5C_decr__off if you 
+ *      Note that you must set decr_mode to H5C_decr__off if you
  *      disable metadata cache entry evictions.
  *
  * upper_hr_threshold: Upper hit rate threshold.  The use of this field
diff --git a/src/H5Adense.c b/src/H5Adense.c
index 79cd6fe..4f9dcce 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -1475,7 +1475,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, 
+H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t n)
 {
     H5HF_t *fheap = NULL;               /* Fractal heap handle */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index 23a4e15..2469579 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -384,7 +384,7 @@ H5A_attr_cmp_name_inc(const void *attr1, const void *attr2)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_inc)
 
-    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr1)->shared->name, 
+    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr1)->shared->name,
             (*(const H5A_t **)attr2)->shared->name))
 } /* end H5A_attr_cmp_name_inc() */
 
@@ -412,7 +412,7 @@ H5A_attr_cmp_name_dec(const void *attr1, const void *attr2)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_dec)
 
-    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr2)->shared->name, 
+    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr2)->shared->name,
             (*(const H5A_t **)attr1)->shared->name))
 } /* end H5A_attr_cmp_name_dec() */
 
@@ -679,7 +679,7 @@ H5O_ainfo_t *
 H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo)
 {
     H5O_ainfo_t *ret_value;     /* Return value */
-    
+
     FUNC_ENTER_NOAPI(H5A_get_ainfo, NULL)
 
     /* check arguments */
@@ -731,7 +731,7 @@ H5A_set_version(const H5F_t *f, H5A_t *attr)
 {
     hbool_t type_shared, space_shared;  /* Flags to indicate that shared messages are used for this attribute */
     hbool_t use_latest_format;          /* Flag indicating the newest file format should be used */
-    
+
     FUNC_ENTER_NOAPI_NOFUNC(H5A_set_version)
 
     /* check arguments */
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 3586bad..99ca90e 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -48,7 +48,7 @@ H5_DLL hid_t   H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char
 H5_DLL hid_t   H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
 H5_DLL hid_t   H5Aopen_by_name(hid_t loc_id, const char *obj_name,
     const char *attr_name, hid_t aapl_id, hid_t lapl_id);
-H5_DLL hid_t   H5Aopen_by_idx(hid_t loc_id, const char *obj_name, 
+H5_DLL hid_t   H5Aopen_by_idx(hid_t loc_id, const char *obj_name,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id,
     hid_t lapl_id);
 H5_DLL herr_t  H5Awrite(hid_t attr_id, hid_t type_id, const void *buf);
@@ -86,7 +86,7 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name,
     const char *attr_name, hid_t lapl_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 9a10ad9..85b0db7 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -66,22 +66,22 @@
 /* Metadata cache callbacks */
 static void *H5B2_cache_hdr_deserialize(haddr_t addr, size_t len,
     const void *image, void *udata, hbool_t *dirty);
-static herr_t H5B2_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id, 
-    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, 
+static herr_t H5B2_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id,
+    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags,
     haddr_t *new_addr, size_t *new_len, void **new_image);
 static herr_t H5B2_cache_hdr_free_icr(haddr_t addr, size_t len, void *thing);
 
 static void *H5B2_cache_internal_deserialize(haddr_t addr, size_t len,
     const void *image, void *udata, hbool_t *dirty);
 static herr_t H5B2_cache_internal_serialize(const H5F_t *f, hid_t dxpl_id,
-    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, 
+    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags,
     haddr_t *new_addr, size_t *new_len, void **new_image);
 static herr_t H5B2_cache_internal_free_icr(haddr_t addr, size_t len, void *thing);
 
 static void *H5B2_cache_leaf_deserialize(haddr_t addr, size_t len,
     const void *image, void *udata, hbool_t *dirty);
-static herr_t H5B2_cache_leaf_serialize(const H5F_t *f, hid_t dxpl_id, 
-    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, 
+static herr_t H5B2_cache_leaf_serialize(const H5F_t *f, hid_t dxpl_id,
+    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags,
     haddr_t *new_addr, size_t *new_len, void **new_image);
 static herr_t H5B2_cache_leaf_free_icr(haddr_t addr, size_t len, void *thing);
 
@@ -152,7 +152,7 @@ const H5AC2_class_t H5AC2_BT2_LEAF[1] = {{
  *-------------------------------------------------------------------------
  */
 static void *
-H5B2_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len, 
+H5B2_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     const void *image, void *_udata, hbool_t UNUSED *dirty)
 {
     H5B2_hdr_cache_ud_t *udata = (H5B2_hdr_cache_ud_t *)_udata;
@@ -256,8 +256,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, 
-    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, 
+H5B2_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id,
+    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing,
     unsigned *flags, haddr_t UNUSED *new_addr,
     size_t UNUSED *new_len, void UNUSED **new_image)
 {
@@ -500,9 +500,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_cache_internal_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, 
-    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, 
-    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, 
+H5B2_cache_internal_serialize(const H5F_t *f, hid_t UNUSED dxpl_id,
+    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing,
+    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len,
     void UNUSED **new_image)
 {
     H5B2_shared_t *shared;  /* Shared B-tree information */
@@ -731,9 +731,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B2_cache_leaf_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, 
-    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, 
-    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, 
+H5B2_cache_leaf_serialize(const H5F_t *f, hid_t UNUSED dxpl_id,
+    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing,
+    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len,
     void UNUSED **new_image)
 {
     H5B2_shared_t *shared;  /* Shared B-tree information */
diff --git a/src/H5B2int.c b/src/H5B2int.c
index a6d85b4..d991347 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -220,7 +220,7 @@ HDmemset(shared->page, 0, shared->node_size);
             shared->node_info[u].split_nrec = (shared->node_info[u].max_nrec * shared->split_percent) / 100;
             shared->node_info[u].merge_nrec = (shared->node_info[u].max_nrec * shared->merge_percent) / 100;
 
-            shared->node_info[u].cum_max_nrec = ((shared->node_info[u].max_nrec + 1) * 
+            shared->node_info[u].cum_max_nrec = ((shared->node_info[u].max_nrec + 1) *
                 shared->node_info[u - 1].cum_max_nrec) + shared->node_info[u].max_nrec;
             u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[u].cum_max_nrec);
             H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[u].cum_max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char)
@@ -591,7 +591,7 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr)
     H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[shared->depth].max_nrec, /* From: */ sz_max_nrec, /* From: */ size_t, /* To: */ unsigned)
     shared->node_info[shared->depth].split_nrec = (shared->node_info[shared->depth].max_nrec * shared->split_percent) / 100;
     shared->node_info[shared->depth].merge_nrec = (shared->node_info[shared->depth].max_nrec * shared->merge_percent) / 100;
-    shared->node_info[shared->depth].cum_max_nrec = ((shared->node_info[shared->depth].max_nrec + 1) * 
+    shared->node_info[shared->depth].cum_max_nrec = ((shared->node_info[shared->depth].max_nrec + 1) *
         shared->node_info[shared->depth - 1].cum_max_nrec) + shared->node_info[shared->depth].max_nrec;
     u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[shared->depth].cum_max_nrec);
     H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[shared->depth].cum_max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char)
@@ -3246,22 +3246,22 @@ done:
 
 /*-------------------------------------------------------------------------
  * Function:    H5B2_iterate_size_node
- *      
+ *
  * Purpose:     Iterate over all the records from a B-tree node, collecting
  *		btree storage info.
- *  
+ *
  * Return:      non-negative on success, negative on error
- *  
+ *
  * Programmer:  Vailin Choi
  *              July 12 2007
- *      
+ *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5B2_iterate_size_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
     const H5B2_node_ptr_t *curr_node, hsize_t *btree_size)
 {
-    H5B2_shared_t 	*shared;        	/* Pointer to B-tree's shared information */    
+    H5B2_shared_t 	*shared;        	/* Pointer to B-tree's shared information */
     H5B2_internal_t 	*internal = NULL;     	/* Pointer to internal node */
     herr_t 		ret_value = SUCCEED;  	/* Iterator return value */
 
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index c88360d..3a2cbcd 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -143,7 +143,7 @@ typedef struct H5B2_internal_cache_ud_t {
 /* Callback info for loading a free space leaf node into the cache */
 typedef struct H5B2_leaf_cache_ud_t {
     H5F_t *f;                   /* File that v2 b-tree header is within */
-    const unsigned *nrec;             /* Number of records in node to load */ 
+    const unsigned *nrec;             /* Number of records in node to load */
     H5RC_t *bt2_shared;         /* Ref counter for shared B-tree info */
 } H5B2_leaf_cache_ud_t;
 
diff --git a/src/H5Bcache.c b/src/H5Bcache.c
index ac34564..b6dedb2 100644
--- a/src/H5Bcache.c
+++ b/src/H5Bcache.c
@@ -56,8 +56,8 @@
 /* Metadata cache callbacks */
 static void *H5B_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
-static herr_t H5B_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-    size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, 
+static herr_t H5B_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+    size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr,
     size_t *new_len, void **new_image);
 static herr_t H5B_free_icr(haddr_t addr, size_t len, void *thing);
 
@@ -202,8 +202,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5B_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5B_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5B_t *bt = (H5B_t *)_thing;        /* Pointer to the B-tree node */
diff --git a/src/H5C.c b/src/H5C.c
index daa5c8b..8c08777 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -538,7 +538,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
  * 	More pinned entry stats related updates.
  *
  * 	JRM -- 3/31/07
- * 	Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on 
+ * 	Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on
  * 	read and write protects.
  *
  ***********************************************************************/
@@ -1117,12 +1117,12 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		JRM -- 8/25/06
  *		Added the H5C_DO_SANITY_CHECKS version of the macro.
  *
- *		This version maintains the slist_len_increase and 
+ *		This version maintains the slist_len_increase and
  *		slist_size_increase fields that are used in sanity
  *		checks in the flush routines.
  *
- *		All this is needed as the fractal heap needs to be 
- *		able to dirty, resize and/or rename entries during the 
+ *		All this is needed as the fractal heap needs to be
+ *		able to dirty, resize and/or rename entries during the
  *		flush.
  *
  *-------------------------------------------------------------------------
@@ -1209,7 +1209,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		Switched over to using skip list routines.
  *
  *		JRM -- 3/28/07
- *		Updated sanity checks for the new is_read_only and 
+ *		Updated sanity checks for the new is_read_only and
  *		ro_ref_count fields in H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -1257,11 +1257,11 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		JRM -- 8/27/06
  *		Added the H5C_DO_SANITY_CHECKS version of the macro.
  *
- *		This version maintains the slist_size_increase field 
+ *		This version maintains the slist_size_increase field
  *		that are used in sanity checks in the flush routines.
  *
- *		All this is needed as the fractal heap needs to be 
- *		able to dirty, resize and/or rename entries during the 
+ *		All this is needed as the fractal heap needs to be
+ *		able to dirty, resize and/or rename entries during the
  *		flush.
  *
  *-------------------------------------------------------------------------
@@ -1352,7 +1352,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		to do if called for such an entry.
  *
  *		JRM -- 3/28/07
- *		Added sanity checks using the new is_read_only and 
+ *		Added sanity checks using the new is_read_only and
  *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -1494,7 +1494,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		be called on a pinned entry.  Added assert to verify this.
  *
  *		JRM -- 3/28/07
- *		Added sanity checks for the new is_read_only and 
+ *		Added sanity checks for the new is_read_only and
  *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -1749,7 +1749,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		Inserted an assert to verify this.
  *
  *		JRM - 8/9/06
- *		Not any more.  We must now allow insertion of pinned 
+ *		Not any more.  We must now allow insertion of pinned
  *		entries.  Updated macro to support this.
  *
  *		JRM - 3/28/07
@@ -1888,7 +1888,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		maintained by the replacement policy.
  *
  *		JRM - 3/28/07
- *		Added sanity checks based on the new is_read_only and 
+ *		Added sanity checks based on the new is_read_only and
  *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -2052,7 +2052,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		nothing to be done.
  *
  *		JRM - 3/28/07
- *		Added sanity checks using the new is_read_only and 
+ *		Added sanity checks using the new is_read_only and
  *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -2174,7 +2174,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  *		To do this, determine if the entry is pinned.  If it is,
  *		update the size of the pinned entry list.
  *
- *		If it isn't pinned, the entry must handled by the 
+ *		If it isn't pinned, the entry must handled by the
  *		replacement policy.  Update the appropriate replacement
  *		policy data structures.
  *
@@ -2190,7 +2190,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  * Modifications:
  *
  * 		JRM -- 3/28/07
- *		Added sanity checks based on the new is_read_only and 
+ *		Added sanity checks based on the new is_read_only and
  *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -2314,7 +2314,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
  * Modifications:
  *
  *		JRM -- 3/28/07
- *		Added sanity checks based on the new is_read_only and 
+ *		Added sanity checks based on the new is_read_only and
  *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -2658,7 +2658,7 @@ static herr_t H5C_verify_not_in_index(H5C_t * cache_ptr,
 static void *H5C_epoch_marker_load(H5F_t *f, hid_t dxpl_id, haddr_t addr,
                                    const void *udata1, void *udata2);
 static herr_t H5C_epoch_marker_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest,
-                                     haddr_t addr, void *thing, 
+                                     haddr_t addr, void *thing,
 				     unsigned *flags_ptr);
 static herr_t H5C_epoch_marker_dest(H5F_t *f, void *thing);
 static herr_t H5C_epoch_marker_clear(H5F_t *f, void *thing, hbool_t dest);
@@ -2831,16 +2831,16 @@ done:
  *
  *		JRM -- 8/25/06
  *		Added initialization for the slist_len_increase and
- *		slist_size_increase fields.  These fields are used 
+ *		slist_size_increase fields.  These fields are used
  *		for sanity checking in the flush process, and are not
  *		compiled in unless H5C_DO_SANITY_CHECKS is TRUE.
  *
  *		JRM -- 3/28/07
- *		Added initialization for the new is_read_only and 
+ *		Added initialization for the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM -- 7/27/07
- *		Added initialization for the new evictions_enabled 
+ *		Added initialization for the new evictions_enabled
  *		field of H5C_t.
  *
  *		JRM -- 12/31/07
@@ -3151,9 +3151,9 @@ H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
 
             HDfprintf(stdout,
                       "%sflash cache resize(%d) -- size threshold = %Zu.\n",
-                      cache_ptr->prefix, 
+                      cache_ptr->prefix,
                       (int)((cache_ptr->resize_ctl).flash_incr_mode),
-                      cache_ptr->flash_size_increase_threshold); 
+                      cache_ptr->flash_size_increase_threshold);
 
             HDfprintf(stdout,
                     "%s	cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n",
@@ -3390,8 +3390,8 @@ done:
  *
  * Function:    H5C_expunge_entry
  *
- * Purpose:     Use this function to tell the cache to expunge an entry 
- * 		from the cache without writing it to disk even if it is 
+ * Purpose:     Use this function to tell the cache to expunge an entry
+ * 		from the cache without writing it to disk even if it is
  * 		dirty.  The entry may not be either pinned or protected.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -3459,7 +3459,7 @@ H5C_expunge_entry(H5F_t *             f,
 		    "Target entry is pinned.")
     }
 
-    /* If we get this far, call H5C_flush_single_entry() with the 
+    /* If we get this far, call H5C_flush_single_entry() with the
      * H5C__FLUSH_INVALIDATE_FLAG and the H5C__FLUSH_CLEAR_ONLY_FLAG.
      * This will clear the entry, and then delete it from the cache.
      */
@@ -3470,7 +3470,7 @@ H5C_expunge_entry(H5F_t *             f,
                                     cache_ptr,
                                     entry_ptr->type,
                                     entry_ptr->addr,
-                                    H5C__FLUSH_INVALIDATE_FLAG | 
+                                    H5C__FLUSH_INVALIDATE_FLAG |
 				    H5C__FLUSH_CLEAR_ONLY_FLAG,
                                     &first_flush,
                                     TRUE);
@@ -3568,12 +3568,12 @@ done:
  *		Updated function to handle pinned entries.
  *
  *		JRM -- 8/19/06
- *		Added code managing the new flush_in_progress field of 
+ *		Added code managing the new flush_in_progress field of
  *		H5C_t.
  *
  *		Also reworked function to allow for the possibility that
  *		entries will be dirtied, resized, or renamed during flush
- *		callbacks.  As a result, we may have to make multiple 
+ *		callbacks.  As a result, we may have to make multiple
  *		passes through the skip list before the cache is flushed.
  *
  *              JRM -- 10/13/07
@@ -3587,8 +3587,8 @@ done:
  *
  *              Note that this is a pretty bad scenario if it ever
  *              happens.  The code I have added should allow us to
- *              handle the situation under all but the worst conditions, 
- *              but one can argue that I should just scream and die if I 
+ *              handle the situation under all but the worst conditions,
+ *              but one can argue that I should just scream and die if I
  *              ever detect the condidtion.
  *
  *-------------------------------------------------------------------------
@@ -3697,7 +3697,7 @@ H5C_flush_cache(H5F_t *  f,
                 next_entry_ptr = NULL;
 
             }
-       
+
 	    HDassert( node_ptr != NULL );
 
 #if H5C_DO_SANITY_CHECKS
@@ -3712,7 +3712,7 @@ H5C_flush_cache(H5F_t *  f,
 	     * fractal heap, the entry flush callback can cause entries
 	     * to be dirtied, resized, and/or renamed.
 	     *
-	     * To deal with this, we first make note of the initial 
+	     * To deal with this, we first make note of the initial
 	     * skip list length and size:
 	     */
             initial_slist_len = cache_ptr->slist_len;
@@ -3724,12 +3724,12 @@ H5C_flush_cache(H5F_t *  f,
             flushed_entries_count = 0;
             flushed_entries_size = 0;
 
-	    /* As mentioned above, there is the possibility that 
+	    /* As mentioned above, there is the possibility that
 	     * entries will be dirtied, resized, and/or flushed during
-	     * our pass through the skip list.  To capture the number 
-	     * of entries added, and the skip list size delta, 
+	     * our pass through the skip list.  To capture the number
+	     * of entries added, and the skip list size delta,
 	     * zero the slist_len_increase and slist_size_increase of
-	     * the cache's instance of H5C_t.  These fields will be 
+	     * the cache's instance of H5C_t.  These fields will be
 	     * updated elsewhere to account for slist insertions and/or
 	     * dirty entry size changes.
 	     */
@@ -3780,7 +3780,7 @@ H5C_flush_cache(H5F_t *  f,
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                                 "entry_ptr->magic invalid ?!?!");
 
-	        } else 
+	        } else
 #endif /* NDEBUG */
 		if ( ( ! entry_ptr->is_dirty ) ||
                      ( ! entry_ptr->in_slist ) ) {
@@ -3817,7 +3817,7 @@ H5C_flush_cache(H5F_t *  f,
                 HDassert( entry_ptr != NULL );
                 HDassert( entry_ptr->in_slist );
 
-                if ( ( ! flush_marked_entries ) || 
+                if ( ( ! flush_marked_entries ) ||
                      ( entry_ptr->flush_marker ) ) {
 
                     if ( entry_ptr->is_protected ) {
@@ -3855,7 +3855,7 @@ H5C_flush_cache(H5F_t *  f,
                                                             FALSE);
                             if ( status < 0 ) {
 
-                                /* This shouldn't happen -- if it does, we are 
+                                /* This shouldn't happen -- if it does, we are
 			         * toast so just scream and die.
                                  */
                                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
@@ -3879,7 +3879,7 @@ H5C_flush_cache(H5F_t *  f,
                                                         FALSE);
                         if ( status < 0 ) {
 
-                            /* This shouldn't happen -- if it does, we are 
+                            /* This shouldn't happen -- if it does, we are
 			     * toast so just scream and die.
                              */
                             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
@@ -3893,7 +3893,7 @@ H5C_flush_cache(H5F_t *  f,
 #if H5C_DO_SANITY_CHECKS
             /* Verify that the slist size and length are as expected. */
 
-	    HDassert( (initial_slist_len + cache_ptr->slist_len_increase - 
+	    HDassert( (initial_slist_len + cache_ptr->slist_len_increase -
                        flushed_entries_count) == cache_ptr->slist_len );
 	    HDassert( (initial_slist_size + cache_ptr->slist_size_increase -
 		       flushed_entries_size) == cache_ptr->slist_size );
@@ -3984,7 +3984,7 @@ done:
  *		find a case where it helps, lets get rid of it.
  *
  *
- *		Added some sanity checks to the change which verify the 
+ *		Added some sanity checks to the change which verify the
  *		expected values of the new is_read_only and ro_ref_count
  *		fields.
  *						JRM - 3/29/07
@@ -4491,7 +4491,7 @@ done:
  * Purpose:     Get the trace_file_ptr field from the cache.
  *
  *              This field will either be NULL (which indicates that trace
- *              file logging is turned off), or contain a pointer to the 
+ *              file logging is turned off), or contain a pointer to the
  *              open file to which trace file data is to be written.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -4601,11 +4601,11 @@ done:
  *		destroy_in_progress fields.
  *
  *		JRM -- 3/29/07
- *		Added initialization for the new is_read_only and 
+ *		Added initialization for the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM -- 8/1/07
- *		Added code to disable evictions when the new 
+ *		Added code to disable evictions when the new
  *		evictions_enabled field is FALSE.
  *
  *		JRM -- 12/31/07
@@ -4717,7 +4717,7 @@ H5C_insert_entry(H5F_t * 	     f,
     }
 
     if ( ( cache_ptr->evictions_enabled ) &&
-         ( (cache_ptr->index_size + entry_ptr->size) > 
+         ( (cache_ptr->index_size + entry_ptr->size) >
 	    cache_ptr->max_cache_size ) ) {
 
         size_t space_needed;
@@ -5191,7 +5191,7 @@ done:
  *
  * Modifications:
  *
- * 		Added code to do a flash cache size increase if 
+ * 		Added code to do a flash cache size increase if
  * 		appropriate.
  * 						JRM -- 1/11/08
  *
@@ -5242,7 +5242,7 @@ H5C_mark_pinned_entry_dirty(H5C_t * cache_ptr,
 
                 size_increase = new_size - entry_ptr->size;
 
-                if ( size_increase >= 
+                if ( size_increase >=
 		     cache_ptr->flash_size_increase_threshold ) {
 
                     result = H5C__flash_increase_cache_size(cache_ptr,
@@ -5494,7 +5494,7 @@ H5C_rename_entry(H5C_t *	     cache_ptr,
      * Since this is a simple re-name, cache size should be unaffected.
      *
      * Check to see if the target entry is in the process of being destroyed
-     * before we delete from the index, etc.  If it is, all we do is 
+     * before we delete from the index, etc.  If it is, all we do is
      * change the addr.  If the entry is only in the process of being flushed,
      * don't mark it as dirty either, lest we confuse the flush call back.
      */
@@ -5538,7 +5538,7 @@ H5C_rename_entry(H5C_t *	     cache_ptr,
 
             if ( removed_entry_from_slist ) {
 
-		/* we just removed the entry from the slist.  Thus we 
+		/* we just removed the entry from the slist.  Thus we
 		 * must touch up cache_ptr->slist_len_increase and
 		 * cache_ptr->slist_size_increase to keep from skewing
 		 * the sanity checks.
@@ -5579,8 +5579,8 @@ done:
  * Purpose:	Resize a pinned entry.  The target entry MUST be
  * 		be pinned, and MUST not be unprotected.
  *
- * 		Resizing an entry dirties it, so if the entry is not 
- * 		already dirty, the function places the entry on the 
+ * 		Resizing an entry dirties it, so if the entry is not
+ * 		already dirty, the function places the entry on the
  * 		skip list.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -5590,7 +5590,7 @@ done:
  *
  * Modifications:
  *
- * 		Added code to apply a flash cache size increment if 
+ * 		Added code to apply a flash cache size increment if
  * 		appropriate.
  * 						JRM -- 1/11/08
  *
@@ -5633,8 +5633,8 @@ H5C_resize_pinned_entry(H5C_t * cache_ptr,
                     "Entry is protected??")
     }
 
-    /* resizing dirties entries -- mark the entry as dirty if it 
-     * isn't already 
+    /* resizing dirties entries -- mark the entry as dirty if it
+     * isn't already
      */
     entry_ptr->is_dirty = TRUE;
 
@@ -5648,7 +5648,7 @@ H5C_resize_pinned_entry(H5C_t * cache_ptr,
 
                 size_increase = new_size - entry_ptr->size;
 
-                if ( size_increase >= 
+                if ( size_increase >=
 		     cache_ptr->flash_size_increase_threshold ) {
 
                     result = H5C__flash_increase_cache_size(cache_ptr,
@@ -5720,12 +5720,12 @@ done:
  *		entries.
  *
  *		JRM -- 2/16/07
- *		Added conditional compile to avoid unused parameter 
+ *		Added conditional compile to avoid unused parameter
  *		warning in production compile.
  *
  *		JRM -- 4/4/07
- *		Fixed typo -- canged macro call to 
- *		H5C__UPDATE_STATS_FOR_UNPIN to call to 
+ *		Fixed typo -- canged macro call to
+ *		H5C__UPDATE_STATS_FOR_UNPIN to call to
  *		H5C__UPDATE_STATS_FOR_PIN.
  *
  *-------------------------------------------------------------------------
@@ -5839,12 +5839,12 @@ done:
  *
  *		JRM -- 6/23/06
  *		Modified code to allow dirty entries to be loaded from
- *		disk.  This is necessary as a bug fix in the object 
+ *		disk.  This is necessary as a bug fix in the object
  *		header code requires us to modify a header as it is read.
  *
  *		JRM -- 3/28/07
  *		Added the flags parameter and supporting code.  At least
- *		for now, this parameter is used to allow the entry to 
+ *		for now, this parameter is used to allow the entry to
  *		be protected read only, thus allowing multiple protects.
  *
  * 		Also added code to allow multiple read only protects
@@ -5855,7 +5855,7 @@ done:
  * 		in H5C_t.
  *
  * 		JRM -- 1/3/08
- * 		Added to do a flash cache size increase if appropriate 
+ * 		Added to do a flash cache size increase if appropriate
  * 		when a large entry is loaded.
  *
  *-------------------------------------------------------------------------
@@ -5936,7 +5936,7 @@ H5C_protect(H5F_t *	        f,
         if ( ( cache_ptr->flash_size_increase_possible ) &&
              ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) {
 
-            result = H5C__flash_increase_cache_size(cache_ptr, 0, 
+            result = H5C__flash_increase_cache_size(cache_ptr, 0,
 			                            entry_ptr->size);
 
             if ( result < 0 ) {
@@ -5946,11 +5946,11 @@ H5C_protect(H5F_t *	        f,
             }
         }
 
-        /* try to free up some space if necessary and if evictions are 
-	 * permitted 
+        /* try to free up some space if necessary and if evictions are
+	 * permitted
 	 */
         if ( ( cache_ptr->evictions_enabled ) &&
-	     ( (cache_ptr->index_size + entry_ptr->size) > 
+	     ( (cache_ptr->index_size + entry_ptr->size) >
 	       cache_ptr->max_cache_size ) ) {
 
             size_t space_needed;
@@ -6056,7 +6056,7 @@ H5C_protect(H5F_t *	        f,
     if ( entry_ptr->is_protected ) {
 
 	if ( ( read_only ) && ( entry_ptr->is_read_only ) ) {
-	
+
 	    HDassert( entry_ptr->ro_ref_count > 0 );
 
 	    (entry_ptr->ro_ref_count)++;
@@ -6316,8 +6316,8 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
 
     /* will set the increase possible fields to FALSE later if needed */
     cache_ptr->size_increase_possible       = TRUE;
-    cache_ptr->flash_size_increase_possible = TRUE; 
-    cache_ptr->size_decrease_possible       = TRUE; 
+    cache_ptr->flash_size_increase_possible = TRUE;
+    cache_ptr->size_decrease_possible       = TRUE;
 
     switch ( config_ptr->incr_mode )
     {
@@ -6340,7 +6340,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
     }
 
     /* logically, this is were configuration for flash cache size increases
-     * should go.  However, this configuration depends on max_cache_size, so 
+     * should go.  However, this configuration depends on max_cache_size, so
      * we wait until the end of the function, when this field is set.
      */
 
@@ -6388,7 +6388,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
     if ( config_ptr->max_size == config_ptr->min_size ) {
 
         cache_ptr->size_increase_possible = FALSE;
-        cache_ptr->flash_size_increase_possible = FALSE; 
+        cache_ptr->flash_size_increase_possible = FALSE;
         cache_ptr->size_decrease_possible = FALSE;
     }
 
@@ -6483,7 +6483,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
     }
 
     /* configure flash size increase facility.  We wait until the
-     * end of the function, as we need the max_cache_size set before 
+     * end of the function, as we need the max_cache_size set before
      * we start to keep things simple.
      *
      * If we haven't already ruled out flash cache size increases above,
@@ -6495,12 +6495,12 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
         switch ( config_ptr->flash_incr_mode )
         {
             case H5C_flash_incr__off:
-                cache_ptr->flash_size_increase_possible = FALSE; 
+                cache_ptr->flash_size_increase_possible = FALSE;
 	        break;
 
             case H5C_flash_incr__add_space:
-                cache_ptr->flash_size_increase_possible = TRUE; 
-                cache_ptr->flash_size_increase_threshold = 
+                cache_ptr->flash_size_increase_possible = TRUE;
+                cache_ptr->flash_size_increase_threshold =
                     (size_t)
                     (((double)(cache_ptr->max_cache_size)) *
                      ((cache_ptr->resize_ctl).flash_threshold));
@@ -6511,7 +6511,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
                             "Unknown flash_incr_mode?!?!?.")
                 break;
         }
-    }	
+    }
 
 done:
 
@@ -6523,7 +6523,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C_set_evictions_enabled()
  *
- * Purpose:	Set cache_ptr->evictions_enabled to the value of the 
+ * Purpose:	Set cache_ptr->evictions_enabled to the value of the
  * 		evictions enabled parameter.
  *
  * Return:      SUCCEED on success, and FAIL on failure.
@@ -6557,9 +6557,9 @@ H5C_set_evictions_enabled(H5C_t * cache_ptr,
 		    "Bad evictions_enabled on entry.")
     }
 
-    /* There is no fundamental reason why we should not permit 
+    /* There is no fundamental reason why we should not permit
      * evictions to be disabled while automatic resize is enabled.
-     * However, I can't think of any good reason why one would 
+     * However, I can't think of any good reason why one would
      * want to, and allowing it would greatly complicate testing
      * the feature.  Hence the following:
      */
@@ -6743,8 +6743,8 @@ done:
  *		JRM -- 8/23/06
  *		Added code supporting new flush related statistics.
  *
- *		JRM -- 3/31/07 
- *		Added code supporting the new write_protects, 
+ *		JRM -- 3/31/07
+ *		Added code supporting the new write_protects,
  *		read_protects, and max_read_protects fields.
  *
  *-------------------------------------------------------------------------
@@ -6831,9 +6831,9 @@ H5C_stats(H5C_t * cache_ptr,
 				+= cache_ptr->cache_flush_renames[i];
         total_size_increases    += cache_ptr->size_increases[i];
         total_size_decreases    += cache_ptr->size_decreases[i];
-    	total_entry_flush_size_changes 
+    	total_entry_flush_size_changes
 				+= cache_ptr->entry_flush_size_changes[i];
-    	total_cache_flush_size_changes 
+    	total_cache_flush_size_changes
 				+= cache_ptr->cache_flush_size_changes[i];
 	total_pins              += cache_ptr->pins[i];
 	total_unpins            += cache_ptr->unpins[i];
@@ -6975,14 +6975,14 @@ H5C_stats(H5C_t * cache_ptr,
               (long)total_flushes,
               (long)total_evictions);
 
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "%s  Total insertions(pinned) / renames = %ld(%ld) / %ld\n",
               cache_ptr->prefix,
               (long)total_insertions,
               (long)total_pinned_insertions,
               (long)total_renames);
 
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "%s  Total entry / cache flush renames  = %ld / %ld\n",
               cache_ptr->prefix,
               (long)total_entry_flush_renames,
@@ -7164,7 +7164,7 @@ done:
  *		JRM - 3/20/06
  *		Updated for pin / unpin related statistics.
  *
- *		JRM - 8/9/06 
+ *		JRM - 8/9/06
  *		Further updates for pin related statistics.
  *
  *		JRM 8/23/06
@@ -7175,7 +7175,7 @@ done:
  *		warning in the production build.
  *
  *		JRM 3/31/07
- *		Added initialization for the new write_protects, 
+ *		Added initialization for the new write_protects,
  *		read_protects, and max_read_protects fields.
  *
  *-------------------------------------------------------------------------
@@ -7406,7 +7406,7 @@ done:
  *		equivalent of setting the H5C__DIRTIED_FLAG.
  *
  *		JRM -- 3/29/07
- *		Modified function to allow a entry to be protected 
+ *		Modified function to allow a entry to be protected
  *		more than once if the entry is protected read only.
  *
  *		Also added sanity checks using the new is_read_only and
@@ -7595,10 +7595,10 @@ H5C_unprotect(H5F_t *		  f,
 
                     size_increase = new_size - entry_ptr->size;
 
-                    if ( size_increase >= 
+                    if ( size_increase >=
                          cache_ptr->flash_size_increase_threshold ) {
 
-                        result = H5C__flash_increase_cache_size(cache_ptr, 
+                        result = H5C__flash_increase_cache_size(cache_ptr,
                                                               entry_ptr->size,
                                                               new_size);
 
@@ -7734,8 +7734,8 @@ H5C_unprotect(H5F_t *		  f,
         else if ( clear_entry ) {
 
             /* the following first flush flag will never be used as we are
-             * calling H5C_flush_single_entry with the 
-	     * H5C__FLUSH_CLEAR_ONLY_FLAG flag.  However, it is needed for 
+             * calling H5C_flush_single_entry with the
+	     * H5C__FLUSH_CLEAR_ONLY_FLAG flag.  However, it is needed for
 	     * the function call.
              */
             hbool_t		dummy_first_flush = TRUE;
@@ -8721,8 +8721,8 @@ done:
  *
  *              Note that this is a pretty bad scenario if it ever
  *              happens.  The code I have added should allow us to
- *              handle the situation under all but the worst conditions, 
- *              but one can argue that I should just scream and die if I 
+ *              handle the situation under all but the worst conditions,
+ *              but one can argue that I should just scream and die if I
  *              ever detect the condidtion.
  *
  *-------------------------------------------------------------------------
@@ -8825,7 +8825,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
                    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                                "*prev_ptr corrupt")
 
-                } else 
+                } else
 #endif /* NDEBUG */
 		if ( ( prev_ptr->is_dirty != prev_is_dirty )
                             ||
@@ -9202,9 +9202,9 @@ done:
  * Function:	H5C__flash_increase_cache_size
  *
  * Purpose:    	If there is not at least new_entry_size - old_entry_size
- *		bytes of free space in the cache and the current 
- *              max_cache_size is less than (cache_ptr->resize_ctl).max_size, 
- *              perform a flash increase in the cache size and then reset 
+ *		bytes of free space in the cache and the current
+ *              max_cache_size is less than (cache_ptr->resize_ctl).max_size,
+ *              perform a flash increase in the cache size and then reset
  *              the full cache hit rate statistics, and exit.
  *
  * Return:      Non-negative on success/Negative on failure.
@@ -9248,13 +9248,13 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
 
     space_needed = new_entry_size - old_entry_size;
 
-    if ( ( (cache_ptr->index_size + space_needed) > 
+    if ( ( (cache_ptr->index_size + space_needed) >
                            cache_ptr->max_cache_size ) &&
          ( cache_ptr->max_cache_size < (cache_ptr->resize_ctl).max_size ) ) {
 
         /* we have work to do */
 
-        switch ( (cache_ptr->resize_ctl).flash_incr_mode ) 
+        switch ( (cache_ptr->resize_ctl).flash_incr_mode )
         {
             case H5C_flash_incr__off:
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -9263,13 +9263,13 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
 
             case H5C_flash_incr__add_space:
 		if ( cache_ptr->index_size < cache_ptr->max_cache_size ) {
-                
+
 		    HDassert( (cache_ptr->max_cache_size - cache_ptr->index_size)
 				    < space_needed );
                     space_needed -= cache_ptr->max_cache_size - cache_ptr->index_size;
 		}
-		space_needed = 
-		    (size_t)(((double)space_needed) * 
+		space_needed =
+		    (size_t)(((double)space_needed) *
 			     (cache_ptr->resize_ctl).flash_multiple);
 
                 new_max_cache_size = cache_ptr->max_cache_size + space_needed;
@@ -9324,7 +9324,7 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
                 break;
         }
 
-        /* note that we don't cycle the epoch markers.  We can 
+        /* note that we don't cycle the epoch markers.  We can
          * argue either way as to whether we should, but for now
          * we don't.
          */
@@ -9418,8 +9418,8 @@ done:
  *
  *              Note that this is a pretty bad scenario if it ever
  *              happens.  The code I have added should allow us to
- *              handle the situation under all but the worst conditions, 
- *              but one can argue that I should just scream and die if I 
+ *              handle the situation under all but the worst conditions,
+ *              but one can argue that I should just scream and die if I
  *              ever detect the condidtion.
  *
  * 							-- JRM 10/13/07
@@ -9481,29 +9481,29 @@ H5C_flush_invalidate_cache(H5F_t *  f,
 
     /* The flush proceedure here is a bit strange.
      *
-     * In the outer while loop we make at least one pass through the 
+     * In the outer while loop we make at least one pass through the
      * cache, and then repeat until either all the pinned entries
      * unpin themselves, or until the number of pinned entries stops
      * declining.  In this later case, we scream and die.
      *
      * Since the fractal heap can dirty, resize, and/or rename entries
      * in is flush callback, it is possible that the cache will still
-     * contain dirty entries at this point.  If so, we must make up to 
-     * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list 
+     * contain dirty entries at this point.  If so, we must make up to
+     * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list
      * to allow it to empty.  If is is not empty at this point, we again
      * scream and die.
      *
-     * Further, since clean entries can be dirtied, resized, and/or renamed 
+     * Further, since clean entries can be dirtied, resized, and/or renamed
      * as the result of a flush call back (either the entries own, or that
-     * for some other cache entry), we can no longer promise to flush 
+     * for some other cache entry), we can no longer promise to flush
      * the cache entries in increasing address order.
      *
      * Instead, we just do the best we can -- making a pass through
-     * the skip list, and then a pass through the "clean" entries, and 
-     * then repeating as needed.  Thus it is quite possible that an 
+     * the skip list, and then a pass through the "clean" entries, and
+     * then repeating as needed.  Thus it is quite possible that an
      * entry will be evicted from the cache only to be re-loaded later
-     * in the flush process (From what Quincey tells me, the pin 
-     * mechanism makes this impossible, but even it it is true now, 
+     * in the flush process (From what Quincey tells me, the pin
+     * mechanism makes this impossible, but even it it is true now,
      * we shouldn't count on it in the future.)
      *
      * The bottom line is that entries will probably be flushed in close
@@ -9520,10 +9520,10 @@ H5C_flush_invalidate_cache(H5F_t *  f,
 	have_pinned_entries = ( cur_pel_len > 0 );
 
 	/* first, try to flush-destroy any dirty entries.   Do this by
-	 * making a scan through the slist.  Note that new dirty entries 
+	 * making a scan through the slist.  Note that new dirty entries
 	 * may be created by the flush call backs.  Thus it is possible
 	 * that the slist will not be empty after we finish the scan.
-	 */ 
+	 */
 
         if ( cache_ptr->slist_len == 0 ) {
 
@@ -9619,7 +9619,7 @@ H5C_flush_invalidate_cache(H5F_t *  f,
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "entry_ptr->magic is invalid ?!?!");
 
-	    } else 
+	    } else
 #endif /* NDEBUG */
 	    if ( ( ! entry_ptr->is_dirty ) ||
                  ( ! entry_ptr->in_slist ) ) {
@@ -9678,7 +9678,7 @@ H5C_flush_invalidate_cache(H5F_t *  f,
 	     * cache_ptr->slist_size_increase.
 	     *
 	     * Note that we include pinned entries in this count, even
-	     * though we will not actually flush them.  
+	     * though we will not actually flush them.
 	     */
             actual_slist_len++;
             actual_slist_size += entry_ptr->size;
@@ -9699,7 +9699,7 @@ H5C_flush_invalidate_cache(H5F_t *  f,
                  * as pinned entries can't be evicted.
                  */
 		if ( TRUE ) { /* When we get to multithreaded cache,
-			       * we will need either locking code, and/or 
+			       * we will need either locking code, and/or
 			       * a test to see if the entry is in flushable
 			       * condition here.
 			       */
@@ -9759,18 +9759,18 @@ H5C_flush_invalidate_cache(H5F_t *  f,
 
 	if ( node_ptr == NULL ) {
 
-            HDassert( (actual_slist_len + cache_ptr->slist_len) == 
+            HDassert( (actual_slist_len + cache_ptr->slist_len) ==
 		      (initial_slist_len + cache_ptr->slist_len_increase) );
-            HDassert( (actual_slist_size + cache_ptr->slist_size) == 
+            HDassert( (actual_slist_size + cache_ptr->slist_size) ==
 		      (initial_slist_size + cache_ptr->slist_size_increase) );
 	}
 #endif /* H5C_DO_SANITY_CHECKS */
 
         /* Since we are doing a destroy, we must make a pass through
          * the hash table and try to flush - destroy all entries that
-         * remain.  
+         * remain.
 	 *
-	 * It used to be that all entries remaining in the cache at 
+	 * It used to be that all entries remaining in the cache at
 	 * this point had to be clean, but with the fractal heap mods
 	 * this may not be the case.  If so, we will flush entries out
 	 * of increasing address order.
@@ -9837,9 +9837,9 @@ H5C_flush_invalidate_cache(H5F_t *  f,
                  * it never will), and if the cache was full, it is
                  * possible that *next_entry_ptr was flushed or evicted.
                  *
-                 * Test to see if this happened here.  Note that if this 
-		 * test is triggred, we are accessing a deallocated piece 
-		 * of dynamically allocated memory, so we just scream and 
+                 * Test to see if this happened here.  Note that if this
+		 * test is triggred, we are accessing a deallocated piece
+		 * of dynamically allocated memory, so we just scream and
 		 * die.
                  */
 #ifndef NDEBUG
@@ -9872,7 +9872,7 @@ H5C_flush_invalidate_cache(H5F_t *  f,
         } else if ( ( cur_pel_len == 0 ) && ( old_pel_len == 0 ) ) {
 
 	    /* increment the pass count */
-	    passes++; 
+	    passes++;
 	}
 
 	if ( passes >= H5C__MAX_PASSES_ON_FLUSH ) {
@@ -9994,19 +9994,19 @@ done:
  *		as there is no write to file in this case.
  *
  *		JRM -- 8/21/06
- *		Added code maintaining the flush_in_progress and 
- *		destroy_in_progress fields in H5C_cache_entry_t.  
- *
- *		Also added flush_flags parameter to the call to 
- *		type_ptr->flush() so that the flush routine can report 
- *		whether the entry has been resized or renamed.  Added 
- *		code using the flush_flags variable to detect the case 
- *		in which the target entry is resized during flush, and 
+ *		Added code maintaining the flush_in_progress and
+ *		destroy_in_progress fields in H5C_cache_entry_t.
+ *
+ *		Also added flush_flags parameter to the call to
+ *		type_ptr->flush() so that the flush routine can report
+ *		whether the entry has been resized or renamed.  Added
+ *		code using the flush_flags variable to detect the case
+ *		in which the target entry is resized during flush, and
  *		update the caches data structures accordingly.
  *
  *
  *		JRM -- 3/29/07
- *		Added sanity checks on the new is_read_only and 
+ *		Added sanity checks on the new is_read_only and
  *		ro_ref_count fields.
  *
  *-------------------------------------------------------------------------
@@ -10167,8 +10167,8 @@ H5C_flush_single_entry(H5F_t *		   f,
          * entry if destroy is true.
 	 *
 	 * Note that it is possible that the entry will be renamed during
-	 * its call to flush.  This will upset H5C_rename_entry() if we 
-	 * don't tell it that it doesn't have to worry about updating the 
+	 * its call to flush.  This will upset H5C_rename_entry() if we
+	 * don't tell it that it doesn't have to worry about updating the
 	 * index and SLIST.  Use the destroy_in_progress field for this
 	 * purpose.
          */
@@ -10298,7 +10298,7 @@ H5C_flush_single_entry(H5F_t *		   f,
 
 #ifndef NDEBUG
 	    if ( destroy ) {
-		/* we are about to call the clear callback with the 
+		/* we are about to call the clear callback with the
 		 * destroy flag set -- this will result in *entry_ptr
 		 * being freed.  Set the magic field to bad magic
 		 * so we can detect a freed cache entry if we see
@@ -10326,7 +10326,7 @@ H5C_flush_single_entry(H5F_t *		   f,
 
 #ifndef NDEBUG
 	    if ( destroy ) {
-	        /* we are about to call the flush callback with the 
+	        /* we are about to call the flush callback with the
 	         * destroy flag set -- this will result in *entry_ptr
 	         * being freed.  Set the magic field to bad magic
 	         * so we can detect a freed cache entry if we see
@@ -10366,21 +10366,21 @@ H5C_flush_single_entry(H5F_t *		   f,
 		 * die.
 		 *
 		 * At present, in the parallel case, the aux_ptr
-		 * will only be set if there is more than one 
-		 * process.  Thus we can use this to detect 
+		 * will only be set if there is more than one
+		 * process.  Thus we can use this to detect
 		 * the parallel case.
 		 *
-		 * This works for now, but if we start using the 
-		 * aux_ptr for other purposes, we will have to 
+		 * This works for now, but if we start using the
+		 * aux_ptr for other purposes, we will have to
 		 * change this test accordingly.
 		 *
 		 * NB: While this test detects entryies that attempt
 		 *     to resize or rename themselves during a flush
 		 *     in the parallel case, it will not detect an
-		 *     entry that dirties, resizes, and/or renames 
+		 *     entry that dirties, resizes, and/or renames
 		 *     other entries during its flush.
 		 *
-		 *     From what Quincey tells me, this test is 
+		 *     From what Quincey tells me, this test is
 		 *     sufficient for now, as any flush routine that
 		 *     does the latter will also do the former.
 		 *
@@ -10415,7 +10415,7 @@ H5C_flush_single_entry(H5F_t *		   f,
 
 		/* The entry size changed as a result of the flush.
 		 *
-		 * Most likely, the entry was compressed, and the 
+		 * Most likely, the entry was compressed, and the
 		 * new version is of a different size than the old.
 		 *
 		 * In any case, we must update entry and cache size
@@ -10423,7 +10423,7 @@ H5C_flush_single_entry(H5F_t *		   f,
 		 */
 		size_t new_size;
 
-                if ( (entry_ptr->type->size)(f, (void *)entry_ptr, &new_size) 
+                if ( (entry_ptr->type->size)(f, (void *)entry_ptr, &new_size)
                      < 0 ) {
 
                     HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, \
@@ -10440,14 +10440,14 @@ H5C_flush_single_entry(H5F_t *		   f,
                                                       (new_size));
 
 		    /* The entry can't be protected since we just flushed it.
-		     * Thus we must update the replacement policy data 
-		     * structures for the size change.  The macro deals 
+		     * Thus we must update the replacement policy data
+		     * structures for the size change.  The macro deals
 		     * with the pinned case.
 		     */
 		    H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, \
 				                   new_size)
 
-		    /* The entry can't be in the slist, so no need to update 
+		    /* The entry can't be in the slist, so no need to update
 		     * the slist for the size change.
 		     */
 
@@ -10465,12 +10465,12 @@ H5C_flush_single_entry(H5F_t *		   f,
 
 		/* The entry was renamed as the result of the flush.
 		 *
-		 * Most likely, the entry was compressed, and the 
-		 * new version is larger than the old and thus had 
+		 * Most likely, the entry was compressed, and the
+		 * new version is larger than the old and thus had
 		 * to be relocated.
 		 *
-		 * At preset, all processing for this case is 
-		 * handled elsewhere.  But lets keep the if statement 
+		 * At preset, all processing for this case is
+		 * handled elsewhere.  But lets keep the if statement
 		 * around just in case.
 		 */
 
@@ -10522,7 +10522,7 @@ done:
  *
  *		JRM - 6/23/06
  *		Deleted assertion that verified that a newly loaded
- *		entry is clean.  Due to a bug fix, this need not be 
+ *		entry is clean.  Due to a bug fix, this need not be
  *		the case, as our code will attempt to repair errors
  *		on load.
  *
@@ -10531,7 +10531,7 @@ done:
  *		destroy in progress fields.
  *
  *		JRM - 3/29/07
- *		Added initialization for the new is_read_only and 
+ *		Added initialization for the new is_read_only and
  *		ro_ref_count fields.
  *
  *-------------------------------------------------------------------------
@@ -10571,10 +10571,10 @@ H5C_load_entry(H5F_t *             f,
     entry_ptr = (H5C_cache_entry_t *)thing;
 
     /* In general, an entry should be clean just after it is loaded.
-     * 
+     *
      * However, when this code is used in the metadata cache, it is
-     * possible that object headers will be dirty at this point, as 
-     * the load function will alter object headers if necessary to 
+     * possible that object headers will be dirty at this point, as
+     * the load function will alter object headers if necessary to
      * fix an old bug.
      *
      * To support this bug fix, I have replace the old assert:
@@ -10588,7 +10588,7 @@ H5C_load_entry(H5F_t *             f,
      * Note that type id 4 is associated with object headers in the metadata
      * cache.
      *
-     * When we get to using H5C for other purposes, we may wish to 
+     * When we get to using H5C for other purposes, we may wish to
      * tighten up the assert so that the loophole only applies to the
      * metadata cache.
      */
@@ -10691,7 +10691,7 @@ done:
  *		min clean size before the cache has filled.
  *
  *		JRM -- 3/29/07
- *		Added sanity checks using the new is_read_only and 
+ *		Added sanity checks using the new is_read_only and
  *		ro_ref_count fields.
  *
  *              JRM -- 10/13/07
@@ -10705,8 +10705,8 @@ done:
  *
  *              Note that this is a pretty bad scenario if it ever
  *              happens.  The code I have added should allow us to
- *              handle the situation under all but the worst conditions, 
- *              but one can argue that I should just scream and die if I 
+ *              handle the situation under all but the worst conditions,
+ *              but one can argue that I should just scream and die if I
  *              ever detect the condidtion.
  *
  *-------------------------------------------------------------------------
@@ -10823,7 +10823,7 @@ H5C_make_space_in_cache(H5F_t *	f,
                 }
 #endif /* NDEBUG */
 		if ( entry_is_epoch_maker ) {
-	
+
 		    entry_ptr = prev_ptr;
 
 		} else if ( ( prev_ptr->is_dirty != prev_is_dirty )
@@ -10918,7 +10918,7 @@ H5C_make_space_in_cache(H5F_t *	f,
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                                 "*prev_ptr corrupt 2")
 
-                } else 
+                } else
 #endif /* #ifndef NDEBUG */
 		if ( ( ! ( prev_ptr->is_dirty ) )
                      ||
diff --git a/src/H5C2.c b/src/H5C2.c
index 60447b2..e416c08 100644
--- a/src/H5C2.c
+++ b/src/H5C2.c
@@ -258,7 +258,7 @@ const H5C2_class_t epoch_marker_class_2 =
     /* serialize        = */ &H5C2_epoch_marker_serialize,
     /* free_icr         = */ &H5C2_epoch_marker_free_icr,
     /* clear_dirty_bits = */ &H5C2_epoch_marker_clear_dirty_bits,
-}; 
+};
 
 
 /***************************************************************************
@@ -303,7 +303,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-static herr_t 
+static herr_t
 H5C2_epoch_marker_serialize(const H5F_t UNUSED *f,
 		            hid_t UNUSED dxpl_id,
                             haddr_t UNUSED addr,
@@ -423,18 +423,18 @@ done:
  *
  *		JRM -- 8/25/06
  *		Added initialization for the slist_len_increase and
- *		slist_size_increase fields.  These fields are used 
+ *		slist_size_increase fields.  These fields are used
  *		for sanity checking in the flush process, and are not
  *		compiled in unless H5C2_DO_SANITY_CHECKS is TRUE.
  *
  *		JRM -- 3/28/07
- *		Added initialization for the new is_read_only and 
+ *		Added initialization for the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM -- 7/10/07
- *		Added the f parameter, along with initialization of 
+ *		Added the f parameter, along with initialization of
  *		the field of the same in in H5C2_t.  Also removed the
- *		type name table, as type names are now included in 
+ *		type name table, as type names are now included in
  *		instances of H5C2_class_t.
  *
  *              JRM -- 3/28/07
@@ -446,19 +446,19 @@ done:
  *              related fields of H5C2_t.
  *
  * 		JRM -- 3/6/08
- * 		Added initialization for metadata journaling related 
+ * 		Added initialization for metadata journaling related
  * 		fields in H5C2_t.
  *
  * 		JRM -- 3/26/08
  * 		Added dxpl_id and journal_recovered parameters.  Also
  * 		added code to test to see if the file is marked as having
- * 		journaling in progress, and fail if it does unless 
+ * 		journaling in progress, and fail if it does unless
  * 		the journal_recovered parameter is TRUE.
  *
  * 		JRM -- 7/10/08
  * 		Removed the f, dxpl_id, and journal_recovered parameters,
  * 		as checking for journaling in progress is no longer handled
- * 		in H5C2_create().  
+ * 		in H5C2_create().
  *
  *-------------------------------------------------------------------------
  */
@@ -621,7 +621,7 @@ H5C2_create(size_t		        max_cache_size,
     {
         (cache_ptr->epoch_marker_active)[i]		 = FALSE;
 #ifndef NDEBUG
-        ((cache_ptr->epoch_markers)[i]).magic		 = 
+        ((cache_ptr->epoch_markers)[i]).magic		 =
 					       H5C2__H5C2_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
         ((cache_ptr->epoch_markers)[i]).addr		 = (haddr_t)i;
@@ -659,7 +659,7 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->jnl_magic                                 = 0;
     cache_ptr->jnl_file_name_len                         = 0;
     (cache_ptr->jnl_file_name)[0]                        = '\0';
-    (cache_ptr->mdj_jbrb).magic                          = 
+    (cache_ptr->mdj_jbrb).magic                          =
 	    					H5C2__H5C2_JBRB_T_MAGIC;
     cache_ptr->tl_len                                    = 0;
     cache_ptr->tl_size                                   = 0;
@@ -670,12 +670,12 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->jwipl_head_ptr                            = NULL;
     cache_ptr->jwipl_tail_ptr                            = NULL;
 
-    /* allocate and initialze the metadata journaling status change 
+    /* allocate and initialze the metadata journaling status change
      * callback table, along with the associated fields.  Note that
      * the table will grow and shrink as needed.
      */
-    cache_ptr->mdjsc_cb_tbl = 
-	    H5MM_malloc(H5C2__MIN_MDJSC_CB_TBL_LEN * 
+    cache_ptr->mdjsc_cb_tbl =
+	    H5MM_malloc(H5C2__MIN_MDJSC_CB_TBL_LEN *
 			sizeof(H5C2_mdjsc_record_t));
     if ( cache_ptr->mdjsc_cb_tbl == NULL ) {
 
@@ -708,14 +708,14 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->skip_dxpl_id_checks		= FALSE;
     cache_ptr->prefix[0]			= '\0';  /* empty string */
 
-    /* We used to check for journaling here, but the super block hasn't 
-     * been read in yet at cache creation time -- thus the check for 
-     * journaling has been moved to H5AC2_check_for_journaling(), which 
+    /* We used to check for journaling here, but the super block hasn't
+     * been read in yet at cache creation time -- thus the check for
+     * journaling has been moved to H5AC2_check_for_journaling(), which
      * is simply a wrapper for H5C2_check_for_journaling().
      *
      * H5AC2_check_for_journaling() is called at the end of H5Fopen() --
      * at which point the superblock has been read.
-     * 
+     *
      * Note that H5Fopen() is called by both H5Fcreate() and H5Fopen().
      */
 
@@ -964,8 +964,8 @@ H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
  *
  *              JRM -- 7/11/07
  *              Reworked parameter list for the revised cache API.
- *              The function lost its pointer to an instance of 
- *              H5F_t (now supplied via cache_ptr), and one of its 
+ *              The function lost its pointer to an instance of
+ *              H5F_t (now supplied via cache_ptr), and one of its
  *              dxlp ids.
  *
  *-------------------------------------------------------------------------
@@ -1088,8 +1088,8 @@ done:
  *
  * Function:    H5C2_expunge_entry
  *
- * Purpose:     Use this function to tell the cache to expunge an entry 
- * 		from the cache without writing it to disk even if it is 
+ * Purpose:     Use this function to tell the cache to expunge an entry
+ * 		from the cache without writing it to disk even if it is
  * 		dirty.  The entry may not be either pinned or protected.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -1101,11 +1101,11 @@ done:
  *
  * 		JRM -- 7/11/07
  *		Reworked the parameter list for the revised cache API.
- *		The function lost its file pointer (now passed in the 
+ *		The function lost its file pointer (now passed in the
  *		*cache_ptr), and one of the dxpl ids.
  *
  *		JRM -- 4/3/08
- *		Added code to test to see if journaling is enabled, and 
+ *		Added code to test to see if journaling is enabled, and
  *		if it is, test to see if entry_ptr->last_trans > zero.
  *		If so, must remove the entry from the transaction list
  *		(if it is present), remove the entry from the journal
@@ -1132,7 +1132,7 @@ H5C2_expunge_entry(H5F_t *              f,
 #if H5C2_PRINT_ENTRY_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
-        HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", 
+        HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n",
 	          FUNC, (unsigned long)addr, type->name);
     }
 #endif /* H5C2_PRINT_ENTRY_POINTS */
@@ -1200,7 +1200,7 @@ H5C2_expunge_entry(H5F_t *              f,
         }
     }
 
-    /* If we get this far, call H5C2_flush_single_entry() with the 
+    /* If we get this far, call H5C2_flush_single_entry() with the
      * H5C2__FLUSH_INVALIDATE_FLAG and the H5C2__FLUSH_CLEAR_ONLY_FLAG.
      * This will clear the entry, and then delete it from the cache.
      */
@@ -1210,7 +1210,7 @@ H5C2_expunge_entry(H5F_t *              f,
                                      cache_ptr,
                                      entry_ptr->type,
                                      entry_ptr->addr,
-                                     H5C2__FLUSH_INVALIDATE_FLAG | 
+                                     H5C2__FLUSH_INVALIDATE_FLAG |
 				     H5C2__FLUSH_CLEAR_ONLY_FLAG,
                                      TRUE);
 
@@ -1232,7 +1232,7 @@ done:
 
 #if H5C2_PRINT_EXIT_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
-        HDfprintf(stdout, "%s: Exiting with result = %d.\n", 
+        HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
 #endif /* H5C2_PRINT_EXIT_POINTS */
@@ -1314,31 +1314,31 @@ done:
  *		Updated function to handle pinned entries.
  *
  *		JRM -- 8/19/06
- *		Added code managing the new flush_in_progress field of 
+ *		Added code managing the new flush_in_progress field of
  *		H5C2_t.
  *
  *		Also reworked function to allow for the possibility that
  *		entries will be dirtied, resized, or renamed during flush
- *		callbacks.  As a result, we may have to make multiple 
+ *		callbacks.  As a result, we may have to make multiple
  *		passes through the skip list before the cache is flushed.
  *
  *		JRM -- 7/11/07
  *		Reworked function to support the new metadata cache API.
- *		The function lost the H5F_t parameter (now passed via 
+ *		The function lost the H5F_t parameter (now passed via
  *		*cache_ptr), and one of the dxpl id parameters.
  *
  *		JRM -- 10/13/07
- *		Added code to detect and manage the case in which a 
+ *		Added code to detect and manage the case in which a
  *		serialize callback changes the s-list out from under
  *		the function.  The only way I can think of in which this
  *		can happen is if a serialize function loads an entry
  *		into the cache that isn't there already.  Quincey tells
- *		me that this will never happen, but I'm not sure I 
+ *		me that this will never happen, but I'm not sure I
  *		believe him.
  *
- *		Note that this is a pretty bad scenario if it ever 
- *		happens.  The code I have added should allow us to 
- *		handle the situation, but one can argue that I should 
+ *		Note that this is a pretty bad scenario if it ever
+ *		happens.  The code I have added should allow us to
+ *		handle the situation, but one can argue that I should
  *		just scream and die if I ever detect the condidtion.
  *
  *              JRM -- 10/13/07
@@ -1357,7 +1357,7 @@ done:
  *              ever detect the condidtion.
  *
  *              JRM -- 4/10/08
- *              Added code to support journaling.  
+ *              Added code to support journaling.
  *
  *-------------------------------------------------------------------------
  */
@@ -1469,7 +1469,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                                 "next_entry_ptr == NULL 1 ?!?!");
                 }
 #ifndef NDEBUG
-		HDassert( next_entry_ptr->magic == 
+		HDassert( next_entry_ptr->magic ==
 				H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                 HDassert( next_entry_ptr->is_dirty );
@@ -1480,7 +1480,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 		next_entry_ptr = NULL;
 
 	    }
-       
+
 	    HDassert( node_ptr != NULL );
 
 #if H5C2_DO_SANITY_CHECKS
@@ -1495,7 +1495,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 	     * fractal heap, the entry serialize callback can cause entries
 	     * to be dirtied, resized, and/or renamed.
 	     *
-	     * To deal with this, we first make note of the initial 
+	     * To deal with this, we first make note of the initial
 	     * skip list length and size:
 	     */
             initial_slist_len = cache_ptr->slist_len;
@@ -1507,12 +1507,12 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
             flushed_entries_count = 0;
             flushed_entries_size = 0;
 
-	    /* As mentioned above, there is the possibility that 
+	    /* As mentioned above, there is the possibility that
 	     * entries will be dirtied, resized, and/or flushed during
-	     * our pass through the skip list.  To capture the number 
-	     * of entries added, and the skip list size delta, 
+	     * our pass through the skip list.  To capture the number
+	     * of entries added, and the skip list size delta,
 	     * zero the slist_len_increase and slist_size_increase of
-	     * the cache's instance of H5C2_t.  These fields will be 
+	     * the cache's instance of H5C2_t.  These fields will be
 	     * updated elsewhere to account for slist insertions and/or
 	     * dirty entry size changes.
 	     */
@@ -1533,18 +1533,18 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 		 * that the serialize callback will dirty and/or resize
 		 * other entries in the cache.  In particular, while
 		 * Quincey has promised me that this will never happen,
-		 * it is possible that the serialize callback for an 
+		 * it is possible that the serialize callback for an
 		 * entry may protect an entry that is not in the cache,
-		 * perhaps causing the cache to flush and possibly 
+		 * perhaps causing the cache to flush and possibly
 		 * evict the entry associated with node_ptr to make
 		 * space for the new entry.
 		 *
 		 * Thus we do a bit of extra sanity checking on entry_ptr,
-		 * and break out of this scan of the skip list if we 
-		 * detect minor problems.  We have a bit of leaway on the 
-		 * number of passes though the skip list, so this shouldn't 
-		 * be an issue in the flush in and of itself, as it should 
-		 * be all but impossible for this to happen more than once 
+		 * and break out of this scan of the skip list if we
+		 * detect minor problems.  We have a bit of leaway on the
+		 * number of passes though the skip list, so this shouldn't
+		 * be an issue in the flush in and of itself, as it should
+		 * be all but impossible for this to happen more than once
 		 * in any flush.
 		 *
 		 * Observe that that breaking out of the scan early
@@ -1554,7 +1554,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 		 * If an entry has merely been marked clean and removed from
                  * the s-list, we simply break out of the scan.
                  *
-                 * If the entry has been evicted, we flag an error and 
+                 * If the entry has been evicted, we flag an error and
                  * exit.
 		 */
 #ifndef NDEBUG
@@ -1563,12 +1563,12 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                                 "entry_ptr->magic invalid ?!?!");
 
-                } else 
+                } else
 #endif /* NDEBUG */
 		if ( ( ! entry_ptr->is_dirty ) ||
 	             ( ! entry_ptr->in_slist ) ) {
 
-		    /* the s-list has been modified out from under us. 
+		    /* the s-list has been modified out from under us.
 		     * set node_ptr to NULL and break out of the loop.
 		     */
 		    node_ptr = NULL;
@@ -1590,7 +1590,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                                     "next_entry_ptr == NULL 2 ?!?!");
 		    }
 #ifndef NDEBUG
-		    HDassert( next_entry_ptr->magic == 
+		    HDassert( next_entry_ptr->magic ==
 				    H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                     HDassert( next_entry_ptr->is_dirty );
@@ -1602,7 +1602,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                 HDassert( entry_ptr != NULL );
                 HDassert( entry_ptr->in_slist );
 
-                if ( ( ! flush_marked_entries ) || 
+                if ( ( ! flush_marked_entries ) ||
                      ( entry_ptr->flush_marker ) ) {
 
                     if ( entry_ptr->is_protected ) {
@@ -1617,13 +1617,13 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                     } else if ( entry_ptr->is_pinned ) {
 
                         /* Test to see if we are can flush the entry now.
-                         * If we can, go ahead and flush.  Note that we 
-			 * aren't trying to do a destroy here, so that 
+                         * If we can, go ahead and flush.  Note that we
+			 * aren't trying to do a destroy here, so that
 			 * is not an issue.
                          */
                         if ( TRUE ) { /* When we get to multithreaded cache,
-                                       * we will need either locking code, 
-				       * and/or a test to see if the entry 
+                                       * we will need either locking code,
+				       * and/or a test to see if the entry
 				       * is in flushable condition here.
                                        */
 #if H5C2_DO_SANITY_CHECKS
@@ -1639,7 +1639,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                                                              FALSE);
                             if ( status < 0 ) {
 
-                                /* This shouldn't happen -- if it does, we 
+                                /* This shouldn't happen -- if it does, we
 				 * are toast so just scream and die.
                                  */
                                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
@@ -1661,7 +1661,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                                                          FALSE);
                         if ( status < 0 ) {
 
-                            /* This shouldn't happen -- if it does, we are 
+                            /* This shouldn't happen -- if it does, we are
 			     * toast so just scream and die.
                              */
                             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
@@ -1675,7 +1675,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 #if H5C2_DO_SANITY_CHECKS
             /* Verify that the slist size and length are as expected. */
 
-	    HDassert( (initial_slist_len + cache_ptr->slist_len_increase - 
+	    HDassert( (initial_slist_len + cache_ptr->slist_len_increase -
                        flushed_entries_count) == cache_ptr->slist_len );
 	    HDassert( (initial_slist_size + cache_ptr->slist_size_increase -
 		       flushed_entries_size) == cache_ptr->slist_size );
@@ -1714,7 +1714,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
     if ( cache_ptr->mdj_enabled ) {
 
-        status = H5C2_journal_post_flush(f, dxpl_id, cache_ptr, 
+        status = H5C2_journal_post_flush(f, dxpl_id, cache_ptr,
 			              (hbool_t)(flush_marked_entries == FALSE));
 
 	if ( status != SUCCEED ) {
@@ -1729,7 +1729,7 @@ done:
     cache_ptr->flush_in_progress = FALSE;
 
 #if H5C2_PRINT_EXIT_POINTS
-    HDfprintf(stdout, "%s: Exiting with result = %d.\n", 
+    HDfprintf(stdout, "%s: Exiting with result = %d.\n",
               FUNC, (int)ret_value);
 #endif /* H5C2_PRINT_EXIT_POINTS */
 
@@ -1783,13 +1783,13 @@ done:
  *		find a case where it helps, lets get rid of it.
  *
  *
- *		Added some sanity checks to the change which verify the 
+ *		Added some sanity checks to the change which verify the
  *		expected values of the new is_read_only and ro_ref_count
  *		fields.
  *						JRM - 3/29/07
  *
  *		Modified parameter list for the new metadata cache API.
- *		THe function lost its H5F_t parameter (now passed via 
+ *		THe function lost its H5F_t parameter (now passed via
  *		*cache_ptr), and one of its dxpl ids.
  *
  *						JRM - 7/11/07
@@ -2269,7 +2269,7 @@ H5C2_get_evictions_enabled(const H5C2_t *  cache_ptr,
 
     FUNC_ENTER_NOAPI(H5C2_get_evictions_enabled, FAIL)
 
-    if ( ( cache_ptr == NULL ) || 
+    if ( ( cache_ptr == NULL ) ||
          ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
@@ -2296,7 +2296,7 @@ done:
  * Purpose:     Get the trace_file_ptr field from the cache.
  *
  *              This field will either be NULL (which indicates that trace
- *              file logging is turned off), or contain a pointer to the 
+ *              file logging is turned off), or contain a pointer to the
  *              open file to which trace file data is to be written.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2327,7 +2327,7 @@ H5C2_get_trace_file_ptr(const H5C2_t *cache_ptr, FILE **trace_file_ptr_ptr)
  * Purpose:     Get the trace_file_ptr field from the cache, via an entry.
  *
  *              This field will either be NULL (which indicates that trace
- *              file logging is turned off), or contain a pointer to the 
+ *              file logging is turned off), or contain a pointer to the
  *              open file to which trace file data is to be written.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2421,13 +2421,13 @@ H5C2_get_trace_file_ptr_from_entry(const H5C2_cache_entry_t *entry_ptr,
  *		destroy_in_progress fields.
  *
  *		JRM -- 3/29/07
- *		Added initialization for the new is_read_only and 
+ *		Added initialization for the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM -- 7/11/07
- *		Reworked the parameter list for the revised metadata 
+ *		Reworked the parameter list for the revised metadata
  *		cache API.  The function lost its pointer to H5F_t
- *		(now supplied via *cache_ptr), and one of dxpl id 
+ *		(now supplied via *cache_ptr), and one of dxpl id
  *		parameters.  It gained a entry length parameter.
  *		Numerous internal changes to support the API change.
  *
@@ -2471,10 +2471,10 @@ H5C2_insert_entry(H5F_t *              f,
 
     FUNC_ENTER_NOAPI(H5C2_insert_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
-        HDfprintf(stdout, "%s: addr = 0x%lX, len = %d, type = %s.\n", FUNC, 
+        HDfprintf(stdout, "%s: addr = 0x%lX, len = %d, type = %s.\n", FUNC,
 	          (unsigned long)addr, (int)len, type->name);
     }
 #endif /* JRM */
@@ -2487,7 +2487,7 @@ H5C2_insert_entry(H5F_t *              f,
     HDassert( cache_ptr );
     HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f );
-    HDassert( ( ! ( cache_ptr->mdj_enabled ) ) || 
+    HDassert( ( ! ( cache_ptr->mdj_enabled ) ) ||
               ( cache_ptr->trans_in_progress ) );
     HDassert( type );
     HDassert( H5F_addr_defined(addr) );
@@ -2559,7 +2559,7 @@ H5C2_insert_entry(H5F_t *              f,
     if ( ( cache_ptr->flash_size_increase_possible ) &&
          ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) {
 
-        result = H5C2__flash_increase_cache_size(cache_ptr, 0, 
+        result = H5C2__flash_increase_cache_size(cache_ptr, 0,
 			                         entry_ptr->size);
 
         if ( result < 0 ) {
@@ -2715,7 +2715,7 @@ done:
 
 #if H5C2_PRINT_EXIT_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
-        HDfprintf(stdout, "%s: Exiting with result = %d.\n", 
+        HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
 #endif /* H5C2_PRINT_EXIT_POINTS */
@@ -2771,20 +2771,20 @@ done:
  *
  *		JRM -- 7/11/07
  *		Revised function for the new metadata cache API.  The
- *		function lost its point to H5F_t (now supplied via 
+ *		function lost its point to H5F_t (now supplied via
  *		*cache_ptr), and one of its dxpl ids.  Also internal
  *		changes supporting the revised API.
  *
  *		JRM -- 10/13/07
  *		Didn't modify this function to detect the case in which
  *		the LRU is modified out from under it.  It shouldn't be
- *		an issue here, as this function is only called in the 
+ *		an issue here, as this function is only called in the
  *		parallel case, and serialize callbacks must not modify
  *		other entries in parallel case.  If they do, they will
  *		cause inconsistancies in metadata across processes.
  *
- *		Further, since this function only clears entries, and 
- *		thus the serialize functions are never called, the 
+ *		Further, since this function only clears entries, and
+ *		thus the serialize functions are never called, the
  *		situation will be even worse, as the changes will only
  *		exist on process 0.
  *
@@ -3091,11 +3091,11 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
     HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
     HDassert((!cache_ptr->mdj_enabled) || cache_ptr->trans_in_progress);
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
-        HDfprintf(stdout, 
-                  "%s: addr = 0x%lX, size_changed = %d, new_size = %d.\n", 
-	          FUNC, (unsigned long)(entry_ptr->addr), (int)size_changed, 
+        HDfprintf(stdout,
+                  "%s: addr = 0x%lX, size_changed = %d, new_size = %d.\n",
+	          FUNC, (unsigned long)(entry_ptr->addr), (int)size_changed,
 	          (int)new_size);
 #endif /* JRM */
 
@@ -3147,7 +3147,7 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
                                               (new_size));
         }
 
-	/* if journaling is enabled, and the entry is already in the 
+	/* if journaling is enabled, and the entry is already in the
 	 * transaction list, update that list for the size change as well.
 	 */
 	H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
@@ -3166,8 +3166,8 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
 	H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
     }
 
-    /* if journaling is enabled, check to see if the entry is in the 
-     * transaction list.  If it isn't, insert it.  If it is, move it to 
+    /* if journaling is enabled, check to see if the entry is in the
+     * transaction list.  If it isn't, insert it.  If it is, move it to
      * the head of the list.
      */
     H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
@@ -3223,9 +3223,9 @@ H5C2_mark_pinned_or_protected_entry_dirty(void *thing)
     HDassert(cache_ptr);
     HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
-        HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, 
+        HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC,
 	          (unsigned long)(entry_ptr->addr), entry_ptr->type->name);
 #endif /* JRM */
 
@@ -3237,7 +3237,7 @@ H5C2_mark_pinned_or_protected_entry_dirty(void *thing)
         entry_ptr->dirtied = TRUE;
 
 	/* don't do anything with the transaction list now, as the
-	 * entry will be added to the transaction list when it is 
+	 * entry will be added to the transaction list when it is
 	 * unprotected.
 	 */
 
@@ -3319,14 +3319,14 @@ done:
  *              modification is now obsolete.
  *
  *              JRM -- 3/31/08
- *              Updated function to check if journaling is enabled.  If 
- *              it is, the function now inserts the renamed entry in the 
+ *              Updated function to check if journaling is enabled.  If
+ *              it is, the function now inserts the renamed entry in the
  *              transaction list (if it wasn't there already).
  *
- *              Also added sanity checks that will scream and die if 
+ *              Also added sanity checks that will scream and die if
  *              we attempt to rename an entry during either a destroy
- *              or flush if journaling is enabled.  Recall that any 
- *              rename should have already been triggered when the 
+ *              or flush if journaling is enabled.  Recall that any
+ *              rename should have already been triggered when the
  *              entry was serialized to construct its journal entry.
  *
  *-------------------------------------------------------------------------
@@ -3349,11 +3349,11 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 
     FUNC_ENTER_NOAPI(H5C2_rename_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
-        HDfprintf(stdout, "%s: type = %s,  old_addr = 0x%lX, new_addr = 0x%lx.\n", 
-	          FUNC, type->name, (unsigned long)old_addr, 
+        HDfprintf(stdout, "%s: type = %s,  old_addr = 0x%lX, new_addr = 0x%lx.\n",
+	          FUNC, type->name, (unsigned long)old_addr,
 		  (unsigned long)new_addr);
     }
 #endif /* JRM */
@@ -3390,14 +3390,14 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 		    "Target entry is protected.")
     }
 
-    if ( ( entry_ptr->destroy_in_progress ) && 
+    if ( ( entry_ptr->destroy_in_progress ) &&
          ( cache_ptr->mdj_enabled ) )
     {
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "rename on destroy when journaling is enabled.\n");
     }
 
-    if ( ( entry_ptr->flush_in_progress ) && 
+    if ( ( entry_ptr->flush_in_progress ) &&
          ( cache_ptr->mdj_enabled ) )
     {
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -3432,7 +3432,7 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
      * Since this is a simple re-name, cache size should be unaffected.
      *
      * Check to see if the target entry is in the process of being destroyed
-     * before we delete from the index, etc.  If it is, all we do is 
+     * before we delete from the index, etc.  If it is, all we do is
      * change the addr.  If the entry is only in the process of being flushed,
      * don't mark it as dirty either, lest we confuse the flush call back.
      */
@@ -3478,7 +3478,7 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 
             if ( removed_entry_from_slist ) {
 
-		/* we just removed the entry from the slist.  Thus we 
+		/* we just removed the entry from the slist.  Thus we
 		 * must touch up cache_ptr->slist_len_increase and
 		 * cache_ptr->slist_size_increase to keep from skewing
 		 * the sanity checks.
@@ -3522,7 +3522,7 @@ done:
 
 #if H5C2_PRINT_EXIT_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
-        HDfprintf(stdout, "%s: Exiting with result = %d.\n", 
+        HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
 #endif /* H5C2_PRINT_EXIT_POINTS */
@@ -3538,8 +3538,8 @@ done:
  * Purpose:	Resize a pinned entry.  The target entry MUST be
  * 		be pinned, and MUST not be unprotected.
  *
- * 		Resizing an entry dirties it, so if the entry is not 
- * 		already dirty, the function places the entry on the 
+ * 		Resizing an entry dirties it, so if the entry is not
+ * 		already dirty, the function places the entry on the
  * 		skip list.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -3567,10 +3567,10 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size)
     HDassert(cache_ptr);
     HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
-        HDfprintf(stdout, "%s: type = %s, addr = 0x%lX, new_size = %d.\n", 
-	          FUNC, entry_ptr->type->name, (unsigned long)(entry_ptr->addr), 
+        HDfprintf(stdout, "%s: type = %s, addr = 0x%lX, new_size = %d.\n",
+	          FUNC, entry_ptr->type->name, (unsigned long)(entry_ptr->addr),
 		  (int)new_size);
 #endif /* JRM */
 
@@ -3582,8 +3582,8 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size)
     if(entry_ptr->is_protected)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "Entry is protected??")
 
-    /* resizing dirties entries -- mark the entry as dirty if it 
-     * isn't already 
+    /* resizing dirties entries -- mark the entry as dirty if it
+     * isn't already
      */
     entry_ptr->is_dirty = TRUE;
     entry_ptr->image_up_to_date = FALSE;
@@ -3634,7 +3634,7 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size)
                                               (new_size));
         }
 
-	/* if journaling is enabled, and the entry is already in the 
+	/* if journaling is enabled, and the entry is already in the
 	 * transaction list, update that list for the size change as well.
 	 */
 	H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
@@ -3654,8 +3654,8 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size)
 	H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
     }
 
-    /* if journaling is enabled, check to see if the entry is in the 
-     * transaction list.  If it isn't, insert it.  If it is, move it to 
+    /* if journaling is enabled, check to see if the entry is in the
+     * transaction list.  If it isn't, insert it.  If it is, move it to
      * the head of the list.
      */
     H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
@@ -3694,9 +3694,9 @@ H5C2_pin_protected_entry(void *thing)
 
     FUNC_ENTER_NOAPI(H5C2_pin_protected_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
-        HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, 
+        HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC,
 	          (unsigned long)(entry_ptr->addr), entry_ptr->type->name);
 #endif /* JRM */
 
@@ -3772,8 +3772,8 @@ done:
  *		make space in the cache.
  *
  *		JRM -- 11/12/04
- *		Added code to call to H5C2_make_space_in_cache()	
- *		after the call to H5C2__auto_adjust_cache_size() if that 
+ *		Added code to call to H5C2_make_space_in_cache()
+ *		after the call to H5C2__auto_adjust_cache_size() if that
  *		function sets the size_decreased flag is TRUE.
  *
  *		JRM -- 4/25/05
@@ -3794,12 +3794,12 @@ done:
  *
  *		JRM -- 6/23/06
  *		Modified code to allow dirty entries to be loaded from
- *		disk.  This is necessary as a bug fix in the object 
+ *		disk.  This is necessary as a bug fix in the object
  *		header code requires us to modify a header as it is read.
  *
  *		JRM -- 3/28/07
  *		Added the flags parameter and supporting code.  At least
- *		for now, this parameter is used to allow the entry to 
+ *		for now, this parameter is used to allow the entry to
  *		be protected read only, thus allowing multiple protects.
  *
  * 		Also added code to allow multiple read only protects
@@ -3811,9 +3811,9 @@ done:
  *
  *		JRM -- 7/11/07
  *		Revised function for the new metadata cache API.  The
- *		function lost its point to H5F_t (now supplied via 
+ *		function lost its point to H5F_t (now supplied via
  *		*cache_ptr), one of its dxpl ids. and one of the udata
- *		fields.  Gained the len parameter.  Also internal 
+ *		fields.  Gained the len parameter.  Also internal
  *		changes supporting the revised API.
  *
  * 		JRM -- 1/3/08
@@ -3821,8 +3821,8 @@ done:
  *              when a large entry is loaded.
  *
  *              JRM 3/31/08
- *              Updated function to insert the newly protected entry in 
- *              the transaction list if journaling is enabled and the 
+ *              Updated function to insert the newly protected entry in
+ *              the transaction list if journaling is enabled and the
  *              entry was dirtied on load.
  *
  *-------------------------------------------------------------------------
@@ -3851,11 +3851,11 @@ H5C2_protect(H5F_t *		  f,
 
     FUNC_ENTER_NOAPI(H5C2_protect, NULL)
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
-        HDfprintf(stdout, 
-		  "%s: addr = 0x%lX, len = %d, type = %s, flags = 0x%x.\n", 
+        HDfprintf(stdout,
+		  "%s: addr = 0x%lX, len = %d, type = %s, flags = 0x%x.\n",
 	          FUNC, (unsigned long)addr, (int)len, type->name, flags);
     }
 #endif /* JRM */
@@ -3892,11 +3892,11 @@ H5C2_protect(H5F_t *		  f,
 
     if ( entry_ptr != NULL ) {
 
-        hit = TRUE; 
-	thing = (void *)entry_ptr; 
-    
-    } else { 
-	    
+        hit = TRUE;
+	thing = (void *)entry_ptr;
+
+    } else {
+
         /* must try to load the entry from disk. */
 
         hit = FALSE;
@@ -3926,8 +3926,8 @@ H5C2_protect(H5F_t *		  f,
              }
         }
 
-	/* try to free up some space if necessary and if 
-	 * evictions are permitted 
+	/* try to free up some space if necessary and if
+	 * evictions are permitted
 	 */
 	if ( ( cache_ptr->evictions_enabled ) &&
              ( (cache_ptr->index_size + entry_ptr->size) >
@@ -3989,7 +3989,7 @@ H5C2_protect(H5F_t *		  f,
              * for the cache to grow without bound.
 	     *
 	     * Third, the user may choose to disable evictions -- causing
-	     * the cache to grow without bound until evictions are 
+	     * the cache to grow without bound until evictions are
 	     * re-enabled.
              *
              * Finally, we usually don't check to see if the cache is
@@ -3997,7 +3997,7 @@ H5C2_protect(H5F_t *		  f,
              * possible to have a vastly oversized cache with no protected
              * entries as long as all the protects preceed the unprotects.
              *
-             * Since items 1, 2, and 3 are not changing any time soon, I 
+             * Since items 1, 2, and 3 are not changing any time soon, I
              * see no point in worrying about the fourth.
              */
 
@@ -4025,7 +4025,7 @@ H5C2_protect(H5F_t *		  f,
         }
 
 	/* under rare (we hope) circumstances, the load routine will
-	 * modify an entry as it loads it to repair corruption from 
+	 * modify an entry as it loads it to repair corruption from
 	 * a previous version of the library.  If this happens, we must
 	 * place the entry on the transaction list.
 	 */
@@ -4040,8 +4040,8 @@ H5C2_protect(H5F_t *		  f,
 	 * code.  If we do this often enough, we may want to optimize this.
 	 *
 	 * Note that we used to do an update for insertion here, but
-	 * that confused the journaling code -- the update for load is 
-	 * just a simplified version of update for insertion that 
+	 * that confused the journaling code -- the update for load is
+	 * just a simplified version of update for insertion that
 	 * avoids the problem.
 	 */
 
@@ -4054,7 +4054,7 @@ H5C2_protect(H5F_t *		  f,
     if ( entry_ptr->is_protected ) {
 
 	if ( ( read_only ) && ( entry_ptr->is_read_only ) ) {
-	
+
 	    HDassert( entry_ptr->ro_ref_count > 0 );
 
 	    (entry_ptr->ro_ref_count)++;
@@ -4150,7 +4150,7 @@ H5C2_protect(H5F_t *		  f,
                 result = H5C2_make_space_in_cache(f,
                                                   dxpl_id,
                                                   cache_ptr,
-                                                  (size_t)0, 
+                                                  (size_t)0,
                                                   write_permitted);
 
                 if ( result < 0 ) {
@@ -4174,7 +4174,7 @@ done:
 
 #if H5C2_PRINT_EXIT_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
-        HDfprintf(stdout, "%s: Exiting with result = 0x%lX.\n", 
+        HDfprintf(stdout, "%s: Exiting with result = 0x%lX.\n",
                   FUNC, (unsigned long)ret_value);
     }
 #endif /* H5C2_PRINT_EXIT_POINTS */
@@ -4747,8 +4747,8 @@ done:
  *		JRM -- 8/23/06
  *		Added code supporting new flush related statistics.
  *
- *		JRM -- 3/31/07 
- *		Added code supporting the new write_protects, 
+ *		JRM -- 3/31/07
+ *		Added code supporting the new write_protects,
  *		read_protects, and max_read_protects fields.
  *
  *-------------------------------------------------------------------------
@@ -4835,9 +4835,9 @@ H5C2_stats(H5C2_t * cache_ptr,
 				+= cache_ptr->cache_flush_renames[i];
         total_size_increases    += cache_ptr->size_increases[i];
         total_size_decreases    += cache_ptr->size_decreases[i];
-    	total_entry_flush_size_changes 
+    	total_entry_flush_size_changes
 				+= cache_ptr->entry_flush_size_changes[i];
-    	total_cache_flush_size_changes 
+    	total_cache_flush_size_changes
 				+= cache_ptr->cache_flush_size_changes[i];
 	total_pins              += cache_ptr->pins[i];
 	total_unpins            += cache_ptr->unpins[i];
@@ -4979,14 +4979,14 @@ H5C2_stats(H5C2_t * cache_ptr,
               (long)total_flushes,
               (long)total_evictions);
 
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "%s  Total insertions(pinned) / renames = %ld(%ld) / %ld\n",
               cache_ptr->prefix,
               (long)total_insertions,
               (long)total_pinned_insertions,
               (long)total_renames);
 
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "%s  Total entry / cache flush renames  = %ld / %ld\n",
               cache_ptr->prefix,
               (long)total_entry_flush_renames,
@@ -5168,7 +5168,7 @@ done:
  *		JRM - 3/20/06
  *		Updated for pin / unpin related statistics.
  *
- *		JRM - 8/9/06 
+ *		JRM - 8/9/06
  *		Further updates for pin related statistics.
  *
  *		JRM 8/23/06
@@ -5179,7 +5179,7 @@ done:
  *		warning in the production build.
  *
  *		JRM 3/31/07
- *		Added initialization for the new write_protects, 
+ *		Added initialization for the new write_protects,
  *		read_protects, and max_read_protects fields.
  *
  *-------------------------------------------------------------------------
@@ -5412,7 +5412,7 @@ done:
  *		equivalent of setting the H5C2__DIRTIED_FLAG.
  *
  *		JRM -- 3/29/07
- *		Modified function to allow a entry to be protected 
+ *		Modified function to allow a entry to be protected
  *		more than once if the entry is protected read only.
  *
  *		Also added sanity checks using the new is_read_only and
@@ -5420,8 +5420,8 @@ done:
  *
  *		JRM -- 9/8/07
  *		Revised function for the new metadata cache API.  The
- *		function lost its pointer to H5F_t (now supplied via 
- *		*cache_ptr), and one of its dxpl ids.  Also internal 
+ *		function lost its pointer to H5F_t (now supplied via
+ *		*cache_ptr), and one of its dxpl ids.  Also internal
  *		changes supporting the revised API.
  *
  *		JRM -- 12/31/07
@@ -5457,11 +5457,11 @@ H5C2_unprotect(H5F_t *		    f,
 
     FUNC_ENTER_NOAPI(H5C2_unprotect, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS 
+#if H5C2_PRINT_ENTRY_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
-    HDfprintf(stdout, 
-	      "%s: addr = 0x%lX, type = %s, flags = 0x%x, new_size = %d.\n", 
+    HDfprintf(stdout,
+	      "%s: addr = 0x%lX, type = %s, flags = 0x%x, new_size = %d.\n",
 	      FUNC, (unsigned long)addr, type->name, flags, (int)new_size);
     }
 #endif /* JRM */
@@ -5524,7 +5524,7 @@ H5C2_unprotect(H5F_t *		    f,
         HDassert( entry_ptr->is_read_only );
 
 	if ( dirtied ) {
-	    
+
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
                         "Read only entry modified(1)??")
 	}
@@ -5839,7 +5839,7 @@ done:
 
 #if H5C2_PRINT_EXIT_POINTS
     if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
-        HDfprintf(stdout, "%s: Exiting with result = %d.\n", 
+        HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
 #endif /* H5C2_PRINT_EXIT_POINTS */
@@ -6144,10 +6144,10 @@ done:
  *		H5C2_auto_size_ctl_t structure.
  *
  *		JRM -- 9/8/07
- *		Reworked to accomodate cache API changes needed to 
+ *		Reworked to accomodate cache API changes needed to
  *		support metadata journaling.  Mostly, this involved
- *		removing a bunch of parameters that used to be 
- *		passed through to other calls, and are no longer 
+ *		removing a bunch of parameters that used to be
+ *		passed through to other calls, and are no longer
  *		needed.
  *
  *		JRM -- 1/5/08
@@ -6509,7 +6509,7 @@ done:
  *              JRM -- 9/9/07
  *		Reworked function to support API changes in support of
  *		metadata cacheing.  In essence, the change involved
- *		removal of arguments that are no longer needed by the 
+ *		removal of arguments that are no longer needed by the
  *		callbacks, and thus no-longer need be passed through.
  *
  *-------------------------------------------------------------------------
@@ -6780,7 +6780,7 @@ done:
  *              JRM -- 9/9/07
  *		Reworked function to support API changes in support of
  *		metadata cacheing.  In essence, the change involved
- *		removal of arguments that are no longer needed by the 
+ *		removal of arguments that are no longer needed by the
  *		callbacks, and thus no-longer need be passed through.
  *
  *		JRM -- 10/13/07
@@ -6789,8 +6789,8 @@ done:
  *		function by a serialize function.  This can happen if
  *		the serialize function associated with the entry being
  *		flushed either accesses the next item in the LRU list,
- *		or (as Quincey assures me is impossible), it accesses 
- *		an entry not currently in cache, causing the eviction 
+ *		or (as Quincey assures me is impossible), it accesses
+ *		an entry not currently in cache, causing the eviction
  *		of the next entry in the LRU.
  *
  *		We handle this situation by detecting it, and restarting
@@ -6805,7 +6805,7 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
                                                  H5C2_t * cache_ptr,
                                                  hbool_t write_permitted)
 {
-    /* const char *	 fcn_name = 
+    /* const char *	 fcn_name =
 	    "H5C2__autoadjust__ageout__evict_aged_out_entries()"; */
     herr_t               ret_value = SUCCEED;      /* Return value */
     herr_t               result;
@@ -6893,7 +6893,7 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                                 "*prev_ptr corrupt")
 
-                } else 
+                } else
 #endif /* NDEBUG */
 		if ( ( prev_ptr->is_dirty != prev_is_dirty )
                      ||
@@ -7335,10 +7335,10 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
             case H5C2_flash_incr__add_space:
                 if ( cache_ptr->index_size < cache_ptr->max_cache_size ) {
 
-                    HDassert( (cache_ptr->max_cache_size - 
+                    HDassert( (cache_ptr->max_cache_size -
 					    cache_ptr->index_size)
                                < space_needed );
-                    space_needed -= cache_ptr->max_cache_size - 
+                    space_needed -= cache_ptr->max_cache_size -
 			            cache_ptr->index_size;
                 }
                 space_needed =
@@ -7557,29 +7557,29 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 
     /* The flush proceedure here is a bit strange.
      *
-     * In the outer while loop we make at least one pass through the 
+     * In the outer while loop we make at least one pass through the
      * cache, and then repeat until either all the pinned entries
      * unpin themselves, or until the number of pinned entries stops
      * declining.  In this later case, we scream and die.
      *
      * Since the fractal heap can dirty, resize, and/or rename entries
      * in is flush callback, it is possible that the cache will still
-     * contain dirty entries at this point.  If so, we must make up to 
-     * H5C2__MAX_PASSES_ON_FLUSH more passes through the skip list 
+     * contain dirty entries at this point.  If so, we must make up to
+     * H5C2__MAX_PASSES_ON_FLUSH more passes through the skip list
      * to allow it to empty.  If is is not empty at this point, we again
      * scream and die.
      *
-     * Further, since clean entries can be dirtied, resized, and/or renamed 
+     * Further, since clean entries can be dirtied, resized, and/or renamed
      * as the result of a flush call back (either the entries own, or that
-     * for some other cache entry), we can no longer promise to flush 
+     * for some other cache entry), we can no longer promise to flush
      * the cache entries in increasing address order.
      *
      * Instead, we just do the best we can -- making a pass through
-     * the skip list, and then a pass through the "clean" entries, and 
-     * then repeating as needed.  Thus it is quite possible that an 
+     * the skip list, and then a pass through the "clean" entries, and
+     * then repeating as needed.  Thus it is quite possible that an
      * entry will be evicted from the cache only to be re-loaded later
-     * in the flush process (From what Quincey tells me, the pin 
-     * mechanism makes this impossible, but even it it is true now, 
+     * in the flush process (From what Quincey tells me, the pin
+     * mechanism makes this impossible, but even it it is true now,
      * we shouldn't count on it in the future.)
      *
      * The bottom line is that entries will probably be flushed in close
@@ -7592,10 +7592,10 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
     while ( ! done )
     {
 	/* first, try to flush-destroy any dirty entries.   Do this by
-	 * making a scan through the slist.  Note that new dirty entries 
+	 * making a scan through the slist.  Note that new dirty entries
 	 * may be created by the flush call backs.  Thus it is possible
 	 * that the slist will not be empty after we finish the scan.
-	 */ 
+	 */
 
         if ( cache_ptr->slist_len == 0 ) {
 
@@ -7619,7 +7619,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                             "next_entry_ptr == NULL 1 ?!?!");
             }
 #ifndef NDEBUG
-            HDassert( next_entry_ptr->magic == 
+            HDassert( next_entry_ptr->magic ==
 			    H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
             HDassert( next_entry_ptr->is_dirty );
@@ -7664,18 +7664,18 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	     * that the serialize callback will dirty and/or resize
 	     * other entries in the cache.  In particular, while
 	     * Quincey has promised me that this will never happen,
-	     * it is possible that the serialize callback for an 
+	     * it is possible that the serialize callback for an
 	     * entry may protect an entry that is not in the cache,
-	     * perhaps causing the cache to flush and possibly 
+	     * perhaps causing the cache to flush and possibly
 	     * evict the entry associated with node_ptr to make
 	     * space for the new entry.
 	     *
 	     * Thus we do a bit of extra sanity checking on entry_ptr,
-	     * and break out of this scan of the skip list if we 
-	     * detect major problems.  We have a bit of leaway on the 
-	     * number of passes though the skip list, so this shouldn't 
-	     * be an issue in the flush in and of itself, as it should 
-	     * be all but impossible for this to happen more than once 
+	     * and break out of this scan of the skip list if we
+	     * detect major problems.  We have a bit of leaway on the
+	     * number of passes though the skip list, so this shouldn't
+	     * be an issue in the flush in and of itself, as it should
+	     * be all but impossible for this to happen more than once
 	     * in any flush.
 	     *
 	     * Observe that that breaking out of the scan early
@@ -7685,7 +7685,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	     * If an entry has merely been marked clean and removed from
              * the s-list, we simply break out of the scan.
              *
-             * If the entry has been evicted, we flag an error and 
+             * If the entry has been evicted, we flag an error and
              * exit.
 	     */
 #ifndef NDEBUG
@@ -7694,12 +7694,12 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "entry_ptr->magic is invalid ?!?!");
 
-            } else 
+            } else
 #endif /* NDEBUG */
 	    if ( ( ! entry_ptr->is_dirty ) ||
                  ( ! entry_ptr->in_slist ) ) {
 
-	        /* the s-list has been modified out from under us. 
+	        /* the s-list has been modified out from under us.
 	         * break out of the loop.
 	         */
 	        break;
@@ -7719,7 +7719,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                                 "next_entry_ptr == NULL 2 ?!?!");
 	        }
 #ifndef NDEBUG
-	        HDassert( next_entry_ptr->magic == 
+	        HDassert( next_entry_ptr->magic ==
 				H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                 HDassert( next_entry_ptr->is_dirty );
@@ -7736,8 +7736,8 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
              * the slist.
              *
              * While this optimization used to be easy, with the possibility
-	     * of new entries being added to the slist in the midst of the 
-	     * flush, we must keep the slist in cannonical form at all 
+	     * of new entries being added to the slist in the midst of the
+	     * flush, we must keep the slist in cannonical form at all
 	     * times.
              */
 
@@ -7753,7 +7753,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	     * cache_ptr->slist_size_increase.
 	     *
 	     * Note that we include pinned entries in this count, even
-	     * though we will not actually flush them.  
+	     * though we will not actually flush them.
 	     */
             actual_slist_len++;
             actual_slist_size += entry_ptr->size;
@@ -7774,7 +7774,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                  * as pinned entries can't be evicted.
                  */
 		if ( TRUE ) { /* When we get to multithreaded cache,
-			       * we will need either locking code, and/or 
+			       * we will need either locking code, and/or
 			       * a test to see if the entry is in flushable
 			       * condition here.
 			       */
@@ -7831,18 +7831,18 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 
 	if ( node_ptr == NULL ) {
 
-            HDassert( (actual_slist_len + cache_ptr->slist_len) == 
+            HDassert( (actual_slist_len + cache_ptr->slist_len) ==
 		      (initial_slist_len + cache_ptr->slist_len_increase) );
-            HDassert( (actual_slist_size + cache_ptr->slist_size) == 
+            HDassert( (actual_slist_size + cache_ptr->slist_size) ==
 		      (initial_slist_size + cache_ptr->slist_size_increase) );
 	}
 #endif /* H5C2_DO_SANITY_CHECKS */
 
         /* Since we are doing a destroy, we must make a pass through
          * the hash table and try to flush - destroy all entries that
-         * remain.  
+         * remain.
 	 *
-	 * It used to be that all entries remaining in the cache at 
+	 * It used to be that all entries remaining in the cache at
 	 * this point had to be clean, but with the fractal heap mods
 	 * this may not be the case.  If so, we will flush entries out
 	 * of increasing address order.
@@ -7856,13 +7856,13 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
             while ( next_entry_ptr != NULL )
             {
                 entry_ptr = next_entry_ptr;
-#ifndef NDEBUG		
+#ifndef NDEBUG
 		HDassert( entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                 next_entry_ptr = entry_ptr->ht_next;
 #ifndef NDEBUG
 		HDassert ( ( next_entry_ptr == NULL ) ||
-			   ( next_entry_ptr->magic == 
+			   ( next_entry_ptr->magic ==
 			     H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) );
 #endif /* NDEBUG */
                 if ( entry_ptr->is_protected ) {
@@ -7878,7 +7878,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                     }
                 } else if ( ! ( entry_ptr->is_pinned ) ) {
 
-                    status = 
+                    status =
 		        H5C2_flush_single_entry(f,
                                                 dxpl_id,
                                                 cache_ptr,
@@ -7908,7 +7908,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 
 		/* if the serialize function on the entry we last evicted
 		 * loaded an entry into cache (as Quincey has promised me
-		 * it never will), and if the cache was full, it is 
+		 * it never will), and if the cache was full, it is
 		 * possible that *nexte_entry_ptr was flushed or evicted.
 		 *
 		 * Test to see if this happened here, and set next_entry_ptr
@@ -7918,10 +7918,10 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 		 */
 #ifndef NDEBUG
 		if ( ( next_entry_ptr != NULL ) &&
-                     ( next_entry_ptr->magic != 
+                     ( next_entry_ptr->magic !=
 		       H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) ) {
 
-		    /* Something horrible has happened to 
+		    /* Something horrible has happened to
                      * *next_entry_ptr -- scream and die.
                      */
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -7946,7 +7946,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
         } else if ( ( cur_pel_len == 0 ) && ( old_pel_len == 0 ) ) {
 
 	    /* increment the pass count */
-	    passes++; 
+	    passes++;
 	}
 
 	if ( passes >= H5C2__MAX_PASSES_ON_FLUSH ) {
@@ -8068,19 +8068,19 @@ done:
  *		as there is no write to file in this case.
  *
  *		JRM -- 8/21/06
- *		Added code maintaining the flush_in_progress and 
- *		destroy_in_progress fields in H5C2_cache_entry_t.  
- *
- *		Also added flush_flags parameter to the call to 
- *		type_ptr->flush() so that the flush routine can report 
- *		whether the entry has been resized or renamed.  Added 
- *		code using the flush_flags variable to detect the case 
- *		in which the target entry is resized during flush, and 
+ *		Added code maintaining the flush_in_progress and
+ *		destroy_in_progress fields in H5C2_cache_entry_t.
+ *
+ *		Also added flush_flags parameter to the call to
+ *		type_ptr->flush() so that the flush routine can report
+ *		whether the entry has been resized or renamed.  Added
+ *		code using the flush_flags variable to detect the case
+ *		in which the target entry is resized during flush, and
  *		update the caches data structures accordingly.
  *
  *
  *		JRM -- 3/29/07
- *		Added sanity checks on the new is_read_only and 
+ *		Added sanity checks on the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM -- 6/25/07
@@ -8095,12 +8095,12 @@ done:
  *		is now in the cache, the function of these flags should
  *		be documented explicitly here in H5C2.
  *
- *		If the H5C2__FLUSH_INVALIDATE_FLAG is set, the entry is to 
- *		be written to disk if dirty, and then evicted from the 
+ *		If the H5C2__FLUSH_INVALIDATE_FLAG is set, the entry is to
+ *		be written to disk if dirty, and then evicted from the
  *		cache and discarded.  As an optimization, the destroyed
  *		is deleted from the slist only on request.
  *
- *		If the H5C2__FLUSH_CLEAR_ONLY_FLAG is set, the entry is 
+ *		If the H5C2__FLUSH_CLEAR_ONLY_FLAG is set, the entry is
  *		to be marked clean if it is dirty.  Under no circumstances
  *		will it be written to disk.
  *
@@ -8111,7 +8111,7 @@ done:
  *		or not as requested.
  *
  *		JRM -- 3/31/08
- *		If journaling is enabled, modified function to remove 
+ *		If journaling is enabled, modified function to remove
  *		the target entry from the transaction list on a clear.
  *		Also added some sanity checks.
  *
@@ -8163,7 +8163,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 
         if ( entry_ptr->in_slist ) {
 
-            if ( ( ( entry_ptr->flush_marker ) && ( ! entry_ptr->is_dirty ) ) 
+            if ( ( ( entry_ptr->flush_marker ) && ( ! entry_ptr->is_dirty ) )
                  ||
                  ( entry_ptr->addr != addr ) ) {
 
@@ -8181,7 +8181,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
             }
         }
     }
-#if 0 
+#if 0
     /* this should be useful for debugging from time to time.
      * lets leave it in for now.       -- JRM 12/15/04
      */
@@ -8244,7 +8244,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
             }
 
             /* Sanity check transfer mode */
-	    /* I'm surprised that this sanity check is working at 
+	    /* I'm surprised that this sanity check is working at
 	     * present -- will need to look into it at some point.
 	     *
 	     * 					JRM -- 7/7/07
@@ -8277,8 +8277,8 @@ H5C2_flush_single_entry(const H5F_t *	     f,
          * from the slist only if requested.
          *
 	 * Note that it is possible that the entry will be renamed during
-	 * its call to flush.  This will upset H5C2_rename_entry() if we 
-	 * don't tell it that it doesn't have to worry about updating the 
+	 * its call to flush.  This will upset H5C2_rename_entry() if we
+	 * don't tell it that it doesn't have to worry about updating the
 	 * index and SLIST.  Use the destroy_in_progress field for this
 	 * purpose.
          */
@@ -8302,7 +8302,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 #if 0 /* JRM */
             /* This test code may come in handy -- lets keep it for a while.
              *
-             * Note that it will cause spurious errors in the serial case 
+             * Note that it will cause spurious errors in the serial case
              * unless we are maintaining the clean and dirty LRU lists.
              */
             {
@@ -8319,12 +8319,12 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                                   fcn_name);
 
                     if ( cache_ptr->dLRU_list_len <= 0 )
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "%s: cache_ptr->dLRU_list_len <= 0.\n",
                                   fcn_name);
 
                     if ( cache_ptr->dLRU_list_size <= 0 )
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "%s: cache_ptr->dLRU_list_size <= 0.\n",
                                   fcn_name);
 
@@ -8341,14 +8341,14 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 
                     if ( ( entry_ptr->aux_prev == NULL ) &&
                          ( cache_ptr->dLRU_head_ptr != entry_ptr ) )
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "%s: entry_ptr->aux_prev == NULL && dLRU_head_ptr != entry_ptr\n",
                                   fcn_name);
 
                     if ( ( entry_ptr->aux_next == NULL ) &&
                          ( cache_ptr->dLRU_tail_ptr != entry_ptr ) )
-                        HDfprintf(stdout, 
-                                  "%s: entry_ptr->aux_next == NULL && dLRU_tail_ptr != entry_ptr\n", 
+                        HDfprintf(stdout,
+                                  "%s: entry_ptr->aux_next == NULL && dLRU_tail_ptr != entry_ptr\n",
                                   fcn_name);
 
                     if ( ( cache_ptr->dLRU_list_len == 1 ) &&
@@ -8361,7 +8361,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                          )
                        )
                     {
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                "%s: single entry dlru sanity check fails\n",
                                fcn_name);
                     }
@@ -8370,12 +8370,12 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                 else
                 {
                     if ( cache_ptr->cLRU_head_ptr == NULL )
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "%s: cache_ptr->cLRU_head_ptr == NULL.\n",
                                   fcn_name);
 
                     if ( cache_ptr->cLRU_tail_ptr == NULL )
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "%s: cache_ptr->cLRU_tail_ptr == NULL.\n",
                                    fcn_name);
 
@@ -8418,7 +8418,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                          )
                        )
                     {
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "%s: single entry clru sanity check fails\n",
                                   fcn_name);
                     }
@@ -8435,17 +8435,17 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 	     * list and set its last_trans field to zero.
 	     *
 	     * Must do this now, as otherwise H5C2__UPDATE_RP_FOR_FLUSH may
-	     * scream incorrectly about flushing an entry with a pending 
+	     * scream incorrectly about flushing an entry with a pending
 	     * journal write.
 	     */
 	    if ( clear_only ) {
                 H5C2__UPDATE_TL_FOR_ENTRY_CLEAR(cache_ptr, entry_ptr, FAIL);
             }
 
-            /* We are either doing a flush or a clear. 
-	     * 
+            /* We are either doing a flush or a clear.
+	     *
 	     * A clear and a flush are the same from the point of view of
-	     * the replacement policy and the slist.  Hence no 
+	     * the replacement policy and the slist.  Hence no
 	     * differentiation between them.
 	     * 					JRM -- 7/7/07
 	     */
@@ -8460,7 +8460,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 
 
         /* Clear the dirty flag only, if requested */
-        if ( clear_only ) 
+        if ( clear_only )
 	{
 	    if ( entry_ptr->is_dirty )
             {
@@ -8468,8 +8468,8 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 		/* only call the clear_dirty_bits callback if debugging
 		 * is enabled.
 		 */
-	        if ( entry_ptr->type->clear_dirty_bits && entry_ptr->type->clear_dirty_bits(addr, 
-					               entry_ptr->size, 
+	        if ( entry_ptr->type->clear_dirty_bits && entry_ptr->type->clear_dirty_bits(addr,
+					               entry_ptr->size,
 						       (void *)entry_ptr)
                      != SUCCEED )
                 {
@@ -8477,20 +8477,20 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                     HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
                                 "clear_dirty_bits() failed.")
                 }
-#endif /* NDEBUG */ 
+#endif /* NDEBUG */
             }
 	    entry_ptr->is_dirty = FALSE;
 
-        } 
-	else if ( entry_ptr->is_dirty ) 
+        }
+	else if ( entry_ptr->is_dirty )
 	{
-	    /* The entry is dirty, and we are doing either a flush, 
-	     * or a flush destroy.  In either case, serialize the 
+	    /* The entry is dirty, and we are doing either a flush,
+	     * or a flush destroy.  In either case, serialize the
 	     * entry and write it to disk.
 	     *
 	     * If the serialize function changes the size or location
 	     * of the entry, and we are not doing a flush destroy, we
-	     * will have to touch up the cache to account for the 
+	     * will have to touch up the cache to account for the
 	     * change(s).
 	     */
 
@@ -8519,7 +8519,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 
 	        if ( entry_ptr->type->serialize(f,
 					        dxpl_id,
-                                                entry_ptr->addr, 
+                                                entry_ptr->addr,
 				                entry_ptr->size,
 					        entry_ptr->image_ptr,
 					        (void *)entry_ptr,
@@ -8543,31 +8543,31 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                            "rename/resize on destroy when journaling enabled.");
                         }
 
-                        /* We have already removed the entry from the 
+                        /* We have already removed the entry from the
 		         * cache's data structures, so no need to update
 		         * them for the re-size and/or rename.  All we need
 		         * to do is update the cache entry so we will have
 		         * the correct values when we actually write the
 		         * image of the entry to disk.
 		         *
-		         * Note that if the serialize function changes the 
+		         * Note that if the serialize function changes the
 		         * size of the disk image of the entry, it must
 		         * deallocate the old image, and allocate a new.
 		         */
 
-                        switch ( serialize_flags ) 
-		        { 
-		  	    case H5C2__SERIALIZE_RESIZED_FLAG: 
+                        switch ( serialize_flags )
+		        {
+		  	    case H5C2__SERIALIZE_RESIZED_FLAG:
 			        H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(    \
 						                  cache_ptr, \
 					                          entry_ptr, \
 								  new_len)
 			        entry_ptr->size = new_len;
 			        entry_ptr->image_ptr = new_image_ptr;
-			        break; 
-			
-			    case (H5C2__SERIALIZE_RESIZED_FLAG | 
-                                  H5C2__SERIALIZE_RENAMED_FLAG): 
+			        break;
+
+			    case (H5C2__SERIALIZE_RESIZED_FLAG |
+                                  H5C2__SERIALIZE_RENAMED_FLAG):
 			        H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(     \
 						                   cache_ptr, \
 					                           entry_ptr, \
@@ -8575,9 +8575,9 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 			        entry_ptr->addr = new_addr;
 			        entry_ptr->size = new_len;
 			        entry_ptr->image_ptr = new_image_ptr;
-			        break; 
-			
-			    default: 
+			        break;
+
+			    default:
 			        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
 					    "unexpected serialize flag(s)")
 			        break;
@@ -8592,21 +8592,21 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                         }
 
 		        /* The entry is not being destroyed, and thus has not
-		         * been removed from the cache's data structures.  
+		         * been removed from the cache's data structures.
 		         *
-		         * Thus, in addition to updating the entry for the 
+		         * Thus, in addition to updating the entry for the
 		         * re-size and/or rename, we must also update the
 		         * cache data structures.
 		         */
 
-                        switch ( serialize_flags ) 
-		        { 
-			    case H5C2__SERIALIZE_RESIZED_FLAG: 
+                        switch ( serialize_flags )
+		        {
+			    case H5C2__SERIALIZE_RESIZED_FLAG:
 			        H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(     \
 						                   cache_ptr, \
 					                           entry_ptr, \
 								   new_len)
-			        /* The replacement policy code thinks the 
+			        /* The replacement policy code thinks the
 			         * entry is already clean, so modify is_dirty
 			         * to meet this expectation.
 			         */
@@ -8619,34 +8619,34 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 							    (new_len));
 
                                 /* The entry can't be protected since we  are
-			         * in the process of flushing it.  Thus we must 
-			         * update the replacement policy data 
-				 * structures for the size change.  The macro 
-				 * deals with the pinned case.  
+			         * in the process of flushing it.  Thus we must
+			         * update the replacement policy data
+				 * structures for the size change.  The macro
+				 * deals with the pinned case.
 			         */
 			        H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, \
 					                        entry_ptr, \
 						 	        new_len);
 
-                                /* The entry can't be in the slist, so no need 
-			         * to update the slist for the size change.  
+                                /* The entry can't be in the slist, so no need
+			         * to update the slist for the size change.
 			         */
 
-			        /* finally, set is_dirty to TRUE again, and 
+			        /* finally, set is_dirty to TRUE again, and
 			         * update the size and image_ptr.
 			         */
 			        entry_ptr->is_dirty = TRUE;
 			        entry_ptr->size = new_len;
 			        entry_ptr->image_ptr = new_image_ptr;
-			        break; 
-			
-			    case (H5C2__SERIALIZE_RESIZED_FLAG | 
-                                  H5C2__SERIALIZE_RENAMED_FLAG): 
+			        break;
+
+			    case (H5C2__SERIALIZE_RESIZED_FLAG |
+                                  H5C2__SERIALIZE_RENAMED_FLAG):
 			        H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(     \
 						                   cache_ptr, \
 					                           entry_ptr, \
 								   new_len)
-			        /* The replacement policy code thinks the 
+			        /* The replacement policy code thinks the
 			         * entry is already clean, so modify is_dirty
 			         * to meet this expectation.
 			         */
@@ -8664,30 +8664,30 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                                                             (entry_ptr->size),\
 							    (new_len));
 
-                                /* The entry can't be protected since we  are 
-			         * in the process of flushing it.  Thus we must 
-			         * update the replacement policy data 
-				 * structures for the size change.  The macro 
-				 * deals with the pinned case.  
+                                /* The entry can't be protected since we  are
+			         * in the process of flushing it.  Thus we must
+			         * update the replacement policy data
+				 * structures for the size change.  The macro
+				 * deals with the pinned case.
 			         */
 			        H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, \
 					                        entry_ptr, \
 						   	        new_len);
 
-                                /* The entry can't be in the slist, so no need 
-			         * to update the slist for the size change.  
+                                /* The entry can't be in the slist, so no need
+			         * to update the slist for the size change.
 			         */
 
-			        /* finally, set is_dirty to TRUE again, and 
+			        /* finally, set is_dirty to TRUE again, and
 			         * update the size and image_ptr.
 			         */
 			        entry_ptr->is_dirty = TRUE;
 
 			        entry_ptr->size = new_len;
 			        entry_ptr->image_ptr = new_image_ptr;
-			        break; 
-			
-			    default: 
+			        break;
+
+			    default:
 			        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
 			 		    "unexpected serialize flag(s)")
 			        break;
@@ -8698,8 +8698,8 @@ H5C2_flush_single_entry(const H5F_t *	     f,
             }
 
 	    /* now write the image to disk */
-	    if ( H5F_block_write(f, type_ptr->mem_type, entry_ptr->addr, 
-				 entry_ptr->size, dxpl_id, 
+	    if ( H5F_block_write(f, type_ptr->mem_type, entry_ptr->addr,
+				 entry_ptr->size, dxpl_id,
 				 entry_ptr->image_ptr) < 0 )
 	    {
 		    HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
@@ -8714,25 +8714,25 @@ H5C2_flush_single_entry(const H5F_t *	     f,
             if ( serialize_flags != 0 ) {
 
                 /* In the parallel case, resizes and renames in
-		 * the serialize operation can cause problems.  
+		 * the serialize operation can cause problems.
 		 * If they occur, scream and die.
 		 *
 		 * At present, in the parallel case, the aux_ptr
-		 * will only be set if there is more than one 
-		 * process.  Thus we can use this to detect 
+		 * will only be set if there is more than one
+		 * process.  Thus we can use this to detect
 		 * the parallel case.
 		 *
-		 * This works for now, but if we start using the 
-		 * aux_ptr for other purposes, we will have to 
+		 * This works for now, but if we start using the
+		 * aux_ptr for other purposes, we will have to
 		 * change this test accordingly.
 		 *
 		 * NB: While this test detects entryies that attempt
 		 *     to resize or rename themselves during a flush
 		 *     in the parallel case, it will not detect an
-		 *     entry that dirties, resizes, and/or renames 
+		 *     entry that dirties, resizes, and/or renames
 		 *     other entries during its flush.
 		 *
-		 *     From what Quincey tells me, this test is 
+		 *     From what Quincey tells me, this test is
 		 *     sufficient for now, as any flush routine that
 		 *     does the latter will also do the former.
 		 *
@@ -8767,7 +8767,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 	    }
 
 	    /* we are about to discard the in core representation --
-	     * set the magic field to bad magic so we can detect a 
+	     * set the magic field to bad magic so we can detect a
 	     * freed entry if we see one.
 	     *
 	     * Also reset the pointer to the cache the entry is within. -QAK
@@ -8835,7 +8835,7 @@ done:
  *
  *		JRM - 6/23/06
  *		Deleted assertion that verified that a newly loaded
- *		entry is clean.  Due to a bug fix, this need not be 
+ *		entry is clean.  Due to a bug fix, this need not be
  *		the case, as our code will attempt to repair errors
  *		on load.
  *
@@ -8844,19 +8844,19 @@ done:
  *		destroy in progress fields.
  *
  *		JRM - 3/29/07
- *		Added initialization for the new is_read_only and 
+ *		Added initialization for the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM - 6/25/07
- *		Reworked function to use the new client callback 
- *		functions that are needed to implement metadata 
+ *		Reworked function to use the new client callback
+ *		functions that are needed to implement metadata
  *		journaling.  Removed skip_file_checks parameter.
  *
  *		JRM -- 10/12/07
  *		Added initialization for the new magic field.
  *
  *		JRM -- 3/26/08
- *		Added initialization for the journaling related 
+ *		Added initialization for the journaling related
  *		fields.
  *
  *-------------------------------------------------------------------------
@@ -8943,7 +8943,7 @@ H5C2_load_entry(H5F_t *              f,
     }
 
     /* If the client's cache has an image_len callback, check it */
-    if ( type->image_len ) 
+    if ( type->image_len )
     {
         size_t			new_len;
 
@@ -8965,8 +8965,8 @@ H5C2_load_entry(H5F_t *              f,
                             "image_ptr null after H5MM_realloc().")
 	    }
 
-            /* If the thing's image needs to be bigger, free the thing 
-             * and retry with new length 
+            /* If the thing's image needs to be bigger, free the thing
+             * and retry with new length
              */
             if ( new_len > len)
             {
@@ -8976,14 +8976,14 @@ H5C2_load_entry(H5F_t *              f,
                                 "free_icr callback failed.")
                 }
 
-                if ( H5F_block_read(f, type->mem_type, addr, new_len, 
+                if ( H5F_block_read(f, type->mem_type, addr, new_len,
                                     dxpl_id, image_ptr) < 0 ) {
 
                     HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, \
                                 "Can't read image")
                 }
 
-                thing = type->deserialize(addr, new_len, image_ptr, 
+                thing = type->deserialize(addr, new_len, image_ptr,
                                           udata_ptr, &dirty);
 
                 if ( thing == NULL ) {
@@ -9002,10 +9002,10 @@ H5C2_load_entry(H5F_t *              f,
     entry_ptr = (H5C2_cache_entry_t *)thing;
 
     /* In general, an entry should be clean just after it is loaded.
-     * 
+     *
      * However, when this code is used in the metadata cache, it is
-     * possible that object headers will be dirty at this point, as 
-     * the deserialize function will alter object headers if necessary to 
+     * possible that object headers will be dirty at this point, as
+     * the deserialize function will alter object headers if necessary to
      * fix an old bug.
      *
      * In the following assert:
@@ -9015,7 +9015,7 @@ H5C2_load_entry(H5F_t *              f,
      * note that type ids 5 & 6 are associated with object headers in the metadata
      * cache.
      *
-     * When we get to using H5C2 for other purposes, we may wish to 
+     * When we get to using H5C2 for other purposes, we may wish to
      * tighten up the assert so that the loophole only applies to the
      * metadata cache.
      */
@@ -9122,17 +9122,17 @@ done:
  *		min clean size before the cache has filled.
  *
  *		JRM -- 3/29/07
- *		Added sanity checks using the new is_read_only and 
+ *		Added sanity checks using the new is_read_only and
  *		ro_ref_count fields.
  *
  *		JRM -- 8/24/07
  *		Reworked parameter list and code for the removal of the
- *		secondary dxpl id, and the decision to store the file 
+ *		secondary dxpl id, and the decision to store the file
  *		pointer f in *cache_ptr.
  *
  *		JRM -- 10/12/07
  *		Added code to detect the case in which the LRU list has
- *		been modified by a serialize callback, and cause the 
+ *		been modified by a serialize callback, and cause the
  *		function to re-start its scan at the tail of the LRU.
  *
  *-------------------------------------------------------------------------
@@ -9207,7 +9207,7 @@ H5C2_make_space_in_cache(H5F_t * f,
                                                      FALSE);
                 } else {
 
-                    result = 
+                    result =
 		        H5C2_flush_single_entry(f,
                                                 dxpl_id,
                                                 cache_ptr,
@@ -9235,13 +9235,13 @@ H5C2_make_space_in_cache(H5F_t * f,
 #ifndef NDEBUG
 		if ( prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) {
 
-		    /* something horrible has happened to *prev_ptr -- 
+		    /* something horrible has happened to *prev_ptr --
 		     * scream and die.
 		     */
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 				"*prev_ptr corrupt 1")
 
-                } else 
+                } else
 #endif /* NDEBUG */
 		if ( entry_is_epoch_maker ) {
 
@@ -9251,7 +9251,7 @@ H5C2_make_space_in_cache(H5F_t * f,
 		     */
                     entry_ptr = prev_ptr;
 
-		} else if ( ( prev_ptr->is_dirty != prev_is_dirty ) 
+		} else if ( ( prev_ptr->is_dirty != prev_is_dirty )
 		            ||
 		            ( prev_ptr->next != next_ptr )
 		            ||
@@ -9259,7 +9259,7 @@ H5C2_make_space_in_cache(H5F_t * f,
 		            ||
 		            ( prev_ptr->is_pinned ) ) {
 
-		    /* something has happened to the LRU -- start over 
+		    /* something has happened to the LRU -- start over
 		     * from the tail.
 		     */
 	            entry_ptr = cache_ptr->LRU_tail_ptr;
@@ -9333,16 +9333,16 @@ H5C2_make_space_in_cache(H5F_t * f,
 #ifndef NDEBUG
 		if (prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC) {
 
-		    /* something horrible has happened to *prev_ptr -- 
+		    /* something horrible has happened to *prev_ptr --
 		     * scream and die.
 		     */
 
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 				"*prev_ptr corrupt 2")
 
-		} else 
+		} else
 #endif /* #ifndef NDEBUG */
-		if ( ( ! ( prev_ptr->is_dirty ) ) 
+		if ( ( ! ( prev_ptr->is_dirty ) )
 	             ||
 	             ( prev_ptr->aux_next != next_ptr )
 	             ||
@@ -9350,29 +9350,29 @@ H5C2_make_space_in_cache(H5F_t * f,
 	             ||
 	             ( prev_ptr->is_pinned ) ) {
 
-		    /* something has happened to the dirty LRU -- start over 
+		    /* something has happened to the dirty LRU -- start over
 		     * from the tail.
 		     */
 
 #if 0 /* This debuging code may be useful in the future -- keep it for now. */
 		    if ( ! ( prev_ptr->is_dirty ) ) {
-			HDfprintf(stdout, "%s: ! prev_ptr->is_dirty\n", 
+			HDfprintf(stdout, "%s: ! prev_ptr->is_dirty\n",
 				  fcn_name);
 		    }
 		    if ( prev_ptr->aux_next != next_ptr ) {
-			HDfprintf(stdout, "%s: prev_ptr->next != next_ptr\n", 
+			HDfprintf(stdout, "%s: prev_ptr->next != next_ptr\n",
 				  fcn_name);
 		    }
 		    if ( prev_ptr->is_protected ) {
-			HDfprintf(stdout, "%s: prev_ptr->is_protected\n", 
+			HDfprintf(stdout, "%s: prev_ptr->is_protected\n",
 				  fcn_name);
 		    }
 		    if ( prev_ptr->is_pinned ) {
-			HDfprintf(stdout, "%s:prev_ptr->is_pinned\n", 
+			HDfprintf(stdout, "%s:prev_ptr->is_pinned\n",
 				  fcn_name);
 		    }
 
-		    HDfprintf(stdout, "%s: re-starting scan of dirty list\n", 
+		    HDfprintf(stdout, "%s: re-starting scan of dirty list\n",
 		      	     fcn_name);
 #endif /* JRM */
 	            entry_ptr = cache_ptr->dLRU_tail_ptr;
@@ -9431,9 +9431,9 @@ H5C2_make_space_in_cache(H5F_t * f,
                             "unable to flush entry")
             }
 
-	    /* we are scanning the clean LRU, so the serialize function 
+	    /* we are scanning the clean LRU, so the serialize function
 	     * will not be called on any entry -- thus there is no
-	     * concern about the list being modified out from under 
+	     * concern about the list being modified out from under
 	     * this function.
 	     */
 
diff --git a/src/H5C2journal.c b/src/H5C2journal.c
index 2aeedd4..88f815e 100644
--- a/src/H5C2journal.c
+++ b/src/H5C2journal.c
@@ -22,12 +22,12 @@
  * Purpose:     This file is a general catchall for functions supporting
  *              metadata journaling.  Note that journaling must be tighly
  *              integrated with the metadata cache, and thus this file only
- *              contains only that code that can be easily separated from 
+ *              contains only that code that can be easily separated from
  *              the rest of the cache code.
  *
  *              Observe also that to minimize overhead, it is quite possible
  *              that many of the functions in this file will be converted
- *              into macros at some point in the future.  
+ *              into macros at some point in the future.
  *
  * Modifications:
  *
@@ -108,7 +108,7 @@ static herr_t H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr,
 
 static herr_t H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
                                         size_t length,
-                                        hbool_t is_end_trans, 
+                                        hbool_t is_end_trans,
                                         uint64_t trans_num);
 
 static herr_t H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
@@ -170,14 +170,14 @@ static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr);
  *              structure.
  *
  *		JRM -- 8/18/08
- *		Added code to flush the cache before journaling 
+ *		Added code to flush the cache before journaling
  *		starts, and to call the metadata journaling status
  *		change callbacks after journaling has been started.
  *
  *		JRM -- 2/10/09
- *		Added journal_magic variable and supporting code.  
+ *		Added journal_magic variable and supporting code.
  *
- *		The idea is to assign a random magic number to both the 
+ *		The idea is to assign a random magic number to both the
  *		journal file, and to the journal configuration information
  *		information in the super block so that it will be hard to
  *		apply the wrong journal file to a corrupted hdf5 file.
@@ -233,7 +233,7 @@ H5C2_begin_journaling(H5F_t * f,
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_flush_cache() failed.") 
+                    "H5C2_flush_cache() failed.")
     }
 
     journal_magic = (int32_t)HDrand();
@@ -294,8 +294,8 @@ done:
  * Function:    H5C2_begin_transaction
  *
  * Purpose:     Handle book keeping for the beginning of a transaction, and
- *              return the transaction ID assigned to the transaction in 
- *              *trans_num_ptr.  
+ *              return the transaction ID assigned to the transaction in
+ *              *trans_num_ptr.
  *
  * Return:      Success:        SUCCEED
  *              Failure:        FAIL
@@ -361,7 +361,7 @@ done:
  *                 journal file.
  *
  *              2) Mark the superblock to indicate that we are no longer
- *                 journaling.  Note that this will flush the HDF5 file 
+ *                 journaling.  Note that this will flush the HDF5 file
  *                 again in passing.
  *
  *              3) Tell the journal file write code to shutdown.  This will
@@ -409,7 +409,7 @@ H5C2_end_journaling(H5F_t * f,
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                             "H5C2_flush_cache() failed.") 
+                             "H5C2_flush_cache() failed.")
 	}
 
 	HDassert( cache_ptr->mdj_enabled );
@@ -422,7 +422,7 @@ H5C2_end_journaling(H5F_t * f,
         cache_ptr->mdj_enabled = FALSE;
 
         /* Remove the journal configuration information from the superblock
-         * extension.  In passing, also discard the cache's copies of the 
+         * extension.  In passing, also discard the cache's copies of the
          * metadata journaling magic, and the journal file name.
          */
         result = H5C2_unmark_journaling_in_progress(f, dxpl_id, cache_ptr);
@@ -569,14 +569,14 @@ done:
  * Purpose:     Return the current metadata journaling status in an
  *              instance of H5C2_mdj_config_t.
  *
- *              If journaling is enabled, config_ptr->enable_journaling 
+ *              If journaling is enabled, config_ptr->enable_journaling
  *              is set to TRUE, and the remaining fields in *config_ptr
  *              will be set to reflect current journaling status.
  *
  *              If journaling is disabled, config_ptr->enable_journaling
  *              is set to FALSE, and the remaining fields of *config_ptr
  *              are undefined.
- * 		
+ *
  * Return:      Success:        SUCCEED
  *              Failure:        FAIL
  *
@@ -612,7 +612,7 @@ H5C2_get_journal_config(H5C2_t * cache_ptr,
 
         config_ptr->enable_journaling = TRUE;
 
-	HDstrncpy(&(config_ptr->journal_file_path[0]), 
+	HDstrncpy(&(config_ptr->journal_file_path[0]),
 		  cache_ptr->jnl_file_name,
 		  H5C2__MAX_JOURNAL_FILE_NAME_LEN);
 
@@ -625,7 +625,7 @@ H5C2_get_journal_config(H5C2_t * cache_ptr,
 	config_ptr->jbrb_use_aio = (cache_ptr->mdj_jbrb).use_aio;
 
 	config_ptr->jbrb_human_readable = (cache_ptr->mdj_jbrb).human_readable;
-	
+
     } else {
 
         config_ptr->enable_journaling = FALSE;
@@ -657,9 +657,9 @@ done:
  *
  * 		   b) Truncate the journal file
  *
- * 		   c) Reset cache_ptr->trans_num and 
+ * 		   c) Reset cache_ptr->trans_num and
  * 		      cache_ptr->last_trans_on_disk to zero.
- * 		
+ *
  * Return:      Success:        SUCCEED
  *              Failure:        FAIL
  *
@@ -724,7 +724,7 @@ H5C2_journal_post_flush(H5F_t * f,
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                         "H5C2_jb__trunc() failed.")
         }
-        
+
 	cache_ptr->trans_num = (uint64_t)0;
 	cache_ptr->last_trans_on_disk = (uint64_t)0;
     }
@@ -751,13 +751,13 @@ done:
  * 		3) Get the ID of the last transaction on disk.
  *
  * 		4) If the value obtained in 3) above has changed,
- * 		   remove all entries whose last transaction has 
+ * 		   remove all entries whose last transaction has
  * 		   made it to disk from the journal write in progress
  * 		   list.
  *
  * 		5) Verify that the journal write in progress list is
  * 		   empty.
- * 		
+ *
  * Return:      Success:        SUCCEED
  *              Failure:        FAIL
  *
@@ -812,7 +812,7 @@ H5C2_journal_pre_flush(H5C2_t * cache_ptr)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                         "H5C2_update_for_new_last_trans_on_disk() failed.")
         }
-    }    
+    }
 
     if ( cache_ptr->jwipl_len != 0 ) {
 
@@ -857,11 +857,11 @@ H5C2_journal_transaction(H5F_t * f,
     size_t new_len;
     void * new_image_ptr;
     void * thing;
-    herr_t result;    
+    herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(H5C2_journal_transaction, FAIL)
-    
+
     HDassert( f != NULL );
     HDassert( cache_ptr != NULL );
     HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
@@ -879,7 +879,7 @@ H5C2_journal_transaction(H5F_t * f,
                     "H5C2_jb__comment() failed.")
     }
 
-    result = H5C2_jb__start_transaction(&(cache_ptr->mdj_jbrb), 
+    result = H5C2_jb__start_transaction(&(cache_ptr->mdj_jbrb),
 		                        cache_ptr->trans_num);
 
     if ( result != SUCCEED ) {
@@ -897,7 +897,7 @@ H5C2_journal_transaction(H5F_t * f,
 	resized = FALSE;
 	renamed = FALSE;
 
-	if ( entry_ptr->is_protected ) 
+	if ( entry_ptr->is_protected )
         {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -916,7 +916,7 @@ H5C2_journal_transaction(H5F_t * f,
             }
         }
 
-	/* This should always be true, unless the entry has already been 
+	/* This should always be true, unless the entry has already been
 	 * serialized in this function, and that serialization caused the
 	 * entry to be resized (and possibly renamed as well).
 	 */
@@ -941,11 +941,11 @@ H5C2_journal_transaction(H5F_t * f,
 
             if ( serialize_flags != 0 ) {
 
-	        /* if the serialize_flags are not zero, the entry has been 
+	        /* if the serialize_flags are not zero, the entry has been
 	         * modified as a result of the serialize.  Pass these changes
-	         * on to the cache, and don't bother to write a journal entry 
-	         * at this time -- the protect/unprotect/rename will move the 
-	         * entry to the head of the transaction list, where we will 
+	         * on to the cache, and don't bother to write a journal entry
+	         * at this time -- the protect/unprotect/rename will move the
+	         * entry to the head of the transaction list, where we will
 	         * handle it later.
 	         */
 
@@ -958,7 +958,7 @@ H5C2_journal_transaction(H5F_t * f,
                                 "entry renamed but not resized?!?!")
                 }
 
-	        if ( resized ) 
+	        if ( resized )
                 {
                     /* in the following protect/unprotect, the dxpl_id
 		     * is irrelement, as we know that the entry is in cache,
@@ -966,7 +966,7 @@ H5C2_journal_transaction(H5F_t * f,
 	             */
 	            thing = H5C2_protect(f, dxpl_id,
 	                                 entry_ptr->type, entry_ptr->addr,
-				         entry_ptr->size, NULL, 
+				         entry_ptr->size, NULL,
 				         H5C2__NO_FLAGS_SET);
 
                     if ( thing == NULL ) {
@@ -977,7 +977,7 @@ H5C2_journal_transaction(H5F_t * f,
 
                     result = H5C2_unprotect(f, dxpl_id,
                                             entry_ptr->type, entry_ptr->addr,
-                                            thing, H5C2__SIZE_CHANGED_FLAG, 
+                                            thing, H5C2__SIZE_CHANGED_FLAG,
 					    new_len);
 
                     if ( result < 0 ) {
@@ -1009,7 +1009,7 @@ H5C2_journal_transaction(H5F_t * f,
 	 * the journal entry, & remove from the transaction list.
 	 */
 	if ( ( ! resized ) && ( ! renamed ) ) {
-                
+
             result = H5C2_jb__journal_entry(&(cache_ptr->mdj_jbrb),
                                             cache_ptr->trans_num,
 					    entry_ptr->addr,
@@ -1051,7 +1051,7 @@ done:
  * Purpose:     Update the journal write in progress list for a change in
  * 		the last transaction on disk.
  *
- * 		Specifically, update the last_trans_on_disk field of 
+ * 		Specifically, update the last_trans_on_disk field of
  * 		*cache_ptr, and then scan the journal write in progress
  * 		list for entries whose last_trans field is now less than
  * 		or equal to cache_ptr->last_trans_on_disk.  Remove all
@@ -1060,7 +1060,7 @@ done:
  * 		the eviction policy data structures.
  *
  * 		Similarly, scan the pinned entry list for entries whose
- * 		last_trans field is now less than or equal to 
+ * 		last_trans field is now less than or equal to
  * 		cache_ptr->last_trans_on_disk.  In this case, just set
  * 		the last trans field to 0.  Note that here we assume that
  * 		the pinned entry list will always be small -- if this
@@ -1149,14 +1149,14 @@ done:
  *
  * Purpose:	If the superblock extension of a newly opened HDF5 file
  * 		indicates that journaling is in progress, the process
- * 		that created the file failed to close it properly, and 
+ * 		that created the file failed to close it properly, and
  * 		thus the file is almost certainly corrupted.
  *
  * 		The purpose of this function is to detect this condition,
- * 		and either throw an error telling the user to run the 
- * 		recovery tool, or if so directed (presumably by the 
- * 		recovery tool) simply delete the metadata journaling 
- * 		configuration block and any reference to journaling in the 
+ * 		and either throw an error telling the user to run the
+ * 		recovery tool, or if so directed (presumably by the
+ * 		recovery tool) simply delete the metadata journaling
+ * 		configuration block and any reference to journaling in the
  * 		superblock extension.
  *
  * 							JRM -- 3/26/08
@@ -1180,7 +1180,7 @@ H5C2_check_for_journaling(H5F_t * f,
         "This file was last written with metadata journaling enabled and was \n";
     const char * l1 =
         "not closed cleanly.  To allow HDF5 to read this file, please run the \n";
-    const char * l2 = 
+    const char * l2 =
 	"journal recovery tool on this file.  The journal was written \n";
     const char * l3 = "to \"";
     const char * l4 = "\".\n";
@@ -1215,8 +1215,8 @@ H5C2_check_for_journaling(H5F_t * f,
                  * we were.
 	         */
 
-                result = H5C2_unmark_journaling_in_progress(f, 
-                                                            dxpl_id, 
+                result = H5C2_unmark_journaling_in_progress(f,
+                                                            dxpl_id,
                                                             cache_ptr);
 
 	        if ( result != SUCCEED ) {
@@ -1226,14 +1226,14 @@ H5C2_check_for_journaling(H5F_t * f,
                 }
 	    } else {
 
-                /* we have to play some games here to set up an error message 
-		 * that contains the journal file path.  In essence, what 
-		 * follows is a somewhat modified version of the HGOTO_ERROR() 
+                /* we have to play some games here to set up an error message
+		 * that contains the journal file path.  In essence, what
+		 * follows is a somewhat modified version of the HGOTO_ERROR()
 		 * macro.
 	         */
-                (void)H5Epush2(H5E_DEFAULT, __FILE__, FUNC, __LINE__, 
-			       H5E_ERR_CLS_g, H5E_CACHE, H5E_CANTJOURNAL, 
-			       "%s%s%s%s%s%s", l0, l1, l2, l3, 
+                (void)H5Epush2(H5E_DEFAULT, __FILE__, FUNC, __LINE__,
+			       H5E_ERR_CLS_g, H5E_CACHE, H5E_CANTJOURNAL,
+			       "%s%s%s%s%s%s", l0, l1, l2, l3,
 			       cache_ptr->jnl_file_name, l4);
 	        (void)H5E_dump_api_stack((int)H5_IS_API(FUNC));
 	        HGOTO_DONE(FAIL)
@@ -1253,7 +1253,7 @@ done:
  * Function:    H5C2_get_journaling_in_progress()
  *
  * Purpose:     Query the HDF5 file to see if it is marked as having
- * 		journaling in progress.  Update the journaling 
+ * 		journaling in progress.  Update the journaling
  * 		configuration fields in the cache structure accordingly.
  *
  * 		At least initially, the purpose of this function is
@@ -1279,8 +1279,8 @@ done:
  *              March 11, 2008
  *
  * Changes:	JRM -- 2/20/09
- *		Reworked to reflect the move of the journal file name 
- *		and magic from the journaling configuration block to 
+ *		Reworked to reflect the move of the journal file name
+ *		and magic from the journaling configuration block to
  *		the metadata journaling superblock extension message.
  *		Note that the journaling configuration block no longer
  *		exists.
@@ -1310,7 +1310,7 @@ H5C2_get_journaling_in_progress(const H5F_t * f,
                         "journaling enabled but jnl file name empty?!?.")
         }
 
-        if ( f->shared->mdc_jnl_file_name_len > 
+        if ( f->shared->mdc_jnl_file_name_len >
              H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -1325,7 +1325,7 @@ H5C2_get_journaling_in_progress(const H5F_t * f,
 
         if ( ( (cache_ptr->jnl_file_name)[cache_ptr->jnl_file_name_len]
                != '\0' ) ||
-             ( HDstrlen(cache_ptr->jnl_file_name) != 
+             ( HDstrlen(cache_ptr->jnl_file_name) !=
                (size_t)(cache_ptr->jnl_file_name_len) ) ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -1343,14 +1343,14 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C2_mark_journaling_in_progress()
  *
- * Purpose:     Modify the HDF5 file to indicate that journaling is 
- * 		in progress, and flush the file to disk.  
+ * Purpose:     Modify the HDF5 file to indicate that journaling is
+ * 		in progress, and flush the file to disk.
  *
- * 		The objective here is to allow us to detect the fact 
- * 		the file was being journaled if we crash before we 
+ * 		The objective here is to allow us to detect the fact
+ * 		the file was being journaled if we crash before we
  * 		close the file properly.
  *
- * 		Note that the function assumes that the file is not 
+ * 		Note that the function assumes that the file is not
  * 		currently marked as having journaling in progress.
  *
  * Return:      Success:        SUCCEED
@@ -1422,8 +1422,8 @@ H5C2_mark_journaling_in_progress(H5F_t * f,
               (size_t)(cache_ptr->jnl_file_name_len + 1));
 
     /* now, load the journaling information into shared, and then call
-     * H5F_super_write_mdj_msg() to write the metadata journaling 
-     * superblock extension message to file.  
+     * H5F_super_write_mdj_msg() to write the metadata journaling
+     * superblock extension message to file.
      */
     f->shared->mdc_jnl_enabled       = TRUE;
     f->shared->mdc_jnl_magic         = journal_magic;
@@ -1455,12 +1455,12 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C2_unmark_journaling_in_progress()
  *
- * Purpose:     Modify the HDF5 file to indicate that journaling is 
- * 		not in progress, and flush the file to disk.  
+ * Purpose:     Modify the HDF5 file to indicate that journaling is
+ * 		not in progress, and flush the file to disk.
  *
  * 		The objective here is to remove the messages indicating
- * 		that the file is being journaled.  We will typically do 
- * 		this either on file close, or if directed to cease 
+ * 		that the file is being journaled.  We will typically do
+ * 		this either on file close, or if directed to cease
  * 		journaling.  Once these messages are removed, we will
  * 		be able to open the file without triggering a "journaling
  * 		in progress" failure.
@@ -1475,10 +1475,10 @@ done:
  *              March 11, 2008
  *
  * Changes:	JRM -- 2/20/09
- *		Reworked function to reflect the move of the journal 
+ *		Reworked function to reflect the move of the journal
  *		file name and magic from the metadata journaling config
- *		block and into a superblock extension message.  Note that 
- *		the metadata journaling configuration block no longer 
+ *		block and into a superblock extension message.  Note that
+ *		the metadata journaling configuration block no longer
  *		exists.
  *
  *-------------------------------------------------------------------------
@@ -1520,7 +1520,7 @@ H5C2_unmark_journaling_in_progress(H5F_t * f,
     cache_ptr->jnl_file_name_len  = 0;
     (cache_ptr->jnl_file_name)[0] = '\0';
 
-    /* now, mark f->shared to indicate that journaling is not in 
+    /* now, mark f->shared to indicate that journaling is not in
      * progress, and then call H5F_super_write_mdj_msg() to write
      * the changes to disk.
      */
@@ -1568,7 +1568,7 @@ done:
  */
 
 static herr_t
-H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, 
+H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr,
 		          hid_t dxpl_id,
 		          H5C2_mdj_config_t * config_ptr)
 {
@@ -1587,27 +1587,27 @@ H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr,
     HDassert( ( cache_ptr->mdjsc_cb_tbl_fl_head == -1 ) ||
 	      ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) );
 
-    if ( ( cache_ptr->num_mdjsc_cbs < 0 ) 
+    if ( ( cache_ptr->num_mdjsc_cbs < 0 )
          ||
-	 ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) 
+	 ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len )
 	 ||
-	 ( cache_ptr->mdjsc_cb_tbl_fl_head < -1 ) 
+	 ( cache_ptr->mdjsc_cb_tbl_fl_head < -1 )
 	 ||
-	 ( cache_ptr->mdjsc_cb_tbl_fl_head > cache_ptr->mdjsc_cb_tbl_len ) 
+	 ( cache_ptr->mdjsc_cb_tbl_fl_head > cache_ptr->mdjsc_cb_tbl_len )
 	 ||
-	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < -1 ) 
+	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < -1 )
 	 ||
-	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= 
-	   cache_ptr->mdjsc_cb_tbl_len ) 
+	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >=
+	   cache_ptr->mdjsc_cb_tbl_len )
 	 ||
-	 ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) 
+	 ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN )
 	 ||
          ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len )
 	   &&
-	   ( ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) 
+	   ( ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 )
 	     ||
 	     ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use !=
-	       cache_ptr->mdjsc_cb_tbl_len - 1 ) 
+	       cache_ptr->mdjsc_cb_tbl_len - 1 )
 	   )
 	 )
 	 ||
@@ -1652,7 +1652,7 @@ done:
  * Function:    H5C2_deregister_mdjsc_callback()
  *
  * Purpose:     Deregister a metadata journaling status change callback,
- * 		shrinking the metadata journaling status callback table 
+ * 		shrinking the metadata journaling status callback table
  * 		as necessary.
  *
  * Return:      Success:        SUCCEED
@@ -1682,10 +1682,10 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
     }
 
     if ( ( cache_ptr->mdjsc_cb_tbl == NULL ) ||
-         ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len ) 
+         ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len )
 	   &&
 	   ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) ) ||
-	 ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) 
+	 ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 )
 	   &&
 	   ( cache_ptr->num_mdjsc_cbs != cache_ptr->mdjsc_cb_tbl_len ) ) ||
          ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) ||
@@ -1694,7 +1694,7 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
 	 ( cache_ptr->num_mdjsc_cbs < 0 ) ||
 	 ( ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < 0 ) &&
 	   ( cache_ptr->num_mdjsc_cbs > 0 ) ) ) {
-	    
+
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "mdjsc_cb_tbl corrupt(1)?!?!");
     }
 
@@ -1710,19 +1710,19 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad idx?!?");
 
     } else if ( ((cache_ptr->mdjsc_cb_tbl)[idx]).fcn_ptr == NULL ) {
-	
+
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 		    "callback already deregistered");
-   
+
     } else if ( ((cache_ptr->mdjsc_cb_tbl)[idx]).fl_next != -1 ) {
-	
+
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "free list corrupted.");
 
     }
 
     ((cache_ptr->mdjsc_cb_tbl)[idx]).fcn_ptr = NULL;
     ((cache_ptr->mdjsc_cb_tbl)[idx]).data_ptr = NULL;
-    ((cache_ptr->mdjsc_cb_tbl)[idx]).fl_next = 
+    ((cache_ptr->mdjsc_cb_tbl)[idx]).fl_next =
 	    cache_ptr->mdjsc_cb_tbl_fl_head;
     cache_ptr->mdjsc_cb_tbl_fl_head = idx;
     (cache_ptr->num_mdjsc_cbs)--;
@@ -1752,19 +1752,19 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
 
     if ( ( cache_ptr->num_mdjsc_cbs >= cache_ptr->mdjsc_cb_tbl_len )
 	 ||
-	 ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) 
+	 ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len )
 	   &&
-	   ( cache_ptr->num_mdjsc_cbs > 0 ) 
+	   ( cache_ptr->num_mdjsc_cbs > 0 )
 	   &&
-	   ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) 
+	   ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 )
 	     ||
 	     ( cache_ptr->mdjsc_cb_tbl_fl_head >= cache_ptr->mdjsc_cb_tbl_len )
-	   ) 
-	 ) 
+	   )
+	 )
 	 ||
-	 ( ( cache_ptr->num_mdjsc_cbs == 0 ) 
+	 ( ( cache_ptr->num_mdjsc_cbs == 0 )
 	   &&
-	   ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != -1 ) 
+	   ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != -1 )
 	 )
        ) {
 
@@ -1776,7 +1776,7 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
 
     if ( ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) &&
          ( cache_ptr->mdjsc_cb_tbl_len > H5C2__MIN_MDJSC_CB_TBL_LEN ) &&
-         ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < 
+         ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use <
 	   (cache_ptr->mdjsc_cb_tbl_len / 2) ) ) {
         herr_t result;
 
@@ -1833,7 +1833,7 @@ H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr)
 
     if ( ( cache_ptr->num_mdjsc_cbs != cache_ptr->mdjsc_cb_tbl_len ) ||
 	 ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) ||
-	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != 
+	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use !=
 	   cache_ptr->mdjsc_cb_tbl_len - 1 ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -1889,7 +1889,7 @@ done:
  * Function:    H5C2_register_mdjsc_callback()
  *
  * Purpose:     Register a metadata journaling status change callback,
- * 		growing the metadata journaling status callback table 
+ * 		growing the metadata journaling status callback table
  * 		as necessary.
  *
  * Return:      Success:        SUCCEED
@@ -1972,18 +1972,18 @@ H5C2_register_mdjsc_callback(H5C2_t * cache_ptr,
     (cache_ptr->num_mdjsc_cbs)++;
 
     if ( ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len ) &&
-	   ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) 
-	 ) 
+	   ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 )
+	 )
          ||
-	 ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) 
+	 ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len )
 	 ||
-	 ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) 
+	 ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len )
 	   &&
-	   ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) 
+	   ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 )
 	     ||
 	     ( cache_ptr->mdjsc_cb_tbl_fl_head >= cache_ptr->mdjsc_cb_tbl_len )
-	   ) 
-	 ) 
+	   )
+	 )
        ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "mdjsc_cb_tbl corrupt(2)?!?!");
@@ -2060,7 +2060,7 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
     if ( ( cache_ptr->num_mdjsc_cbs >= cache_ptr->mdjsc_cb_tbl_len ) ||
 	 ( (cache_ptr->mdjsc_cb_tbl_len / 2) < H5C2__MIN_MDJSC_CB_TBL_LEN ) ||
 	 ( cache_ptr->mdjsc_cb_tbl_fl_head == -1 ) ||
-	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= 
+	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >=
 	   cache_ptr->mdjsc_cb_tbl_len / 2 ) ||
 	 ( fraction_in_use >= H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) ) {
 
@@ -2074,10 +2074,10 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
     new_mdjsc_cb_tbl_len = old_mdjsc_cb_tbl_len / 2;
 
     while ( ( (new_mdjsc_cb_tbl_len / 2) >= H5C2__MIN_MDJSC_CB_TBL_LEN ) &&
-	    ( (((double)(cache_ptr->num_mdjsc_cbs)) / 
-	       ((double)new_mdjsc_cb_tbl_len)) <= 
+	    ( (((double)(cache_ptr->num_mdjsc_cbs)) /
+	       ((double)new_mdjsc_cb_tbl_len)) <=
 	      H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) &&
-	    ( (new_mdjsc_cb_tbl_len / 2) > 
+	    ( (new_mdjsc_cb_tbl_len / 2) >
 	      cache_ptr->mdjsc_cb_tbl_max_idx_in_use ) )
     {
 	new_mdjsc_cb_tbl_len /= 2;
@@ -2107,7 +2107,7 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
 	    new_mdjsc_cb_tbl[i].fcn_ptr = NULL;
 	    new_mdjsc_cb_tbl[i].data_ptr = NULL;
 	    new_mdjsc_cb_tbl[i].fl_next = -1;
-	
+
 	    if ( new_fl_head == -1 ) {
 
 	        new_fl_head = i;
@@ -2155,9 +2155,9 @@ done:
 /**************************************************************************/
 
 /* The following macros are wrappers for the low level binary journal file
- * functions.  They exist, as it is likely that these function will be 
- * converted into macros once we have asynchronous journal file writes 
- * running, and by setting up these wrappers now, we will make this 
+ * functions.  They exist, as it is likely that these function will be
+ * converted into macros once we have asynchronous journal file writes
+ * running, and by setting up these wrappers now, we will make this
  * conversion easier.
  */
 
@@ -2236,7 +2236,7 @@ if ( H5C2_jb_bjf__write_trans_num((struct_ptr), (is_end_trans),           \
  *
  * Programmer:		John Mainzer
  *
- * Purpose:		In the binary journal file format, a comment is 
+ * Purpose:		In the binary journal file format, a comment is
  *			a no-op.  Thus in this function, we simply verify
  *			that we are in fact writing a binary journal file,
  *			and then return.
@@ -2245,14 +2245,14 @@ if ( H5C2_jb_bjf__write_trans_num((struct_ptr), (is_end_trans),           \
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__comment(H5C2_jbrb_t * struct_ptr,
                      const char * comment_ptr)
 {
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb_bjf__comment, FAIL)
-	
+
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
@@ -2282,13 +2282,13 @@ done:
  * Programmer:		John Mainzer
  *
  * Purpose:		Verify that the supplied transaction is in progress,
- *			and that at least one journal entry has been written 
- *			under it. 
+ *			and that at least one journal entry has been written
+ *			under it.
  *
- *                      Then write an end transaction message to the ring 
+ *                      Then write an end transaction message to the ring
  *			buffer.
  *
- *			Make note that the supplied transaction is closed, 
+ *			Make note that the supplied transaction is closed,
  *			and that no transaction is in progress.
  *
  * Returns:		SUCCEED on success.
@@ -2309,7 +2309,7 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
     HDassert( struct_ptr->human_readable == FALSE );
-	
+
     /* Verify that the supplied transaction is in progress */
     if ( ( struct_ptr->trans_in_prog != TRUE ) ||
          ( struct_ptr->cur_trans != trans_num ) ) {
@@ -2317,9 +2317,9 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                    "Transaction not in progress or bad transaction number.")
     } /* end if */
-	
-    /* Verify that at least one journal entry has been written under 
-     * the current transaction 
+
+    /* Verify that at least one journal entry has been written under
+     * the current transaction
      */
     if ( struct_ptr->jentry_written != TRUE ) {
 
@@ -2341,8 +2341,8 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
                                  trans_num,                  \
                                  /* fail_return */ FAIL)
 
-    /* reset boolean flag indicating that at least one journal entry has 
-     * been written under transaction 
+    /* reset boolean flag indicating that at least one journal entry has
+     * been written under transaction
      */
     struct_ptr->jentry_written = FALSE;
 
@@ -2350,7 +2350,7 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     struct_ptr->trans_in_prog = FALSE;
 
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb_bjf__end_transaction */
@@ -2362,15 +2362,15 @@ done:
  *
  * Programmer:		John Mainzer
  *
- * Purpose:		Write an end of address space message with the 
+ * Purpose:		Write an end of address space message with the
  *			supplied EOA in binary format to the journal file.
  *
- *			Note that EOA messages are not generated by the 
- *			metadata cache, and thus are not associated with 
+ *			Note that EOA messages are not generated by the
+ *			metadata cache, and thus are not associated with
  *			transactions.  Since H5C2_jb__write_to_buffer()
- *			expects a transaction number, we use 
+ *			expects a transaction number, we use
  *			struct_ptr->cur_trans and pass is_end_trans
- *			as FALSE.  However, this is just a cluge to 
+ *			as FALSE.  However, this is just a cluge to
  *			keep pre-existing code happy.
  *
  * Returns:		SUCCEED on success.
@@ -2379,21 +2379,21 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr,
 		 haddr_t eoa)
 {
     herr_t ret_value = SUCCEED;
     FUNC_ENTER_NOAPI(H5C2_jb_bjf__eoa, FAIL)
-	
+
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
     HDassert( struct_ptr->human_readable == FALSE );
     HDassert( struct_ptr->hdf5_file_name != NULL );
 
-    /* Verify that header message is present in journal file or ring buffer. 
-     * If not, write it. 
+    /* Verify that header message is present in journal file or ring buffer.
+     * If not, write it.
      */
     if ( struct_ptr->header_present == FALSE ) {
 
@@ -2404,10 +2404,10 @@ H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr,
         }
     } /* end if */
 
-    /* Note that EOA messages are not generated by the metadata cache, and 
-     * thus are not associated with transactions.  Since 
-     * H5C2_jb__write_to_buffer() expects a transaction number, we use 
-     * struct_ptr->cur_trans and pass is_end_trans as FALSE.  However, 
+    /* Note that EOA messages are not generated by the metadata cache, and
+     * thus are not associated with transactions.  Since
+     * H5C2_jb__write_to_buffer() expects a transaction number, we use
+     * struct_ptr->cur_trans and pass is_end_trans as FALSE.  However,
      * this is just a cluge to keep pre-existing code happy.
      */
 
@@ -2446,7 +2446,7 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr,
 			   uint64_t trans_num,
 			   haddr_t base_addr,
@@ -2507,8 +2507,8 @@ H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr,
                               trans_num,                         \
                               /* fail_return */ FAIL)
 
-    /* Indicate that at least one journal entry has been written under 
-     * this transaction 
+    /* Indicate that at least one journal entry has been written under
+     * this transaction
      */
     struct_ptr->jentry_written = TRUE;
 
@@ -2527,9 +2527,9 @@ done:
  * Programmer:		John Mainzer
  *
  * Purpose:		Verify that there is no transaction in progress, and
- *			that the supplied transaction number greater than 
- *			the last.  Then write a binary start transaction 
- *			message to the ring buffer.  Make note of the fact 
+ *			that the supplied transaction number greater than
+ *			the last.  Then write a binary start transaction
+ *			message to the ring buffer.  Make note of the fact
  *			that the supplied transaction is in progress.
  *
  * Returns:		SUCCEED on success.
@@ -2538,7 +2538,7 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
 			       uint64_t trans_num)
 
@@ -2551,7 +2551,7 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
     HDassert(struct_ptr->human_readable == FALSE );
-	
+
     /* Verify that there is no transaction in progress */
     if ( struct_ptr->trans_in_prog != FALSE ) {
 
@@ -2566,8 +2566,8 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
                     "New transaction out of sequence.")
     } /* end if */
 
-    /* Verify that header message is present in journal file or ring buffer. 
-     * If not, write it. 
+    /* Verify that header message is present in journal file or ring buffer.
+     * If not, write it.
      */
     if ( struct_ptr->header_present == FALSE ) {
 
@@ -2593,13 +2593,13 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
                                  /* is_end_trans */ FALSE,     \
                                  trans_num,                    \
                                  /* fail_return */ FAIL)
-		
+
     /* Make note of the fact that supplied transaction is in progress */
     struct_ptr->trans_in_prog = TRUE;
     struct_ptr->cur_trans = trans_num;
 
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb_bjf__start_transaction */
@@ -2612,16 +2612,16 @@ done:
  * Programmer:		John Mainzer
  *			4/24/09
  *
- * Purpose:		Copy the supplied buffer to the ring buffer as 
+ * Purpose:		Copy the supplied buffer to the ring buffer as
  *			efficiently as possible.
  *
- *			If there is space available in the current buffer in 
- *			the ring buffer is big enough, just memcpy the 
+ *			If there is space available in the current buffer in
+ *			the ring buffer is big enough, just memcpy the
  *                      supplied buffer directly into the ring buffer buffer
- *                      and update its fields accordingly.  
+ *                      and update its fields accordingly.
  *
- *			If the supplied buffer will cross ring buffer buffer 
- *			boundaries, for now just call 
+ *			If the supplied buffer will cross ring buffer buffer
+ *			boundaries, for now just call
  *			H5C2_jb__write_to_buffer().
  *
  *			In either case, if struct_ptr->chksum_cur_msg is TRUE,
@@ -2638,7 +2638,7 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
                           size_t buf_size,
                           const char * buf_ptr,
@@ -2653,7 +2653,7 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
     HDassert( buf_size > 0 );
     HDassert( buf_ptr != NULL );
-    HDassert( trans_num > 0 ); 
+    HDassert( trans_num > 0 );
 
     /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE.
      * Throw an error if this invarient doesn't hold.
@@ -2668,8 +2668,8 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
     /* Update the check sum if required */
     if ( struct_ptr->chksum_cur_msg ) {
 
-        struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf_ptr), 
-                                                      buf_size, 
+        struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf_ptr),
+                                                      buf_size,
                                                       struct_ptr->msg_chksum);
     }
 
@@ -2677,10 +2677,10 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
 
         /* If the buffer will fit in the current ring buffer buffer with space
          * left over, just memcpy() it in and touch up the ring buffer
-         * fields accordingly.  
+         * fields accordingly.
          *
-         * This is the common case, so when we convert this function into 
-         * a macro, this will allow us to avoid a function call in the vast 
+         * This is the common case, so when we convert this function into
+         * a macro, this will allow us to avoid a function call in the vast
          * majority of cases.
          */
 
@@ -2708,15 +2708,15 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
         if ( is_end_trans == TRUE ) {
 
             (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num;
-        } 
+        }
 
         HDassert( struct_ptr->cur_buf_free_space > 0 );
 
     } else {
 
         /* Here, handle the case where the write will reach the edge
-         * of a ring buffer buffer.  This gets a bit more complex, so 
-         * for now at least, we will call H5C2_jb__write_to_buffer().  
+         * of a ring buffer buffer.  This gets a bit more complex, so
+         * for now at least, we will call H5C2_jb__write_to_buffer().
          * If this proves too costly, further optimizations will be necessary.
          */
 
@@ -2733,7 +2733,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5C2_jb_bjf__write_buffer() */
- 
+
 
 /******************************************************************************
  *
@@ -2744,15 +2744,15 @@ done:
  *
  * Purpose:		Write the checksum of a binary journal file message
  *			to the ring buffer as eficiently as possible.  Note
- *			that this checksum is computed only on the body of 
+ *			that this checksum is computed only on the body of
  *			the message -- not the signature and version.
  *
- *			If there is space available in the current buffer in 
+ *			If there is space available in the current buffer in
  *			the ring buffer is big enough, just write the chksum
- *                      directly into the ring buffer buffer and update its 
- *			fields accordingly.  
+ *                      directly into the ring buffer buffer and update its
+ *			fields accordingly.
  *
- *			If the chksum will cross ring buffer buffer boundaries, 
+ *			If the chksum will cross ring buffer buffer boundaries,
  *			for now just call H5C2_jb__write_to_buffer().
  *
  *			Note that this function will probably prove to be
@@ -2763,7 +2763,7 @@ done:
  *			FAIL on failure.
  *
  ******************************************************************************/
-static herr_t 
+static herr_t
 H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans,
     uint64_t trans_num)
 {
@@ -2775,7 +2775,7 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans,
     /* Sanity check */
     HDassert(struct_ptr != NULL);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-    HDassert(trans_num > 0); 
+    HDassert(trans_num > 0);
 
     if(!struct_ptr->chksum_cur_msg)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "struct_ptr->chksum_cur_msg is false?!?!.")
@@ -2783,11 +2783,11 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans,
     if(H5C2__CHECKSUM_SIZE < struct_ptr->cur_buf_free_space) {
 
         /* If the checksum will fit in the current buffer with space
-         * left over, just write it directly into the buffer, and 
-         * touch up the ring buffer fields accordingly.  
+         * left over, just write it directly into the buffer, and
+         * touch up the ring buffer fields accordingly.
          *
-         * This is the common case, so when we convert this function into 
-         * a macro, this will allow us to avoid a function call in the vast 
+         * This is the common case, so when we convert this function into
+         * a macro, this will allow us to avoid a function call in the vast
          * majority of cases.
          */
 
@@ -2825,17 +2825,17 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans,
         uint8_t buf[H5C2__CHECKSUM_SIZE + 1];
 
         /* Here, handle the case where the write will reach the edge
-         * of a buffer.  This gets a bit more complex, so for now at 
-         * least, we will construct a buffer containing a binary 
-         * representation of the checksum, and then call 
-         * H5C2_jb__write_to_buffer().  If this proves too costly, 
+         * of a buffer.  This gets a bit more complex, so for now at
+         * least, we will construct a buffer containing a binary
+         * representation of the checksum, and then call
+         * H5C2_jb__write_to_buffer().  If this proves too costly,
          * further optimizations will be necessary.
          */
         p = buf;
         UINT32ENCODE(p, struct_ptr->msg_chksum);
         HDassert( p == &(buf[H5C2__CHECKSUM_SIZE]) );
 
-        if(H5C2_jb__write_to_buffer(struct_ptr, H5C2__CHECKSUM_SIZE, 
+        if(H5C2_jb__write_to_buffer(struct_ptr, H5C2__CHECKSUM_SIZE,
                 (const char *)buf, is_end_trans, trans_num) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.")
     } /* end else */
@@ -2847,7 +2847,7 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans,
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C2_jb_bjf__write_chksum() */
- 
+
 
 /******************************************************************************
  *
@@ -2856,15 +2856,15 @@ done:
  * Programmer:		John Mainzer
  *			4/24/09
  *
- * Purpose:		Write a HDF5 file length to the ring buffer as 
+ * Purpose:		Write a HDF5 file length to the ring buffer as
  *			efficiently as possible.
  *
- *			If the space available in the current buffer in 
- *			the ring buffer is big enough, just encode the 
- *                      lenght directly into the buffer and update its 
- *			fields accordingly.  
+ *			If the space available in the current buffer in
+ *			the ring buffer is big enough, just encode the
+ *                      lenght directly into the buffer and update its
+ *			fields accordingly.
  *
- *			If the binary representation of the length will 
+ *			If the binary representation of the length will
  *			touch buffer boundaries, create a buffer containing
  *			the binary representation of the length, and then
  *			call H5C2_jb__write_to_buffer() to handle the write.
@@ -2883,7 +2883,7 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
                           size_t length,
                           hbool_t is_end_trans,
@@ -2897,7 +2897,7 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
 
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
-    HDassert( trans_num > 0 ); 
+    HDassert( trans_num > 0 );
 
     /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE.
      * Throw an error if this invarient doesn't hold.
@@ -2911,18 +2911,18 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
 
     length_width = struct_ptr->length_width;
 
-    HDassert( ( length_width == 2 ) || 
-              ( length_width == 4 ) || 
+    HDassert( ( length_width == 2 ) ||
+              ( length_width == 4 ) ||
               ( length_width == 8 ) );
 
     if ( length_width < struct_ptr->cur_buf_free_space ) {
 
         /* If the offset will fit in the current buffer with space
-         * left over, just write it directly into the buffer, and 
-         * touch up the ring buffer fields accordingly.  
+         * left over, just write it directly into the buffer, and
+         * touch up the ring buffer fields accordingly.
          *
-         * This is the common case, so when we convert this function into 
-         * a macro, this will allow us to avoid a function call in the vast 
+         * This is the common case, so when we convert this function into
+         * a macro, this will allow us to avoid a function call in the vast
          * majority of cases.
          */
 
@@ -2961,9 +2961,9 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
         /* Update the check sum if required */
         if ( struct_ptr->chksum_cur_msg ) {
 
-            struct_ptr->msg_chksum = 
-		H5_checksum_metadata((const void *)(struct_ptr->head), 
-                                     length_width, 
+            struct_ptr->msg_chksum =
+		H5_checksum_metadata((const void *)(struct_ptr->head),
+                                     length_width,
                                      struct_ptr->msg_chksum);
         }
 
@@ -2982,17 +2982,17 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
         if ( is_end_trans == TRUE ) {
 
             (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num;
-        } 
+        }
 
         HDassert( struct_ptr->cur_buf_free_space > 0 );
 
     } else {
 
         /* Here, handle the case where the write will reach the edge
-         * of a buffer.  This gets a bit more complex, so for now at 
-         * least, we will construct a buffer containing a binary 
-         * representation of the offset, and then call 
-         * H5C2_jb__write_to_buffer().  If this proves too costly, 
+         * of a buffer.  This gets a bit more complex, so for now at
+         * least, we will construct a buffer containing a binary
+         * representation of the offset, and then call
+         * H5C2_jb__write_to_buffer().  If this proves too costly,
          * further optimizations will be necessary.
          */
 
@@ -3019,22 +3019,22 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
         } /* end switch */
 
         HDassert( p == &(buf[length_width]) );
-        if(H5C2_jb__write_to_buffer(struct_ptr, length_width, 
+        if(H5C2_jb__write_to_buffer(struct_ptr, length_width,
                                       (const char *)buf,
                                       is_end_trans, trans_num) != SUCCEED)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.")
 
         /* Update the check sum if required */
         if(struct_ptr->chksum_cur_msg)
-            struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), 
-                                                        length_width, 
+            struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf),
+                                                        length_width,
                                                         struct_ptr->msg_chksum);
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C2_jb_bjf__write_length() */
- 
+
 
 /******************************************************************************
  *
@@ -3043,15 +3043,15 @@ done:
  * Programmer:		John Mainzer
  *			4/24/09
  *
- * Purpose:		Write a HDF5 file offset to the ring buffer as 
+ * Purpose:		Write a HDF5 file offset to the ring buffer as
  *			efficiently as possible.
  *
- *			If the space available in the current buffer in 
- *			the ring buffer is big enough, just encode the 
- *                      offset directly into the buffer and update its 
- *			fields accordingly.  
+ *			If the space available in the current buffer in
+ *			the ring buffer is big enough, just encode the
+ *                      offset directly into the buffer and update its
+ *			fields accordingly.
  *
- *			If the binary representation of the offset will 
+ *			If the binary representation of the offset will
  *			touch buffer boundaries, create a buffer containing
  *			the binary representation of the offset, and then
  *			call H5C2_jb__write_to_buffer() to handle the write.
@@ -3070,7 +3070,7 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
                           haddr_t offset,
                           hbool_t is_end_trans,
@@ -3085,11 +3085,11 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
     /* eoa messages can be written outside transactions -- so it is
-     * possible that the trans_num will be 0.  Since the trans_num is 
+     * possible that the trans_num will be 0.  Since the trans_num is
      * not used unless is_end_trans is TRUE, we make an exception for
      * the eoa message.
      */
-    HDassert( ( ! is_end_trans ) || ( trans_num > 0 ) ); 
+    HDassert( ( ! is_end_trans ) || ( trans_num > 0 ) );
 
     /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE.
      * Throw an error if this invarient doesn't hold.
@@ -3103,18 +3103,18 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
 
     offset_width = struct_ptr->offset_width;
 
-    HDassert( ( offset_width == 2 ) || 
-              ( offset_width == 4 ) || 
+    HDassert( ( offset_width == 2 ) ||
+              ( offset_width == 4 ) ||
               ( offset_width == 8 ) );
 
     if ( offset_width < struct_ptr->cur_buf_free_space ) {
 
         /* If the offset will fit in the current buffer with space
-         * left over, just write it directly into the buffer, and 
-         * touch up the ring buffer fields accordingly.  
+         * left over, just write it directly into the buffer, and
+         * touch up the ring buffer fields accordingly.
          *
-         * This is the common case, so when we convert this function into 
-         * a macro, this will allow us to avoid a function call in the vast 
+         * This is the common case, so when we convert this function into
+         * a macro, this will allow us to avoid a function call in the vast
          * majority of cases.
          */
 
@@ -3153,9 +3153,9 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
         /* Update the check sum if required */
         if ( struct_ptr->chksum_cur_msg ) {
 
-            struct_ptr->msg_chksum = 
-		H5_checksum_metadata((const void *)(struct_ptr->head), 
-                                     offset_width, 
+            struct_ptr->msg_chksum =
+		H5_checksum_metadata((const void *)(struct_ptr->head),
+                                     offset_width,
                                      struct_ptr->msg_chksum);
         }
 
@@ -3174,17 +3174,17 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
         if ( is_end_trans == TRUE ) {
 
             (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num;
-        } 
+        }
 
         HDassert( struct_ptr->cur_buf_free_space > 0 );
 
     } else {
 
         /* Here, handle the case where the write will reach the edge
-         * of a buffer.  This gets a bit more complex, so for now at 
-         * least, we will construct a buffer containing a binary 
-         * representation of the offset, and then call 
-         * H5C2_jb__write_to_buffer().  If this proves too costly, 
+         * of a buffer.  This gets a bit more complex, so for now at
+         * least, we will construct a buffer containing a binary
+         * representation of the offset, and then call
+         * H5C2_jb__write_to_buffer().  If this proves too costly,
          * further optimizations will be necessary.
          */
 
@@ -3216,7 +3216,7 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
 
         HDassert( p == &(buf[offset_width]) );
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, offset_width, 
+        if ( H5C2_jb__write_to_buffer(struct_ptr, offset_width,
                                       (const char *)buf,
                                       is_end_trans, trans_num) != SUCCEED ) {
 
@@ -3227,8 +3227,8 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
         /* Update the check sum if required */
         if ( struct_ptr->chksum_cur_msg ) {
 
-            struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), 
-                                                        offset_width, 
+            struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf),
+                                                        offset_width,
                                                         struct_ptr->msg_chksum);
         }
 
@@ -3239,7 +3239,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5C2_jb_bjf__write_offset() */
- 
+
 
 /******************************************************************************
  *
@@ -3248,24 +3248,24 @@ done:
  * Programmer:		John Mainzer
  *			4/24/09
  *
- * Purpose:		Write the signature and version of a binary journal 
- *			file message to the ring buffer as efficiently as 
+ * Purpose:		Write the signature and version of a binary journal
+ *			file message to the ring buffer as efficiently as
  *			possible.
  *
- *			If there is space available in the current buffer in 
- *			the ring buffer is big enough, just memcpy the 
- *                      signature and write the version directly into the 
- *			buffer and update its fields accordingly.  
+ *			If there is space available in the current buffer in
+ *			the ring buffer is big enough, just memcpy the
+ *                      signature and write the version directly into the
+ *			buffer and update its fields accordingly.
  *
- *			If the signature and version will cross buffer 
- *			boundaries, for now just call 
+ *			If the signature and version will cross buffer
+ *			boundaries, for now just call
  *			H5C2_jb__write_to_buffer().
  *
  *			In either case, if keep_chksum is TRUE, initialize
  *			struct_ptr->msg_chksum to 0, and set struct_ptr->
  *			chksum_cur_msg to TRUE.
  *
- *			Observe that the checksum does not include the 
+ *			Observe that the checksum does not include the
  *			signature and version.
  *
  *			Note that this function will probably prove to be
@@ -3276,7 +3276,7 @@ done:
  *			FAIL on failure.
  *
  ******************************************************************************/
-static herr_t 
+static herr_t
 H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr,
     const uint8_t version, hbool_t keep_chksum, hbool_t is_end_trans,
     uint64_t trans_num)
@@ -3290,21 +3290,21 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr,
     HDassert(sig_ptr);
     HDassert(H5C2_BJNL__SIG_LEN == HDstrlen(sig_ptr));
     HDassert(!is_end_trans);
-    /* eoa messages can occur outside of transactions -- and thus it is 
-     * possible that we will have to process one before any transaction 
+    /* eoa messages can occur outside of transactions -- and thus it is
+     * possible that we will have to process one before any transaction
      * has started -- in which case trans_num will be 0.  Since the trans_num
-     * isn't used unless is_end_trans is TRUE, we carve a small exception 
+     * isn't used unless is_end_trans is TRUE, we carve a small exception
      * for the eoa message.
      */
     HDassert((!is_end_trans) || (trans_num > 0));
 
     if((H5C2_BJNL__SIG_LEN + 1) < struct_ptr->cur_buf_free_space) {
-        /* If the signature and version will fit in the current buffer 
-         * with space left over, just memcpy()/write it in and touch up 
-         * the ring bufferfields accordingly.  
+        /* If the signature and version will fit in the current buffer
+         * with space left over, just memcpy()/write it in and touch up
+         * the ring bufferfields accordingly.
          *
-         * This is the common case, so when we convert this function into 
-         * a macro, this will allow us to avoid a function call in the vast 
+         * This is the common case, so when we convert this function into
+         * a macro, this will allow us to avoid a function call in the vast
          * majority of cases.
          */
 
@@ -3329,7 +3329,7 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr,
         /* update end of buffer space */
         struct_ptr->rb_space_to_rollover -= H5C2_BJNL__SIG_LEN + 1;
 
-        /* is_end_trans must be false in this call, so just throw an 
+        /* is_end_trans must be false in this call, so just throw an
          * error if it is TRUE.
          */
         if(is_end_trans)
@@ -3341,14 +3341,14 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr,
         uint8_t buf[H5C2_BJNL__SIG_LEN + 2];
 
         /* Here, handle the case where the write will reach the edge
-         * of a buffer.  This gets a bit more complex, so for now at 
-         * least, we will call H5C2_jb__write_to_buffer().  If this 
+         * of a buffer.  This gets a bit more complex, so for now at
+         * least, we will call H5C2_jb__write_to_buffer().  If this
          * proves too costly, further optimizations will be necessary.
          */
         HDmemcpy(buf, (const void *)sig_ptr, H5C2_BJNL__SIG_LEN);
         buf[H5C2_BJNL__SIG_LEN] = version;
 
-        if(H5C2_jb__write_to_buffer(struct_ptr, H5C2_BJNL__SIG_LEN + 1, 
+        if(H5C2_jb__write_to_buffer(struct_ptr, H5C2_BJNL__SIG_LEN + 1,
                 (const char *)buf, is_end_trans, trans_num) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.")
     } /* end else */
@@ -3364,7 +3364,7 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr,
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5C2_jb_bjf__write_sig_and_ver() */
- 
+
 
 /******************************************************************************
  *
@@ -3373,17 +3373,17 @@ done:
  * Programmer:		John Mainzer
  *			4/24/09
  *
- * Purpose:		Write the transaction number in a binary journal file 
+ * Purpose:		Write the transaction number in a binary journal file
  *			message to the ring buffer as efficiently as possible.
  *
- *			If the space available in the current buffer in 
- *			the ring buffer is big enough, just write the 
- *                      transaction number directly into the buffer and 
- *			update its fields accordingly.  
+ *			If the space available in the current buffer in
+ *			the ring buffer is big enough, just write the
+ *                      transaction number directly into the buffer and
+ *			update its fields accordingly.
  *
- *			If the transaction will cross or touch buffer 
- *			boundaries, construct binary representation of the 
- *			transaction number in a buffer, and pass it to 
+ *			If the transaction will cross or touch buffer
+ *			boundaries, construct binary representation of the
+ *			transaction number in a buffer, and pass it to
  *			H5C2_jb__write_to_buffer().
  *
  *			In either case, if struct_ptr->chksum_cur_msg is TRUE,
@@ -3400,7 +3400,7 @@ done:
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
                              hbool_t is_end_trans,
                              uint64_t trans_num)
@@ -3412,7 +3412,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
 
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
-    HDassert( trans_num > 0 ); 
+    HDassert( trans_num > 0 );
 
     /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE.
      * Throw an error if this invarient doesn't hold.
@@ -3427,11 +3427,11 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
     if ( H5C2__TRANS_NUM_SIZE < struct_ptr->cur_buf_free_space ) {
 
         /* If the transaction number will fit in the current buffer with space
-         * left over, just write it directly into the buffer, and touch up the 
-         * ring buffer fields accordingly.  
+         * left over, just write it directly into the buffer, and touch up the
+         * ring buffer fields accordingly.
          *
-         * This is the common case, so when we convert this function into 
-         * a macro, this will allow us to avoid a function call in the vast 
+         * This is the common case, so when we convert this function into
+         * a macro, this will allow us to avoid a function call in the vast
          * majority of cases.
          */
 
@@ -3450,9 +3450,9 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
         /* Update the check sum if required */
         if ( struct_ptr->chksum_cur_msg ) {
 
-            struct_ptr->msg_chksum = 
-		H5_checksum_metadata((const void *)(struct_ptr->head), 
-                                     H5C2__TRANS_NUM_SIZE, 
+            struct_ptr->msg_chksum =
+		H5_checksum_metadata((const void *)(struct_ptr->head),
+                                     H5C2__TRANS_NUM_SIZE,
                                      struct_ptr->msg_chksum);
         }
 
@@ -3471,14 +3471,14 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
         if ( is_end_trans == TRUE ) {
 
             (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num;
-        } 
+        }
 
         HDassert( struct_ptr->cur_buf_free_space > 0 );
 
     } else {
 
         /* Here, handle the case where the write will reach the edge
-         * of a buffer.  This gets a bit more complex, so for now at 
+         * of a buffer.  This gets a bit more complex, so for now at
          * least, we will construct a buffer containing a binary representation
          * of the transaction number, and then call H5C2_jb__write_to_buffer().
          * If this proves too costly, further optimizations will be necessary.
@@ -3492,7 +3492,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
 
         HDassert( p == &(buf[H5C2__TRANS_NUM_SIZE]) );
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, H5C2__TRANS_NUM_SIZE, 
+        if ( H5C2_jb__write_to_buffer(struct_ptr, H5C2__TRANS_NUM_SIZE,
                                       (const char *)buf,
                                       is_end_trans, trans_num) != SUCCEED ) {
 
@@ -3503,8 +3503,8 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
         /* Update the check sum if required */
         if ( struct_ptr->chksum_cur_msg ) {
 
-            struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), 
-                                                         H5C2__TRANS_NUM_SIZE, 
+            struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf),
+                                                         H5C2__TRANS_NUM_SIZE,
                                                          struct_ptr->msg_chksum);
         }
 
@@ -3530,8 +3530,8 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
-H5C2_jb__bin2hex(const uint8_t * buf, 
+herr_t
+H5C2_jb__bin2hex(const uint8_t * buf,
                  char * hexdata,
                  size_t * hexlength,
                  size_t buf_size)
@@ -3540,7 +3540,7 @@ H5C2_jb__bin2hex(const uint8_t * buf,
     size_t         v;                   /* Local index variable */
     uint8_t        c;
     char *         t;
-	
+
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5C2_jb__bin2hex)
 
     t = hexdata;
@@ -3570,16 +3570,16 @@ H5C2_jb__bin2hex(const uint8_t * buf,
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
  *
- * Purpose:		Insert the supplied comment in the journal file. This 
- * 			call may be ignored if the journal file is machine 
+ * Purpose:		Insert the supplied comment in the journal file. This
+ * 			call may be ignored if the journal file is machine
  *			readable.
  *
  * Returns:		SUCCEED on success.
  *
  * Changes:		Turned this function into a switch board function,
- *			calling either the human readable or the binary 
- *			journal file version of the function as indicated 
- *			by struct_ptr->human_readable.  
+ *			calling either the human readable or the binary
+ *			journal file version of the function as indicated
+ *			by struct_ptr->human_readable.
  *
  *			The original version of this file has been renamed
  *			to H5C2_jb_hrjf__comment().
@@ -3588,14 +3588,14 @@ H5C2_jb__bin2hex(const uint8_t * buf,
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__comment(H5C2_jbrb_t * struct_ptr,
 		 const char * comment_ptr)
 {
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb__comment, FAIL)
-	
+
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
@@ -3632,7 +3632,7 @@ done:
  *			Wednesday, February 6, 2008
  *
  * Purpose:		Verify that the supplied transaction is in progress,
- *			and that at least one journal entry has been written 
+ *			and that at least one journal entry has been written
  *			under it. Then construct an end transaction message,
  *			and write it to the current journal buffer. Make note
  *			that the supplied transaction is closed, and that no
@@ -3641,9 +3641,9 @@ done:
  * Returns:		SUCCEED on success.
  *
  * Changes:		Turned this function into a switch board function,
- *			calling either the human readable or the binary 
- *			journal file version of the function as indicated 
- *			by struct_ptr->human_readable.  
+ *			calling either the human readable or the binary
+ *			journal file version of the function as indicated
+ *			by struct_ptr->human_readable.
  *
  *			The original version of this file has been renamed
  *			to H5C2_jb_hrjf__end_transaction().
@@ -3679,9 +3679,9 @@ H5C2_jb__end_transaction(H5C2_jbrb_t * struct_ptr,
                         "H5C2_jb_bjf__end_transaction() failed.")
         }
     }
-	
+
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb__end_transaction */
@@ -3699,9 +3699,9 @@ done:
  * Returns:		SUCCEED on success.
  *
  * Changes:		Turned this function into a switch board function,
- *			calling either the human readable or the binary 
- *			journal file version of the function as indicated 
- *			by struct_ptr->human_readable.  
+ *			calling either the human readable or the binary
+ *			journal file version of the function as indicated
+ *			by struct_ptr->human_readable.
  *
  *			The original version of this file has been renamed
  *			to H5C2_jb_hrjf__eoa().
@@ -3710,14 +3710,14 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__eoa(H5C2_jbrb_t * struct_ptr,
              haddr_t eoa)
 {
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb__eoa, FAIL)
-	
+
     /* Check Arguments */
     HDassert( struct_ptr );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
@@ -3762,7 +3762,7 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 {
     int result;
@@ -3774,7 +3774,7 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-	
+
     /* Check if transaction is in progress */
 
     if (struct_ptr->trans_in_prog != FALSE) {
@@ -3786,8 +3786,8 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
     if (struct_ptr->get > struct_ptr->put) {
 
 	/* write from get through end of buffer */
-	result = HDwrite(struct_ptr->journal_file_fd, 
-	      (*struct_ptr->buf)[struct_ptr->get], 
+	result = HDwrite(struct_ptr->journal_file_fd,
+	      (*struct_ptr->buf)[struct_ptr->get],
 	      (struct_ptr->num_bufs - struct_ptr->get) * struct_ptr->buf_size);
 
 	if ( result == -1 ) {
@@ -3795,18 +3795,18 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "Journal file write failed(1).")
         }
-        
+
 	struct_ptr->bufs_in_use -= (struct_ptr->num_bufs - struct_ptr->get);
         struct_ptr->rb_free_space += (struct_ptr->num_bufs - struct_ptr->get) * struct_ptr->buf_size;
         struct_ptr->get = 0;
-        
+
     } /* end if */
 
     if (struct_ptr->get < struct_ptr->put) {
 
 	/* write from get up to, but not including, put */
-	result = HDwrite(struct_ptr->journal_file_fd, 
-	            (*struct_ptr->buf)[struct_ptr->get], 
+	result = HDwrite(struct_ptr->journal_file_fd,
+	            (*struct_ptr->buf)[struct_ptr->get],
 	            (struct_ptr->put - struct_ptr->get) * struct_ptr->buf_size);
 
 	if ( result == -1 ) {
@@ -3824,8 +3824,8 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
     if ( struct_ptr->cur_buf_free_space != struct_ptr->buf_size ) {
 
         /* flush partially filled portion of current journal buffer to disk */
-	result = HDwrite(struct_ptr->journal_file_fd, 
-	               (*struct_ptr->buf)[struct_ptr->put], 
+	result = HDwrite(struct_ptr->journal_file_fd,
+	               (*struct_ptr->buf)[struct_ptr->put],
 	               struct_ptr->buf_size - struct_ptr->cur_buf_free_space);
 
 	if ( result == -1 ) {
@@ -3849,19 +3849,19 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, "Journal file sync failed.")
 
     /* record last transaction number that made it to disk */
-    struct_ptr->last_trans_on_disk = 
+    struct_ptr->last_trans_on_disk =
 		(*struct_ptr->trans_tracking)[struct_ptr->put];
 
-    /* MIKE: optimization note: don't reset to top of ring buffer. 
-     * instead, keep filling out current buffer so we can keep writes 
-     * on block boundaries. 
+    /* MIKE: optimization note: don't reset to top of ring buffer.
+     * instead, keep filling out current buffer so we can keep writes
+     * on block boundaries.
      */
     struct_ptr->cur_buf_free_space = struct_ptr->buf_size;
     struct_ptr->rb_space_to_rollover = struct_ptr->num_bufs * struct_ptr->buf_size;
     struct_ptr->head = (*struct_ptr->buf)[0];
     struct_ptr->put = 0;
 
-    /* Propogate the last transaction on in the buffers throughout the 
+    /* Propogate the last transaction on in the buffers throughout the
      * transaction tracking array. */
     for(i = 0; i < struct_ptr->num_bufs; i++)
 	(*struct_ptr->trans_tracking)[i] = struct_ptr->last_trans_on_disk;
@@ -3881,17 +3881,17 @@ done:
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
  *
- * Purpose:		Flush all the dirtied buffers in the ring buffer 
- *                      starting with the buffer referenced by struct_ptr->get 
+ * Purpose:		Flush all the dirtied buffers in the ring buffer
+ *                      starting with the buffer referenced by struct_ptr->get
  *                      and ending with the buffer right before the one
- *                      referenced by struct_ptr->put. 
+ *                      referenced by struct_ptr->put.
  *
  * Returns:		SUCCEED on success.
  *
  ******************************************************************************/
 
-herr_t 
-H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)	
+herr_t
+H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
 {
     int result;
     herr_t ret_value = SUCCEED;
@@ -3907,12 +3907,12 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
     /* flush all full, dirtied journal buffers to disk */
     if (struct_ptr->get < struct_ptr->put) {
 
-	/* can write solid chunk from get up to, but not 
-	 * including, put 
+	/* can write solid chunk from get up to, but not
+	 * including, put
 	 */
-	result = HDwrite(struct_ptr->journal_file_fd, 
-	                 (*struct_ptr->buf)[struct_ptr->get], 
-	                 (struct_ptr->put - struct_ptr->get) * 
+	result = HDwrite(struct_ptr->journal_file_fd,
+	                 (*struct_ptr->buf)[struct_ptr->get],
+	                 (struct_ptr->put - struct_ptr->get) *
                            struct_ptr->buf_size);
 
 	if ( result == -1 ) {
@@ -3929,8 +3929,8 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
     else {
 
 	/* write from get through end of buffer */
-	result = HDwrite(struct_ptr->journal_file_fd, 
-	      (*struct_ptr->buf)[struct_ptr->get], 
+	result = HDwrite(struct_ptr->journal_file_fd,
+	      (*struct_ptr->buf)[struct_ptr->get],
 	      (struct_ptr->num_bufs - struct_ptr->get) * struct_ptr->buf_size);
 
 	if ( result == -1 ) {
@@ -3946,12 +3946,12 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
         /* if put = 0, then everything that needs to be flushed will have been
          * flushed, so we can stop here. Otherwise, need to flush all buffers
          * from the start of the ring buffer's allocated space up to, but not
-         * including, the buffer indexed by put. 
+         * including, the buffer indexed by put.
          */
         if (struct_ptr->put != 0) {
 
-            result = HDwrite(struct_ptr->journal_file_fd, 
-                             (*struct_ptr->buf)[0], 
+            result = HDwrite(struct_ptr->journal_file_fd,
+                             (*struct_ptr->buf)[0],
                              (struct_ptr->put) * struct_ptr->buf_size);
 
 	    if ( result == -1 ) {
@@ -3967,21 +3967,21 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr)
 	struct_ptr->bufs_in_use -= struct_ptr->put;
 
     } /* end else */
-	
+
     HDassert(struct_ptr->bufs_in_use <= 1);
 
     /* update get index */
     struct_ptr->get = struct_ptr->put;
-	
+
     /* record last transaction number that made it to disk */
     if (struct_ptr->put == 0) {
 
-	struct_ptr->last_trans_on_disk = 
+	struct_ptr->last_trans_on_disk =
 		(*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1];
 
     } else {
 
-	struct_ptr->last_trans_on_disk = 
+	struct_ptr->last_trans_on_disk =
 		(*struct_ptr->trans_tracking)[struct_ptr->put - 1];
     }
 
@@ -4008,20 +4008,20 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
 				      uint64_t * trans_num_ptr)
 {
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb__get_last_transaction_on_disk, FAIL)
-	
+
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
     HDassert( trans_num_ptr != NULL );
     HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
 
-    /* JRM: In machine readable version, lets check to see if a sync is 
+    /* JRM: In machine readable version, lets check to see if a sync is
      *      necessary, and call it only if it is.
      */
     /* perform a sync to ensure everything gets to disk before continuing */
@@ -4044,19 +4044,19 @@ done:
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
  *
- * Purpose:		Insert the supplied comment in the journal file. This 
- * 			call may be ignored if the journal file is machine 
+ * Purpose:		Insert the supplied comment in the journal file. This
+ * 			call may be ignored if the journal file is machine
  *			readable.
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__comment() to H5C2_jb_hrjf__comment().  
+ * Changes:		Renamed H5C2_jb__comment() to H5C2_jb_hrjf__comment().
  *
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr,
  		      const char * comment_ptr)
 {
@@ -4065,15 +4065,15 @@ H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr,
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb_hrjf__comment, FAIL)
-	
+
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(comment_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
     HDassert(struct_ptr->hdf5_file_name);
 
-    /* Verify that header message is present in journal file or ring buffer. 
-     * If not, write it. 
+    /* Verify that header message is present in journal file or ring buffer.
+     * If not, write it.
      */
     if ( struct_ptr->header_present == FALSE ) {
 
@@ -4116,7 +4116,7 @@ done:
  *			Wednesday, February 6, 2008
  *
  * Purpose:		Verify that the supplied transaction is in progress,
- *			and that at least one journal entry has been written 
+ *			and that at least one journal entry has been written
  *			under it. Then construct an end transaction message,
  *			and write it to the current journal buffer. Make note
  *			that the supplied transaction is closed, and that no
@@ -4125,7 +4125,7 @@ done:
  * Returns:		SUCCEED on success.
  *
  * Changes:		Renamed H5C2_jb__end_transaction() to
- *			H5C2_jb_hrjf__end_transaction().  
+ *			H5C2_jb_hrjf__end_transaction().
  *							JRM -- 5/2/09
  *
  *****************************************************************************/
@@ -4142,7 +4142,7 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-	
+
     /* Verify that the supplied transaction is in progress */
     if ( ( struct_ptr->trans_in_prog != TRUE ) ||
          ( struct_ptr->cur_trans != trans_num ) ) {
@@ -4150,9 +4150,9 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "Transaction not in progress or bad transaction number.")
     } /* end if */
-	
-    /* Verify that at least one journal entry has been written under 
-     * the current transaction 
+
+    /* Verify that at least one journal entry has been written under
+     * the current transaction
      */
     if ( struct_ptr->jentry_written != TRUE ) {
 
@@ -4165,15 +4165,15 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     HDsnprintf(temp, (size_t)25, "3 end_trans %llu\n", trans_num);
 
     /* Write end transaction message */
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, 
+    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp,
 			          TRUE, trans_num ) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                     "H5C2_jb__write_to_buffer() failed.\n")
     } /* end if */
 
-    /* reset boolean flag indicating if at least one journal entry has 
-     * been written under transaction 
+    /* reset boolean flag indicating if at least one journal entry has
+     * been written under transaction
      */
     struct_ptr->jentry_written = FALSE;
 
@@ -4181,7 +4181,7 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     struct_ptr->trans_in_prog = FALSE;
 
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb_hrjf__end_transaction */
@@ -4198,12 +4198,12 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__eoa() to H5C2_jb_hrjf__eoa().  
+ * Changes:		Renamed H5C2_jb__eoa() to H5C2_jb_hrjf__eoa().
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr,
 		  haddr_t eoa)
 {
@@ -4212,14 +4212,14 @@ H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr,
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(H5C2_jb_hrjf__eoa, FAIL)
-	
+
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
     HDassert(struct_ptr->hdf5_file_name);
 
-    /* Verify that header message is present in journal file or ring buffer. 
-     * If not, write it. 
+    /* Verify that header message is present in journal file or ring buffer.
+     * If not, write it.
      */
     if(struct_ptr->header_present == FALSE ) {
         if(H5C2_jb__write_header_entry(struct_ptr) != SUCCEED)
@@ -4254,13 +4254,13 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__journal_entry() to 
- *			H5C2_jb_hrjf__journal_entry().  
+ * Changes:		Renamed H5C2_jb__journal_entry() to
+ *			H5C2_jb_hrjf__journal_entry().
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
 	   		    uint64_t trans_num,
 			    haddr_t base_addr,
@@ -4288,7 +4288,7 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
     }
 
     HDmemcpy(bodydata, body, length);
-	
+
     /* Verify that the supplied transaction is in progress */
     if ( ( struct_ptr->trans_in_prog != TRUE ) ||
          ( struct_ptr->cur_trans != trans_num ) ) {
@@ -4310,11 +4310,11 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
     }
 
     /* Write journal entry */
-    HDsnprintf(temp, 
+    HDsnprintf(temp,
                (size_t)(length + 100),
-               "2 trans_num %llu length %zu base_addr 0x%lx body ", 
- 	       trans_num, 
-	       length, 
+               "2 trans_num %llu length %zu base_addr 0x%lx body ",
+ 	       trans_num,
+	       length,
 	       (unsigned long)base_addr);
 
     if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, FALSE, trans_num) < 0 ) {
@@ -4332,8 +4332,8 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
                     "H5C2_jb__write_to_buffer() failed.\n")
     } /* end if */
 
-    /* Indicate that at least one journal entry has been written under 
-     * this transaction 
+    /* Indicate that at least one journal entry has been written under
+     * this transaction
      */
     if ( struct_ptr->jentry_written == FALSE ) {
 
@@ -4372,21 +4372,21 @@ done:
  *			Wednesday, February 6, 2008
  *
  * Purpose:		Verify that there is no transaction in progress, and
- *			that the supplied transaction number greater than 
- *			the last.  Then construct a start transaction message, 
+ *			that the supplied transaction number greater than
+ *			the last.  Then construct a start transaction message,
  *			and write it to the current journal buffer. Make note
  *			of the fact that the supplied transaction is in
  *			progress.
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__start_transaction() to 
- *			H5C2_jb_hrjf__start_transaction().  
+ * Changes:		Renamed H5C2_jb__start_transaction() to
+ *			H5C2_jb_hrjf__start_transaction().
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
-static herr_t 
+static herr_t
 H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
 			   uint64_t trans_num)
 
@@ -4399,7 +4399,7 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-	
+
     /* Verify that there is no transaction in progress */
     if ( struct_ptr->trans_in_prog != FALSE ) {
 
@@ -4407,7 +4407,7 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
                     "Transaction already in progress.")
     } /* end if */
 
-    /* JRM: Heads up:  we may relax this constraint to rquire that the 
+    /* JRM: Heads up:  we may relax this constraint to rquire that the
      *      new transaction number is greater than the old, but possibly
      *      not the next integer in sequence.  Will this cause problems
      *      with testing?
@@ -4420,8 +4420,8 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
                     "New transaction out of sequence.")
     } /* end if */
 
-    /* Verify that header message is present in journal file or ring buffer. 
-     * If not, write it. 
+    /* Verify that header message is present in journal file or ring buffer.
+     * If not, write it.
      */
     if ( struct_ptr->header_present == FALSE ) {
 
@@ -4435,19 +4435,19 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
 
     /* Write start transaction message */
     HDsnprintf(temp, (size_t)150, "1 bgn_trans %llu\n", trans_num);
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, 
+    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp,
 			          FALSE, trans_num) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                     "H5C2_jb__write_to_buffer() failed.\n")
     } /* end if */
-		
+
     /* Make note of the fact that supplied transaction is in progress */
     struct_ptr->trans_in_prog = TRUE;
     struct_ptr->cur_trans = trans_num;
 
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5C2_jb_hrjf__start_transaction() */
@@ -4472,26 +4472,26 @@ done:
  *			Added the journal_magic parameter and related code.
  *
  *			Also deleted code to write the header message.
- *			Since the base address of the journal magic in 
+ *			Since the base address of the journal magic in
  *			the HDF5 file isn't available at this time, wait
  *			until our first real entry to write the header.
  *
  *			JRM -- 4/16/09
  *			Added the sizeof_addr and sizeof_size parameters, and
- *			associated code.  These parameters must contain the 
+ *			associated code.  These parameters must contain the
  *			values of the same name in the instance of H5F_file_t
  *			associated with the target file.
  *
  ******************************************************************************/
 
-herr_t 
-H5C2_jb__init(H5C2_jbrb_t * struct_ptr,  	
+herr_t
+H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
               const int32_t journal_magic,
-	      const char * HDF5_file_name,	 	
-	      const char * journal_file_name, 	
-	      size_t buf_size,		
-	      int num_bufs,		 	
-	      hbool_t use_aio,		
+	      const char * HDF5_file_name,
+	      const char * journal_file_name,
+	      size_t buf_size,
+	      int num_bufs,
+	      hbool_t use_aio,
  	      hbool_t human_readable,
               size_t sizeof_addr,
               size_t sizeof_size)
@@ -4537,7 +4537,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                 "allocation of space for copy of journal_file_name failed.");
-    } 
+    }
 
     struct_ptr->hdf5_file_name = HDstrdup(HDF5_file_name);
 
@@ -4545,7 +4545,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                 "allocation of space for copy of HDF5_file_name failed.");
-    } 
+    }
 
     struct_ptr->header_present = FALSE;
     struct_ptr->cur_buf_free_space = buf_size;
@@ -4555,9 +4555,9 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
     struct_ptr->trans_tracking = NULL;
     struct_ptr->buf = NULL;
 
-	
+
     /* Open journal file */
-    struct_ptr->journal_file_fd = 
+    struct_ptr->journal_file_fd =
 	    HDopen(journal_file_name, O_WRONLY|O_CREAT|O_EXCL, 0777);
 
     if ( struct_ptr->journal_file_fd  == -1) {
@@ -4566,7 +4566,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
                     "Can't create journal file.  Does it already exist?")
     } /* end if */
 
-	
+
     /* Allocate space for the ring buffer's journal buffer pointers */
     struct_ptr->buf = H5MM_malloc(struct_ptr->num_bufs * sizeof(char *));
 
@@ -4575,9 +4575,9 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "allocation of buf pointer array failed.");
     } /* end if */
-	
+
     /* Allocate space for journal buffers */
-    (*struct_ptr->buf)[0] = 
+    (*struct_ptr->buf)[0] =
             H5MM_malloc(struct_ptr->buf_size * struct_ptr->num_bufs);
 
     if ( (*struct_ptr->buf)[0] == NULL ) {
@@ -4586,10 +4586,10 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
                     "allocation of buffers failed.");
     } /* end if */
 
-    /* Allocate space for the purposes of tracking the last 
-     * transaction on disk 
+    /* Allocate space for the purposes of tracking the last
+     * transaction on disk
      */
-    struct_ptr->trans_tracking = 
+    struct_ptr->trans_tracking =
     	H5MM_malloc(struct_ptr->num_bufs * sizeof(unsigned long));
 
     if ( struct_ptr->trans_tracking == NULL ) {
@@ -4597,19 +4597,19 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "allocation of trans_tracking failed.");
     } /* end if */
-	
+
     /* Initialize the transaction tracking array */
     for (i=0; i<struct_ptr->num_bufs; i++)
     {
 	(*struct_ptr->trans_tracking)[i] = 0;
     }
-	
-    /* Make journal buffer pointers point to the right location in 
-     * chunk of allocated memory above 
+
+    /* Make journal buffer pointers point to the right location in
+     * chunk of allocated memory above
      */
     for ( i = 1; i < struct_ptr->num_bufs; i++ )
     {
-	(*struct_ptr->buf)[i] = 
+	(*struct_ptr->buf)[i] =
 		&((*struct_ptr->buf)[0])[i * struct_ptr->buf_size];
     }
 
@@ -4617,7 +4617,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
     struct_ptr->head = (*struct_ptr->buf)[struct_ptr->put];
 
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* end H5C2_jb__init */
@@ -4638,9 +4638,9 @@ done:
  * Returns:		SUCCEED on success.
  *
  * Changes:		Turned this function into a switch board function,
- *			calling either the human readable or the binary 
- *			journal file version of the function as indicated 
- *			by struct_ptr->human_readable.  
+ *			calling either the human readable or the binary
+ *			journal file version of the function as indicated
+ *			by struct_ptr->human_readable.
  *
  *			The original version of this file has been renamed
  *			to H5C2_jb_hrjf__journal_entry().
@@ -4649,7 +4649,7 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr,
 			uint64_t trans_num,
 			haddr_t base_addr,
@@ -4666,7 +4666,7 @@ H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__journal_entry(struct_ptr, trans_num, base_addr, 
+        if ( H5C2_jb_hrjf__journal_entry(struct_ptr, trans_num, base_addr,
                                          length, body) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -4697,8 +4697,8 @@ done:
  *			Wednesday, February 6, 2008
  *
  * Purpose:		Verify that there is no transaction in progress, and
- *			that the supplied transaction number greater than 
- *			the last.  Then construct a start transaction message, 
+ *			that the supplied transaction number greater than
+ *			the last.  Then construct a start transaction message,
  *			and write it to the current journal buffer. Make note
  *			of the fact that the supplied transaction is in
  *			progress.
@@ -4706,9 +4706,9 @@ done:
  * Returns:		SUCCEED on success.
  *
  * Changes:		Turned this function into a switch board function,
- *			calling either the human readable or the binary 
- *			journal file version of the function as indicated 
- *			by struct_ptr->human_readable.  
+ *			calling either the human readable or the binary
+ *			journal file version of the function as indicated
+ *			by struct_ptr->human_readable.
  *
  *			The original version of this file has been renamed
  *			to H5C2_jb_hrjf__start_transaction().
@@ -4717,7 +4717,7 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr,
 			   uint64_t trans_num)
 
@@ -4732,7 +4732,7 @@ H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__start_transaction(struct_ptr, trans_num) 
+        if ( H5C2_jb_hrjf__start_transaction(struct_ptr, trans_num)
              != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -4740,16 +4740,16 @@ H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr,
         }
     } else {
 
-        if ( H5C2_jb_bjf__start_transaction(struct_ptr, trans_num) 
+        if ( H5C2_jb_bjf__start_transaction(struct_ptr, trans_num)
              != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                         "H5C2_jb_bjf__start_transaction() failed.")
         }
     }
-	
+
 done:
-	
+
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5C2_jb__start_transaction() */
@@ -4765,31 +4765,31 @@ done:
  * Purpose:		Verify that the journal buffers are empty, and that the
  *			journal file has been truncated. Then close and delete
  *			the journal file associated with *struct_ptr, and free
- *			all dynamically allocated memory associated with 
+ *			all dynamically allocated memory associated with
  *			*struct_ptr.
  *
  * Returns:		SUCCEED on success.
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
 
 {
     herr_t ret_value = SUCCEED;
-	
+
     FUNC_ENTER_NOAPI(H5C2_jb__takedown, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-	
+
     /* Verify that the journal buffers are empty */
     if ( struct_ptr->bufs_in_use != 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	            "Attempt to takedown with non-empty buffers.")
-    } /* end if */	
+    } /* end if */
 
     /* Verify that the journal file has been truncated */
     if (struct_ptr->journal_is_empty != TRUE) {
@@ -4878,7 +4878,7 @@ done:
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Thursday, February 7, 2008
  *
- * Purpose:		Verify that there is no transaction in progress, and 
+ * Purpose:		Verify that there is no transaction in progress, and
  *			that the journal entry buffers are empty. Truncate
  *			the journal file. Does not return until the file
  *			is truncated on disk.
@@ -4887,7 +4887,7 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr)
 
 {
@@ -4899,7 +4899,7 @@ H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr)
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-	
+
     /* Verify that there is no transaction in progress */
     if ( struct_ptr->trans_in_prog != FALSE ) {
 
@@ -4912,7 +4912,7 @@ H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr)
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	            "Attempt to truncate with non-empty buffers.")
-    } /* end if */	
+    } /* end if */
 
     /* Truncate the journal file */
     if ( HDftruncate(struct_ptr->journal_file_fd, (off_t)0) < 0 ) {
@@ -4927,7 +4927,7 @@ H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr)
     /* reset the transaction number fields */
     struct_ptr->cur_trans = 0;
     struct_ptr->last_trans_on_disk = 0;
-	
+
     /* reset the transaction tracking array */
     for (i=0; i<struct_ptr->num_bufs; i++)
     {
@@ -4954,21 +4954,21 @@ done:
  *			2/12/09
  *
  * Purpose:		Write the header message to the journal file.
- * 
+ *
  *			This message appear exactly once in every journal
  *			file, and is always the first message in the file.
- *			It identifies the journal file, and contains 
- *			information required to run the journal, should 
+ *			It identifies the journal file, and contains
+ *			information required to run the journal, should
  *			that be necessary.
  *
  *			It is always in human readable format.
- *			
+ *
  * Returns:		SUCCEED on success.
  *			FAIL on failure.
  *
  * Changes:		JRM -- 3/21/09
- *                      Moved the entry tag strings into #defines.  
- *			Replaced all white space in the creation date 
+ *                      Moved the entry tag strings into #defines.
+ *			Replaced all white space in the creation date
  *			string with underscores.
  *
  *			JRM -- 4/16/09
@@ -4977,7 +4977,7 @@ done:
  *
  ******************************************************************************/
 
-herr_t 
+herr_t
 H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
 {
@@ -4990,7 +4990,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     size_t      file_name_len;
     size_t	buf_len;
     time_t      current_date;
-	
+
     FUNC_ENTER_NOAPI(H5C2_jb__write_header_entry, FAIL)
 
     /* Check Arguments */
@@ -5005,7 +5005,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     HDassert( file_name_len > 0 );
 
     buf_len = file_name_len + 256;
-	
+
     /* Allocate space for journal buffers */
     buf = H5MM_malloc(buf_len);
 
@@ -5014,7 +5014,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                     "buffer allocation failed.");
     } /* end if */
-	
+
     /* Get the current date */
     current_date = HDtime(NULL);
 
@@ -5030,7 +5030,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
     } else {
 
-        /* copy the string into time_buf, replacing white space with 
+        /* copy the string into time_buf, replacing white space with
          * underscores.
          *
          * Do this to make parsing the header easier.
@@ -5059,14 +5059,14 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
     if ( struct_ptr->human_readable ) {
 
-        chars_written = 
-            HDsnprintf(buf, 
+        chars_written =
+            HDsnprintf(buf,
                        buf_len - 1,
                        "0 %s %ld %s %s %s %d %s %10.10s %s %d\n",
                        H5C2_JNL__VER_NUM_TAG,
-	               struct_ptr->jvers, 
+	               struct_ptr->jvers,
                        H5C2_JNL__TGT_FILE_NAME_TAG,
-	               struct_ptr->hdf5_file_name, 
+	               struct_ptr->hdf5_file_name,
                        H5C2_JNL__JNL_MAGIC_TAG,
                        (int)(struct_ptr->journal_magic),
                        H5C2_JNL__CREATION_DATE_TAG,
@@ -5076,24 +5076,24 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
 
     } else {
 
-        /* Only include the offset and length widths in header for a binary 
-         * journal file.  Leave this data out of the human readable journal 
+        /* Only include the offset and length widths in header for a binary
+         * journal file.  Leave this data out of the human readable journal
          * file header because:
          *
-         *	1) Everything is in ASCII so it isn't needed, and 
+         *	1) Everything is in ASCII so it isn't needed, and
          *
-         *	2) If we included it anyway, we would have to update the 
+         *	2) If we included it anyway, we would have to update the
          *	   tests for the human readable journal file code.
          */
 
-        chars_written = 
-            HDsnprintf(buf, 
+        chars_written =
+            HDsnprintf(buf,
                        buf_len - 1,
                        "0 %s %ld %s %s %s %d %s %10.10s %s %d %s %d %s %d\n",
                        H5C2_JNL__VER_NUM_TAG,
-	               struct_ptr->jvers, 
+	               struct_ptr->jvers,
                        H5C2_JNL__TGT_FILE_NAME_TAG,
-	               struct_ptr->hdf5_file_name, 
+	               struct_ptr->hdf5_file_name,
                        H5C2_JNL__JNL_MAGIC_TAG,
                        (int)(struct_ptr->journal_magic),
                        H5C2_JNL__CREATION_DATE_TAG,
@@ -5116,7 +5116,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     HDassert( HDstrlen(buf) < buf_len );
 
     /* Write the header message into the ring buffer */
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE, 
+    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE,
 			          (uint64_t)0) < 0) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
@@ -5146,7 +5146,7 @@ done:
  *			Wednesday, February 6, 2008
  *
  * Purpose:		Put the contents of data into the journal buffers. This
- * 			is done as follows: While the data to be written is 
+ * 			is done as follows: While the data to be written is
  * 			larger than the amount of space left in the ring buffer,
  * 			the ring buffer is filled to capacity with data and
  *			flushed. This repeats until the unwritten data remaining
@@ -5155,18 +5155,18 @@ done:
  *
  *			At this point, the rest of the data can just be written
  *			without having to break it up further. In the event
- *			the data covers more than one journal buffer, the get 
- *			and put indices are updated to state this fact. Any 
- *			journal buffers that were filled during the write are 
+ *			the data covers more than one journal buffer, the get
+ *			and put indices are updated to state this fact. Any
+ *			journal buffers that were filled during the write are
  *			flushed.
  *
  * Returns:		SUCCEED on success.
  *
  ******************************************************************************/
 
-herr_t 
-H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,	
-			size_t size,			
+herr_t
+H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
+			size_t size,
 			const char * data,
                         hbool_t is_end_trans,
                         uint64_t trans_num)
@@ -5175,26 +5175,26 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
     unsigned long track_last_trans = 0;
     int oldput = 0;
     int i;
-	
+
     FUNC_ENTER_NOAPI(H5C2_jb__write_to_buffer, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(data);
     HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
-    HDassert( ( struct_ptr->human_readable == FALSE ) || 
+    HDassert( ( struct_ptr->human_readable == FALSE ) ||
               ( HDstrlen(data) == size ) );
-    HDassert(struct_ptr->rb_space_to_rollover <= 
+    HDassert(struct_ptr->rb_space_to_rollover <=
 		    struct_ptr->num_bufs * struct_ptr->buf_size);
-    HDassert(struct_ptr->rb_space_to_rollover > 0); 
+    HDassert(struct_ptr->rb_space_to_rollover > 0);
 
-    /* If the data size exceeds the bounds of the ring buffer's allocated 
-     * memory, loop around to top 
+    /* If the data size exceeds the bounds of the ring buffer's allocated
+     * memory, loop around to top
      */
     if (size >= struct_ptr->rb_space_to_rollover) {
 
 	while (size >= struct_ptr->rb_space_to_rollover) {
-			
+
 	    /* Assertions */
 	    HDassert(size != 0);
 	    HDassert( ( struct_ptr->human_readable == FALSE ) ||
@@ -5202,13 +5202,13 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
 	    /* fill up remaining space in the ring buffer */
 	    HDmemcpy(struct_ptr->head, data, struct_ptr->rb_space_to_rollover);
-			
+
 	    /* move head to point to start of ring buffer */
 	    struct_ptr->head = (*struct_ptr->buf)[0];
 
             /* make note of last transaction on disk */
             track_last_trans = (*struct_ptr->trans_tracking)[struct_ptr->put];
-            
+
             /* update rb_free_space */
             struct_ptr->rb_free_space -= struct_ptr->rb_space_to_rollover;
 
@@ -5230,8 +5230,8 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
                then update it */
             if ((size == struct_ptr->rb_space_to_rollover) &&
                 (is_end_trans == TRUE)) {
-                
-                (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1] 
+
+                (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1]
                                                     = trans_num;
                 (*struct_ptr->trans_tracking)[0] = trans_num;
             }
@@ -5246,13 +5246,13 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 	    /* update remaining size of data to be written */
 	    size = size - struct_ptr->rb_space_to_rollover;
 
-	    /* update the data pointer to point to the remaining data to be 
-	     * written 
+	    /* update the data pointer to point to the remaining data to be
+	     * written
 	     */
 	    data = &data[struct_ptr->rb_space_to_rollover];
 
 	    /* update the amount of space left at end of ring buffer */
-	    struct_ptr->rb_space_to_rollover = 
+	    struct_ptr->rb_space_to_rollover =
 		    struct_ptr->buf_size * struct_ptr->num_bufs;
 
 	    /* update the amount of space in the current buffer */
@@ -5260,9 +5260,9 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
 	} /* end while */
     } /* end if */
-	
-    /* If the size of the data exceeds the bounds of a single journal 
-     * buffer, will write into multiple 
+
+    /* If the size of the data exceeds the bounds of a single journal
+     * buffer, will write into multiple
      */
     if (size > struct_ptr->cur_buf_free_space) {
 
@@ -5282,11 +5282,11 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
         struct_ptr->rb_free_space -= size;
 
 	/* update put index */
-	struct_ptr->put += 
-            (size-struct_ptr->cur_buf_free_space)/(struct_ptr->buf_size) + 1; 
+	struct_ptr->put +=
+            (size-struct_ptr->cur_buf_free_space)/(struct_ptr->buf_size) + 1;
 
-        /* Drag the last transaction in a filled buffer value residing in the 
-           old put location through the trans_tracking array to the new 
+        /* Drag the last transaction in a filled buffer value residing in the
+           old put location through the trans_tracking array to the new
            corresponding put position. */
         for (i=oldput; i<struct_ptr->put+1; i++)
         {
@@ -5294,9 +5294,9 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
         }
 
 	/* update current buffer usage */
-	struct_ptr->cur_buf_free_space = 
-            struct_ptr->rb_space_to_rollover - size - 
-            (struct_ptr->num_bufs - (struct_ptr->put + 1)) * 
+	struct_ptr->cur_buf_free_space =
+            struct_ptr->rb_space_to_rollover - size -
+            (struct_ptr->num_bufs - (struct_ptr->put + 1)) *
             (struct_ptr->buf_size );
 
 	/* update bufs_in_use as necessary */
@@ -5309,7 +5309,7 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
         /* check to see if trans_tracking needs to be updated. If so,
            then update it */
         if (is_end_trans == TRUE) {
-                
+
             if (struct_ptr->cur_buf_free_space == struct_ptr->buf_size) {
                 (*struct_ptr->trans_tracking)[struct_ptr->put - 1] = trans_num;
             }
@@ -5331,13 +5331,13 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
     } /* end if */
 
-    /* if the data can fit in the remaining space in the current journal 
-     * buffer indexed by put 
+    /* if the data can fit in the remaining space in the current journal
+     * buffer indexed by put
      */
     else if (size > 0)  {
 
 	HDassert(size <= struct_ptr->cur_buf_free_space);
-		
+
 	/* write data into journal buffer */
 	HDmemcpy(struct_ptr->head, data, size);
 
@@ -5358,17 +5358,17 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
 	/* update end of buffer space */
 	struct_ptr->rb_space_to_rollover -= size;
-		
+
         /* check to see if trans_tracking needs to be updated. If so,
            then update it */
         if (is_end_trans == TRUE) {
-                
-            (*struct_ptr->trans_tracking)[struct_ptr->put] 
+
+            (*struct_ptr->trans_tracking)[struct_ptr->put]
                                             = trans_num;
         } /* end if */
 
-	/* if buffer is full, flush it, and loop to the top of the 
-	 * ring buffer if at the end. 
+	/* if buffer is full, flush it, and loop to the top of the
+	 * ring buffer if at the end.
 	 */
 	if (struct_ptr->cur_buf_free_space == 0) {
 
@@ -5380,18 +5380,18 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
                         (*struct_ptr->trans_tracking)[struct_ptr->put - 1];
 
 	    } /* end if */
-                
+
             else {
 
 		struct_ptr->put = 0;
 
                 /* Drag trans_tracking value into next buffer */
-                (*struct_ptr->trans_tracking)[0] 
+                (*struct_ptr->trans_tracking)[0]
                  = (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1];
 
                 /* reset head pointer and free space values */
 		struct_ptr->head = (*struct_ptr->buf)[0];
-		struct_ptr->rb_space_to_rollover = 
+		struct_ptr->rb_space_to_rollover =
 			struct_ptr->buf_size * struct_ptr->num_bufs;
 
 	    } /* end else */
@@ -5407,7 +5407,7 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 	} /* end if */
 
     } /* end else */
-	
+
     HDassert(struct_ptr->bufs_in_use <= struct_ptr->num_bufs);
 
 done:
diff --git a/src/H5C2pkg.h b/src/H5C2pkg.h
index 2c49200..f706dbc 100644
--- a/src/H5C2pkg.h
+++ b/src/H5C2pkg.h
@@ -61,19 +61,19 @@
  *			The fields of this structure are discussed below:
  *
  *
- * magic:		Unsigned 32-bit integer always set to 
- * 			H5C2__H5C2_JBRB_T_MAGIC.  This field is used to 
+ * magic:		Unsigned 32-bit integer always set to
+ * 			H5C2__H5C2_JBRB_T_MAGIC.  This field is used to
  *			validate pointers to instances of H5C_jbrb_t.
  *
  * journal_magic:	int32_t used to store a randomly selected integer
- *			used to tag both the journal file and the 
- *			mdj_config_block.  Should the journal ever be 
- *			run, we will check to see if the magic number 
- *			from the target HDF5 file matches that in the 
+ *			used to tag both the journal file and the
+ *			mdj_config_block.  Should the journal ever be
+ *			run, we will check to see if the magic number
+ *			from the target HDF5 file matches that in the
  *			journal, and refuse to run the journal if it does
  *			not.
  *
- * journal_file_fd:	File Descriptor of the journal file that is being 
+ * journal_file_fd:	File Descriptor of the journal file that is being
  * 			written to from this ring buffer.
  *
  * num_bufs:		The number of journal buffers in the ring buffer. This
@@ -96,7 +96,7 @@
  * 			of the formatting changes of the journal file.
  *
  * get:			Number of the journal buffer that is next in line to
- * 			be written to disk. (i.e. the least recently dirtied 
+ * 			be written to disk. (i.e. the least recently dirtied
  * 			journal buffer).
  *
  * put:			Number of the journal buffer that is currently being
@@ -111,25 +111,25 @@
  * human_readable:	Boolean flag that indicates whether the journal file
  *			is to be human readable or machine readable.
  *
- * offset_width:	If human_readable is FALSE, this field contains the 
- *			width of offsets in the HDF5 file in bytes (as 
- *			specified in the superblock -- sizeof_addr in 
+ * offset_width:	If human_readable is FALSE, this field contains the
+ *			width of offsets in the HDF5 file in bytes (as
+ *			specified in the superblock -- sizeof_addr in
  *			H5F_file_t).
  *
  *			If human_readable is TRUE, this field is undefined.
  *
  * length_width:	If human_readable is FALSE, this field contains the
- *			width of lengths in the HDF5 file in bytes (as 
- *			specified in the super block -- sizeof_size in 
+ *			width of lengths in the HDF5 file in bytes (as
+ *			specified in the super block -- sizeof_size in
  *			H5F_file_t).
  *
  * chksum_cur_msg:	Boolean flag that is only defined if human_readable
  *			is false.  It is used to indicate whether the current
- *			journal message must be checksumed.  If true, the 
+ *			journal message must be checksumed.  If true, the
  *			message checksum to date is stored in the msg_chksum
  *			(discussed below).
  *
- *			If the journal message is being checksumed, this 
+ *			If the journal message is being checksumed, this
  *			field will be set back to FALSE when the checksum
  *			of the messages is written to buffer.
  *
@@ -137,7 +137,7 @@
  *			journal file message.  Note that not all messages
  *			are checksumed -- this field is only defined when
  *			chksum_cur_msg is TRUE.
- *	
+ *
  * journal_is_empty:	Boolean flag that indicates if the journal file
  *			associated with the ring buffer is currently
  * 			empty.
@@ -155,7 +155,7 @@
  *
  * hdf5_file_name: 	Character array containing the name of the HDF5 file
  *			associated with this journal file.
- *	
+ *
  * header_present:	Boolean flag that indicates if the header message has
  *			been written into the current journal file or journal
  *			buffer.
@@ -165,14 +165,14 @@
  * 			ring buffer needs to switch to writing to the next
  *			journal buffer.
  *
- * rb_space_to_rollover: The amount of space left at the end of the ring 
+ * rb_space_to_rollover: The amount of space left at the end of the ring
  *                      buffer, starting at the head pointer, and ending at
  *                      the end of the ring buffer's allocate space. This
  *                      is used to keep track of when a rollover to the start
  *                      of the ring buffer must occur.
  *
  * rb_free_space:       The amount of unused space in the ring buffer.
- * 
+ *
  * head: 		A pointer to the location in the active journal buffer
  *			that is to be written to.
  *
@@ -182,7 +182,7 @@
  *                      is the last transaction successfully on disk.
  *
  * buf:			Array of char pointers to each journal buffer in the
- *			ring buffer. This is allocated as a single chunk of 
+ *			ring buffer. This is allocated as a single chunk of
  * 			memory, and thus data can be written past a buffer
  * 			boundary provided it will not extend past the end
  * 			of the total area allocated for the ring buffer.
@@ -201,7 +201,7 @@
 #define H5C2_JNL__OFFSET_WIDTH_TAG	"offset_width"
 #define H5C2_JNL__LENGTH_WIDTH_TAG	"length_width"
 
-/* signatures and versions used to mark the beginnings of journal file 
+/* signatures and versions used to mark the beginnings of journal file
  * messages in binary journal files.
  */
 
@@ -215,7 +215,7 @@
 #define H5C2_BJNL__END_ADDR_SPACE_SIG	"eoas"
 #define H5C2_BJNL__END_ADDR_SPACE_VER	((uint8_t)(0))
 
-struct H5C2_jbrb_t 
+struct H5C2_jbrb_t
 {
 	uint32_t	magic;
         int32_t		journal_magic;
@@ -249,12 +249,12 @@ struct H5C2_jbrb_t
 };
 
 
-/* With the introduction of the fractal heap, it is now possible for 
+/* With the introduction of the fractal heap, it is now possible for
  * entries to be dirtied, resized, and/or renamed in the flush callbacks.
  * As a result, on flushes, it may be necessary to make multiple passes
  * through the slist before it is empty.  The H5C2__MAX_PASSES_ON_FLUSH
  * #define is used to set an upper limit on the number of passes.
- * The current value was obtained via personal communication with 
+ * The current value was obtained via personal communication with
  * Quincey.  I have applied a fudge factor of 2.
  */
 
@@ -265,8 +265,8 @@ struct H5C2_jbrb_t
  *
  * structure H5C2_mdjsc_record_t
  *
- * A dynamically allocate array of instances of H5C2_mdjsc_record_t is 
- * used to record metadata journaling status change callbacks -- of which 
+ * A dynamically allocate array of instances of H5C2_mdjsc_record_t is
+ * used to record metadata journaling status change callbacks -- of which
  * there can be an arbitrary number.
  *
  * The fields in the structure are discussed individually below:
@@ -275,20 +275,20 @@ struct H5C2_jbrb_t
  * 		to be called on metadata journaling start or stop.  NULL
  * 		if this record is not in use.
  *
- * 		Note that the cache must be clean when this callback 
+ * 		Note that the cache must be clean when this callback
  * 		is called.
  *
  * data_ptr:	Pointer to void.  This value is supplied on registration,
- * 		and is passed to *fcn_ptr.  NULL if this record is not 
+ * 		and is passed to *fcn_ptr.  NULL if this record is not
  * 		in use.
  *
  * fl_next:	Index of the next free entry in the metadata status change
- * 		callback table, or -1 if there is no next free entry or 
+ * 		callback table, or -1 if there is no next free entry or
  * 		if the entry is in use.
  *
  ****************************************************************************/
 
-typedef struct H5C2_mdjsc_record_t 
+typedef struct H5C2_mdjsc_record_t
 {
     H5C2_mdj_status_change_func_t	fcn_ptr;
     void *				data_ptr;
@@ -334,11 +334,11 @@ typedef struct H5C2_mdjsc_record_t
  *
  *						JRM - 9/26/05
  *
- * magic:	Unsigned 32 bit integer always set to H5C2__H5C2_T_MAGIC.  
- * 		This field is used to validate pointers to instances of 
+ * magic:	Unsigned 32 bit integer always set to H5C2__H5C2_T_MAGIC.
+ * 		This field is used to validate pointers to instances of
  * 		H5C2_t.
  *
- * flush_in_progress: Boolean flag indicating whether a flush is in 
+ * flush_in_progress: Boolean flag indicating whether a flush is in
  * 		progress.
  *
  * trace_file_ptr:  File pointer pointing to the trace file, which is used
@@ -347,7 +347,7 @@ typedef struct H5C2_mdjsc_record_t
  *              no trace file should be recorded.
  *
  *              Since much of the code supporting the parallel metadata
- *              cache is in H5AC, we don't write the trace file from 
+ *              cache is in H5AC, we don't write the trace file from
  *              H5C2.  Instead, H5AC reads the trace_file_ptr as needed.
  *
  *              When we get to using H5C2 in other places, we may add
@@ -420,10 +420,10 @@ typedef struct H5C2_mdjsc_record_t
  * writes.  The following field is used to implement this.
  *
  * evictions_enabled:  Boolean flag that is initialized to TRUE.  When
- * 		this flag is set to FALSE, the metadata cache will not 
+ * 		this flag is set to FALSE, the metadata cache will not
  * 		attempt to evict entries to make space for newly protected
  * 		entries, and instead the will grow without limit.
- * 		
+ *
  * 		Needless to say, this feature must be used with care.
  *
  *
@@ -494,7 +494,7 @@ typedef struct H5C2_mdjsc_record_t
  * following two fields have been added.  They are only compiled in when
  * H5C2_DO_SANITY_CHECKS is TRUE.
  *
- * slist_len_increase: Number of entries that have been added to the 
+ * slist_len_increase: Number of entries that have been added to the
  * 		slist since the last time this field was set to zero.
  *
  * slist_size_increase: Total size of all entries that have been added
@@ -817,39 +817,39 @@ typedef struct H5C2_mdjsc_record_t
  *
  * Metadata journaling fields:
  *
- * The following fields are used to support metadata journaling.  The 
+ * The following fields are used to support metadata journaling.  The
  * objective here is to journal all changes in metadata, so that we will
  * be able to re-construct a HDF5 file with a consistent set of metadata
  * in the event of a crash.
  *
- * mdj_enabled: Boolean flag used to indicate whether journaling is 
- * 		currently enabled.  In general, the values of the 
- * 		remaining fields in this section are undefined if 
+ * mdj_enabled: Boolean flag used to indicate whether journaling is
+ * 		currently enabled.  In general, the values of the
+ * 		remaining fields in this section are undefined if
  * 		mdj_enabled is FALSE.
  *
  * trans_in_progress Boolean flag used to indicate whether a metadata
- * 		transaction is in progress.  
+ * 		transaction is in progress.
  *
- * 		For purposes of metadata journaling, a transaction is a 
- * 		sequence of operations on metadata selected such that 
- * 		the HDF5 file metadata is in a consistent state both at 
- * 		the beginning and at the end of the sequence.  
+ * 		For purposes of metadata journaling, a transaction is a
+ * 		sequence of operations on metadata selected such that
+ * 		the HDF5 file metadata is in a consistent state both at
+ * 		the beginning and at the end of the sequence.
  *
  * 		At least to begin with, transactions will be closely tied
  * 		to user level API calls.
  *
- * trans_api_name: Array of char of length H5C2__MAX_API_NAME_LEN + 1. Used 
- * 		to store the name of the API call associated with the 
+ * trans_api_name: Array of char of length H5C2__MAX_API_NAME_LEN + 1. Used
+ * 		to store the name of the API call associated with the
  * 		current transaction.
  *
- * trans_num:	uint64_t containing the id assigned to the current 
- * 		transaction (if trans_in_progress is TRUE), or of the 
+ * trans_num:	uint64_t containing the id assigned to the current
+ * 		transaction (if trans_in_progress is TRUE), or of the
  * 		last transaction completed (if trans_in_progress is FALSE),
  * 		or zero if no transaction has been initiated yet.
  *
- * last_trans_on_disk:  uint64_t containing the id assigned to the 
+ * last_trans_on_disk:  uint64_t containing the id assigned to the
  * 		last transaction all of whose associated journal entries
- * 		are on disk in the journal file.  
+ * 		are on disk in the journal file.
  *
  * 		We must track this value, as to avoid messages from the
  * 		future, we must not write a cache entry to file until
@@ -858,21 +858,21 @@ typedef struct H5C2_mdjsc_record_t
  * 		file.
  *
  * jnl_magic:   Randomly selected int32_t used to reduce the possibility
- *              of running the wrong journal on an HDF5 file.  The basic 
- *              idea is to pick a random number, store it in both the HDF5 
- *		file and the journal file, and then refuse to run the 
+ *              of running the wrong journal on an HDF5 file.  The basic
+ *              idea is to pick a random number, store it in both the HDF5
+ *		file and the journal file, and then refuse to run the
  *		journal unless the numbers match.
  *
  * jnl_file_name_len: Length of the journal file name, or zero if the
  *		journal file name is undefined.
  *
- * jnl_file_name: Array of char of length H5C2__MAX_JOURNAL_FILE_NAME_LEN 
+ * jnl_file_name: Array of char of length H5C2__MAX_JOURNAL_FILE_NAME_LEN
  *		+ 1 used to store the journal file path.
  *
  * mdj_jbrb:    Instance of H5C2_jbrb_t used to manage logging of journal
  * 		entries to the journal file.
  *
- * While a transaction is in progress, we must maintain a list of the 
+ * While a transaction is in progress, we must maintain a list of the
  * entries that have been modified during the transaction so we can
  * generate the appropriate journal entries.  The following fields are
  * used to maintain this list:
@@ -883,56 +883,56 @@ typedef struct H5C2_mdjsc_record_t
  *              transaction list.
  *
  * tl_head_ptr: Pointer to the head of the doubly linked list of entries
- * 		dirtied in the current transaction.  Note that cache entries 
- * 		on this list are linked by their trans_next and trans_prev 
+ * 		dirtied in the current transaction.  Note that cache entries
+ * 		on this list are linked by their trans_next and trans_prev
  * 		fields.
  *
  *              This field is NULL if the list is empty.
  *
  * tl_tail_ptr: Pointer to the tail of the doubly linked list of entries
- *              dirtied in the current transaction.  Note that cache entries 
- *              on this list are linked by their trans_next and trans_prev 
+ *              dirtied in the current transaction.  Note that cache entries
+ *              on this list are linked by their trans_next and trans_prev
  *              fields.
  *
  *              This field is NULL if the list is empty.
  *
- * When an entry is dirtied in a transaction, we must not flush it until 
- * all the journal entries generated by the transaction have reached disk 
+ * When an entry is dirtied in a transaction, we must not flush it until
+ * all the journal entries generated by the transaction have reached disk
  * in the journal file.
  *
  * We could just leave these entries in the LRU and skip over them when
- * we scan the list for candidates for eviction.  However, this will be 
+ * we scan the list for candidates for eviction.  However, this will be
  * costly, so we store them on the journal write in progress list instead
- * until all the journal entries for the specified transaction reaches 
+ * until all the journal entries for the specified transaction reaches
  * disk.
  *
- * jwipl_len:	Number of entries currently residing on the journal 
+ * jwipl_len:	Number of entries currently residing on the journal
  * 		entry write in progress list.
  *
  * jwipl_size:  Number of bytes of cache entries currently residing on the
  *              journal entry write in progress list.
  *
  * jwipl_head_ptr:  Pointer to the head of the doubly linked list of entries
- * 		dirtied in some transaction n, where at least some of the 
+ * 		dirtied in some transaction n, where at least some of the
  * 		journal entries generated in transaction n have not yet
  * 		made it to disk in the journal file.
  *
- * 		Entries on this list are linked by their next and prev 
+ * 		Entries on this list are linked by their next and prev
  * 		fields.
  *
  *              This field is NULL if the list is empty.
  *
  * jwipl_tail_ptr:  Pointer to the tail of the doubly linked list of entries
- * 		dirtied in some transaction n, where at least some of the 
+ * 		dirtied in some transaction n, where at least some of the
  * 		journal entries generated in transaction n have not yet
  * 		made it to disk in the journal file.
  *
- * 		Entries on this list are linked by their next and prev 
+ * 		Entries on this list are linked by their next and prev
  * 		fields.
  *
  *              This field is NULL if the list is empty.
  *
- * It is necessary to turn off some optimization while journaling is 
+ * It is necessary to turn off some optimization while journaling is
  * in progress, so as to avoid generating dirty metadata during a flush.
  * The following fields are used to maintain a list of functions to be
  * called when journaling is enabled or disabled.  Note that the metadata
@@ -940,15 +940,15 @@ typedef struct H5C2_mdjsc_record_t
  *
  * The metadata journaling status change callback table is initaly allocated
  * with H5C2__MIN_MDJSC_CB_TBL_LEN entries.  The table size is doubled
- * whenever an entry is added to a full table, and halved whenever the 
- * active entries to total entries ratio drops below 
- * H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO and the upper half of the table is 
- * empty (Since entries are removed from the table by specifying the 
+ * whenever an entry is added to a full table, and halved whenever the
+ * active entries to total entries ratio drops below
+ * H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO and the upper half of the table is
+ * empty (Since entries are removed from the table by specifying the
  * index of the entry, we can't compress the table).
  *
  * mdjsc_cb_tbl: Base address of a dynamically allocated array of instances
- * 		of H5C2_mdjsc_record_t used to record an arbitrarily long 
- * 		list of functions to call whenever journaling is enabled or 
+ * 		of H5C2_mdjsc_record_t used to record an arbitrarily long
+ * 		list of functions to call whenever journaling is enabled or
  * 		disabled.
  *
  * mdjsc_cb_tbl_len: Number of entries currently allocated in *mdjsc_cb_tbl.
@@ -960,7 +960,7 @@ typedef struct H5C2_mdjsc_record_t
  * 		or -1 if the table is full.
  *
  * mdjsc_cb_tbl_max_idx_in_use: Maximum of the indicies of metadata journaling
- * 		status change callback table entries in use, or -1 if the 
+ * 		status change callback table entries in use, or -1 if the
  * 		table is empty;
  *
  * Statistics collection fields:
@@ -979,23 +979,23 @@ typedef struct H5C2_mdjsc_record_t
  *		equal to the array index has not been in cache when
  *		requested in the current epoch.
  *
- * write_protects:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The 
- * 		cells are used to record the number of times an entry with 
- * 		type id equal to the array index has been write protected 
+ * write_protects:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The
+ * 		cells are used to record the number of times an entry with
+ * 		type id equal to the array index has been write protected
  * 		in the current epoch.
  *
  * 		Observe that (hits + misses) = (write_protects + read_protects).
  *
- * read_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The 
- * 		cells are used to record the number of times an entry with 
- * 		type id equal to the array index has been read protected in 
+ * read_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The
+ * 		cells are used to record the number of times an entry with
+ * 		type id equal to the array index has been read protected in
  * 		the current epoch.
  *
  *              Observe that (hits + misses) = (write_protects + read_protects).
  *
- * max_read_protects:  Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1. 
- * 		The cells are used to maximum number of simultaneous read 
- * 		protects on any entry with type id equal to the array index 
+ * max_read_protects:  Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to maximum number of simultaneous read
+ * 		protects on any entry with type id equal to the array index
  * 		in the current epoch.
  *
  * insertions:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
@@ -1003,9 +1003,9 @@ typedef struct H5C2_mdjsc_record_t
  *		id equal to the array index has been inserted into the
  *		cache in the current epoch.
  *
- * pinned_insertions:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  
- * 		The cells are used to record the number of times an entry 
- * 		with type id equal to the array index has been inserted 
+ * pinned_insertions:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to record the number of times an entry
+ * 		with type id equal to the array index has been inserted
  * 		pinned into the cache in the current epoch.
  *
  * clears:      Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
@@ -1028,13 +1028,13 @@ typedef struct H5C2_mdjsc_record_t
  *		id equal to the array index has been renamed in the current
  *		epoch.
  *
- * entry_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  
- * 		The cells are used to record the number of times an entry 
+ * entry_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to record the number of times an entry
  * 		with type id equal to the array index has been renamed
  * 		during its flush callback in the current epoch.
  *
- * cache_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  
- * 		The cells are used to record the number of times an entry 
+ * cache_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to record the number of times an entry
  * 		with type id equal to the array index has been renamed
  * 		during a cache flush in the current epoch.
  *
@@ -1073,14 +1073,14 @@ typedef struct H5C2_mdjsc_record_t
  *		with type id equal to the array index has decreased in
  *		size in the current epoch.
  *
- * entry_flush_size_changes:  Array of int64 of length 
- * 		H5C2__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
- * 		the number of times an entry with type id equal to the 
+ * entry_flush_size_changes:  Array of int64 of length
+ * 		H5C2__MAX_NUM_TYPE_IDS + 1.  The cells are used to record
+ * 		the number of times an entry with type id equal to the
  * 		array index has changed size while in its flush callback.
  *
- * cache_flush_size_changes:  Array of int64 of length 
- * 		H5C2__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
- * 		the number of times an entry with type id equal to the 
+ * cache_flush_size_changes:  Array of int64 of length
+ * 		H5C2__MAX_NUM_TYPE_IDS + 1.  The cells are used to record
+ * 		the number of times an entry with type id equal to the
  * 		array index has changed size during a cache flush
  *
  * total_ht_insertions: Number of times entries have been inserted into the
@@ -1278,7 +1278,7 @@ struct H5C2_t
 
     int64_t			cache_hits;
     int64_t			cache_accesses;
- 
+
     hbool_t			mdj_enabled;
     hbool_t			trans_in_progress;
     char			trans_api_name[H5C2__MAX_API_NAME_LEN];
@@ -1286,7 +1286,7 @@ struct H5C2_t
     uint64_t			last_trans_on_disk;
     int32_t			jnl_magic;
     int32_t			jnl_file_name_len;
-    char 			jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN 
+    char 			jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN
                                               + 1];
     struct H5C2_jbrb_t		mdj_jbrb;
     int32_t			tl_len;
@@ -1302,7 +1302,7 @@ struct H5C2_t
     int32_t			num_mdjsc_cbs;
     int32_t			mdjsc_cb_tbl_fl_head;
     int32_t			mdjsc_cb_tbl_max_idx_in_use;
-    
+
 #if H5C2_COLLECT_CACHE_STATS
 
     /* stats fields */
@@ -1468,10 +1468,10 @@ struct H5C2_t
  *
  *							JRM - 9/8/05
  *
- *  - Added a set of macros supporting doubly linked lists using the new 
- *    trans_next and trans_prev fields in H5C2_cache_entry_t.  These 
+ *  - Added a set of macros supporting doubly linked lists using the new
+ *    trans_next and trans_prev fields in H5C2_cache_entry_t.  These
  *    fields are used to maintain a list of entries that have been dirtied
- *    in the current transaction.  At the end of the transaction, this 
+ *    in the current transaction.  At the end of the transaction, this
  *    list is used to generate the needed journal entries.
  *
  *    							JRM -- 3/27/08
@@ -1974,7 +1974,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
  * 	More pinned entry stats related updates.
  *
  * 	JRM -- 3/31/07
- * 	Updated H5C2__UPDATE_STATS_FOR_PROTECT() to keep stats on 
+ * 	Updated H5C2__UPDATE_STATS_FOR_PROTECT() to keep stats on
  * 	read and write protects.
  *
  ***********************************************************************/
@@ -2553,12 +2553,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		JRM -- 8/25/06
  *		Added the H5C2_DO_SANITY_CHECKS version of the macro.
  *
- *		This version maintains the slist_len_increase and 
+ *		This version maintains the slist_len_increase and
  *		slist_size_increase fields that are used in sanity
  *		checks in the flush routines.
  *
- *		All this is needed as the fractal heap needs to be 
- *		able to dirty, resize and/or rename entries during the 
+ *		All this is needed as the fractal heap needs to be
+ *		able to dirty, resize and/or rename entries during the
  *		flush.
  *
  *-------------------------------------------------------------------------
@@ -2645,7 +2645,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		Switched over to using skip list routines.
  *
  *		JRM -- 3/28/07
- *		Updated sanity checks for the new is_read_only and 
+ *		Updated sanity checks for the new is_read_only and
  *		ro_ref_count fields in H5C2_cache_entry_t.
  *
  *-------------------------------------------------------------------------
@@ -2693,11 +2693,11 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		JRM -- 8/27/06
  *		Added the H5C2_DO_SANITY_CHECKS version of the macro.
  *
- *		This version maintains the slist_size_increase field 
+ *		This version maintains the slist_size_increase field
  *		that are used in sanity checks in the flush routines.
  *
- *		All this is needed as the fractal heap needs to be 
- *		able to dirty, resize and/or rename entries during the 
+ *		All this is needed as the fractal heap needs to be
+ *		able to dirty, resize and/or rename entries during the
  *		flush.
  *
  *-------------------------------------------------------------------------
@@ -2788,7 +2788,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		to do if called for such an entry.
  *
  *		JRM -- 3/28/07
- *		Added sanity checks using the new is_read_only and 
+ *		Added sanity checks using the new is_read_only and
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM -- 3/29/08
@@ -2936,7 +2936,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		be called on a pinned entry.  Added assert to verify this.
  *
  *		JRM -- 3/28/07
- *		Added sanity checks for the new is_read_only and 
+ *		Added sanity checks for the new is_read_only and
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM -- 3/29/08
@@ -3203,7 +3203,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		Inserted an assert to verify this.
  *
  *		JRM - 8/9/06
- *		Not any more.  We must now allow insertion of pinned 
+ *		Not any more.  We must now allow insertion of pinned
  *		entries.  Updated macro to support this.
  *
  *		JRM - 3/28/07
@@ -3211,13 +3211,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM - 3/29/30
- *		Added sanity check that verifies that the last_trans field 
- *		of the entry matches the trans_num field of the cache.  
- *		Note that when journaling is disabled, both of these 
- *		fields should contain zero.  Also verify that either 
+ *		Added sanity check that verifies that the last_trans field
+ *		of the entry matches the trans_num field of the cache.
+ *		Note that when journaling is disabled, both of these
+ *		fields should contain zero.  Also verify that either
  *		journaling is disabled or a transaction is in progress.
  *
- *		Added code to put the entry in the journal write in 
+ *		Added code to put the entry in the journal write in
  *		progress list if entries last_trans field is non-
  *		zero and the entry is not pinned.
  *
@@ -3341,13 +3341,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  * Macro:	H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE
  *
- * Purpose:     Update the replacement policy data structures for the 
- *              completion of the last pending journal write for the 
+ * Purpose:     Update the replacement policy data structures for the
+ *              completion of the last pending journal write for the
  *              specified un-pinned and un-protected cache entry.
  *
  *		If an entry with a pending journal write is not protected
- *		and is not pinned, it must be on the journal write in 
- *		progress list.  Unlink it from that list, and add it to 
+ *		and is not pinned, it must be on the journal write in
+ *		progress list.  Unlink it from that list, and add it to
  *		the data structures used by the current replacement policy.
  *
  *		At present, we only support the modified LRU policy, so
@@ -3470,8 +3470,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		load from disk of the specified cache entry.
  *
  *		Note that we update the replacement policy for load only
- *		as a convenience -- the newly loaded entry will be 
- *		protected immediately.  If this starts to eat up a 
+ *		as a convenience -- the newly loaded entry will be
+ *		protected immediately.  If this starts to eat up a
  *		significant number of cycles, we will have to re-work
  *		the code to avoid this step.
  *
@@ -3608,7 +3608,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		maintained by the replacement policy.
  *
  *		JRM - 3/28/07
- *		Added sanity checks based on the new is_read_only and 
+ *		Added sanity checks based on the new is_read_only and
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM - 3/29/08
@@ -3798,14 +3798,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		nothing to be done.
  *
  *		JRM - 3/28/07
- *		Added sanity checks using the new is_read_only and 
+ *		Added sanity checks using the new is_read_only and
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM - 3/29/08
  *		Reworked macro to handle the case in which the renamed
  *		entry has a journal write pending -- this required the
- *		addition of the had_jwip parameter.  Also added some 
- *		related sanity checks.  
+ *		addition of the had_jwip parameter.  Also added some
+ *		related sanity checks.
  *
  *-------------------------------------------------------------------------
  */
@@ -4017,7 +4017,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		To do this, determine if the entry is pinned.  If it is,
  *		update the size of the pinned entry list.
  *
- *		If it isn't pinned, the entry must handled by the 
+ *		If it isn't pinned, the entry must handled by the
  *		replacement policy.  Update the appropriate replacement
  *		policy data structures.
  *
@@ -4033,13 +4033,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  * 		JRM -- 3/28/07
- *		Added sanity checks based on the new is_read_only and 
+ *		Added sanity checks based on the new is_read_only and
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM -- 3/29/08
  *		Added code to deal with the journal write in progress
  *		list -- in essence, after checking to see if the entry is
- *		pinned, check to see if it is on the jwip list.  If it 
+ *		pinned, check to see if it is on the jwip list.  If it
  *		is, update the size of that list.  If not, proceed as
  *		before.
  *
@@ -4182,11 +4182,11 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM -- 3/28/07
- *		Added sanity checks based on the new is_read_only and 
+ *		Added sanity checks based on the new is_read_only and
  *		ro_ref_count fields of struct H5C2_cache_entry_t.
  *
  *		JRM -- 3/30/08
- *		Added code to place the newly unpinned entry on the 
+ *		Added code to place the newly unpinned entry on the
  *		journal write pending list if appropriate.
  *
  *-------------------------------------------------------------------------
@@ -4354,7 +4354,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		maintained by the replacement policy.
  *
  *		JRM - 3/30/08
- *		Modified macro to put un-pinned entries with pending 
+ *		Modified macro to put un-pinned entries with pending
  *		journal writes on the journal write in progress list.
  *
  *-------------------------------------------------------------------------
@@ -4538,7 +4538,7 @@ if ( cache_ptr->mdj_enabled )                                          \
  * Purpose:     Check to see if journaling is enabled.
  *
  *              If it is, see if the target entry is in the transaction
- *              list.  If it is, remove it from the list, and set its 
+ *              list.  If it is, remove it from the list, and set its
  *              last_trans field to zero.
  *
  * Return:      N/A
@@ -4621,9 +4621,9 @@ if ( cache_ptr->mdj_enabled )                                           \
  *
  * Macro:	H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE
  *
- * Purpose:     Update the transaction list for a change in the size of 
+ * Purpose:     Update the transaction list for a change in the size of
  *              one of its constituents.  Note that it is the callers
- *              responsibility to verify that the entry is in the 
+ *              responsibility to verify that the entry is in the
  *              transaction list if it should be.
  *
  * Return:      N/A
diff --git a/src/H5C2private.h b/src/H5C2private.h
index f7aec7e..0d053b0 100644
--- a/src/H5C2private.h
+++ b/src/H5C2private.h
@@ -107,13 +107,13 @@ typedef struct H5C2_t H5C2_t;
  * name: Pointer to a string containing the name of the class of metadata
  * 	cache entries.
  *
- * mem_type:  Instance of H5FD_mem_t, that is used to supply the 
+ * mem_type:  Instance of H5FD_mem_t, that is used to supply the
  * 	mem type passed into H5F_block_read().
  *
  * deserialize: Pointer to the deserialize function.
  *
  * 	This function must be able to read an on disk image of a metadata
- * 	cache entry, allocate and load the equivalent in core representation, 
+ * 	cache entry, allocate and load the equivalent in core representation,
  * 	and return a pointer to that representation.
  *
  *	The typedef for the deserialize callback is as follows:
@@ -140,8 +140,8 @@ typedef struct H5C2_t H5C2_t;
  *              mode, but the parameter may be unused when compiled in
  *              production mode.
  *
- *	image_ptr: Pointer to a buffer of length len containing the 
- *		contents of the file starting at addr and continuing 
+ *	image_ptr: Pointer to a buffer of length len containing the
+ *		contents of the file starting at addr and continuing
  *		for len bytes.
  *
  *	udata_ptr: Pointer to user data provided in the protect call, which
@@ -155,22 +155,22 @@ typedef struct H5C2_t H5C2_t;
  *	Processing in the deserialize function should proceed as follows:
  *
  *      If the image contains valid data, and is of the correct length,
- *      the deserialize function must allocate space for an in core 
- *      representation of that data, load the contents of the image into 
- *      the space allocated for the in core representation, and return 
- *      a pointer to the in core representation.  Observe that an 
- *      instance of H5C2_cache_entry_t must be the first item in this 
- *      representation.  It will have to be initialized appropriately 
+ *      the deserialize function must allocate space for an in core
+ *      representation of that data, load the contents of the image into
+ *      the space allocated for the in core representation, and return
+ *      a pointer to the in core representation.  Observe that an
+ *      instance of H5C2_cache_entry_t must be the first item in this
+ *      representation.  It will have to be initialized appropriately
  *      after the callback returns.
  *
  *      Note that the structure of the in core representation is otherwise
- *      up to the cache client.  All that is required is that the pointer 
- *      returned be sufficient for the clients purposes when it is returned 
+ *      up to the cache client.  All that is required is that the pointer
+ *      returned be sufficient for the clients purposes when it is returned
  *      on a protect call.
  *
  *      If the deserialize function has to clean up file corruption
  *      left over from an old bug in the HDF5 library, it must set
- *      *dirty_ptr to TRUE.  If it doesn't, no action is needed as 
+ *      *dirty_ptr to TRUE.  If it doesn't, no action is needed as
  *      *dirty_ptr will be set to FALSE before the deserialize call.
  *
  *      If the operation fails for any reason (i.e. bad data in buffer, bad
@@ -214,18 +214,18 @@ typedef struct H5C2_t H5C2_t;
  * serialize: Pointer to the serialize callback.
  *
  *	The serialize callback is invoked by the metadata cache whenever
- *	it needs a current on disk image of the metadata entry for purposes 
+ *	it needs a current on disk image of the metadata entry for purposes
  *	either constructing a journal or flushing the entry to disk.
  *
- *	At this point, one would think that the base address and length of 
- *	the length of the entry's image on disk would be well known.  
- *	However, that need not be the case as fractal heap blocks can 
- *	change size (and therefor possible location as well) on 
- *	serialization if compression is enabled.  In the old H5C code, 
- *	this happened on a flush, and occasioned a rename in the midst 
- *	of the flush.  To avoid this in H5C2, the serialize callback 
- *	will return the new base address, length, and image pointer to 
- *	the caller when necessary.  The caller must then update the 
+ *	At this point, one would think that the base address and length of
+ *	the length of the entry's image on disk would be well known.
+ *	However, that need not be the case as fractal heap blocks can
+ *	change size (and therefor possible location as well) on
+ *	serialization if compression is enabled.  In the old H5C code,
+ *	this happened on a flush, and occasioned a rename in the midst
+ *	of the flush.  To avoid this in H5C2, the serialize callback
+ *	will return the new base address, length, and image pointer to
+ *	the caller when necessary.  The caller must then update the
  *	metadata cache's internal structures accordingly.
  *
  *	The typedef for the serialize callback is as follows:
@@ -237,19 +237,19 @@ typedef struct H5C2_t H5C2_t;
  *                                             void * image_ptr,
  *                                             void * thing,
  *                                             unsigned * flags_ptr,
- *                                             haddr_t * new_addr_ptr, 
- *                                             size_t * new_len_ptr, 
+ *                                             haddr_t * new_addr_ptr,
+ *                                             size_t * new_len_ptr,
  *                                             void ** new_image_ptr_ptr);
  *
  *	The parameters of the serialize callback are as follows:
  *
  *	f:	File pointer -- needed if other metadata cache entries
- *		must be modified in the process of serializing the 
+ *		must be modified in the process of serializing the
  *		target entry.
  *
- *	dxpl_id: dxpl_id passed with the file pointer to the cache, and 
- *	        passed on to the callback.  Necessary as some callbacks 
- *	        revise the size and location of the target entry, or 
+ *	dxpl_id: dxpl_id passed with the file pointer to the cache, and
+ *	        passed on to the callback.  Necessary as some callbacks
+ *	        revise the size and location of the target entry, or
  *	        possibly other entries on serialize.
  *
  *	addr:   Base address in file of the entry to be serialized.
@@ -267,157 +267,157 @@ typedef struct H5C2_t H5C2_t;
  *		mode, but the parameter may be unused when compiled in
  *		production mode.
  *
- *	image_ptr: Pointer to a buffer of length len bytes into which a 
- *		serialized image of the target metadata cache entry is 
+ *	image_ptr: Pointer to a buffer of length len bytes into which a
+ *		serialized image of the target metadata cache entry is
  *		to be written.
  *
- * 		Note that this buffer will not in general be initialized 
- * 		to any particular value.  Thus the serialize function may 
- * 		not assume any initial value and must set each byte in 
+ * 		Note that this buffer will not in general be initialized
+ * 		to any particular value.  Thus the serialize function may
+ * 		not assume any initial value and must set each byte in
  * 		the buffer.
  *
- *	thing:  Pointer to void containing the address of the in core 
- *		representation of the target metadata cache entry.  
- *		This is the same pointer returned by a protect of the 
+ *	thing:  Pointer to void containing the address of the in core
+ *		representation of the target metadata cache entry.
+ *		This is the same pointer returned by a protect of the
  *		addr and len given above.
  *
- *	flags_ptr:  Pointer to an unsigned integer used to return flags 
- *		indicating whether the resize function resized or renamed 
- *		the entry.  If the entry was neither resized or renamed, 
- *		the serialize function must set *flags_ptr to zero.  
- *		H5C2__SERIALIZE_RESIZED_FLAG and H5C2__SERIALIZE_RENAMED_FLAG 
+ *	flags_ptr:  Pointer to an unsigned integer used to return flags
+ *		indicating whether the resize function resized or renamed
+ *		the entry.  If the entry was neither resized or renamed,
+ *		the serialize function must set *flags_ptr to zero.
+ *		H5C2__SERIALIZE_RESIZED_FLAG and H5C2__SERIALIZE_RENAMED_FLAG
  *		must be set to indicate a resize and a rename respectively.
  *
- *	        If the H5C2__SERIALIZE_RESIZED_FLAG is set, the new length 
- *	        and image pointer must be stored in *new_len_ptr and 
- *	        *new_image_ptr_ptr respectively.  
- *
- *	        If the H5C2__SERIALIZE_RENAMED_FLAG flag is also set, the 
- *	        new image base address must be stored in *new_addr_ptr.  
- *	        Observe that the H5C2__SERIALIZE_RENAMED_FLAG must not 
- *	        appear without the H5C2__SERIALIZE_RESIZED_FLAG.  
- *
- *	        Except as noted above, the locations pointed to by the 
- *	        remaining parameters are undefined, and should be ignored 
- *	        by the caller.  
- *
- *	new_addr_ptr:  Pointer to haddr_t.  If the entry is renamed by 
- *		the serialize function, the new on disk base address must 
- *		be stored in *new_addr_ptr.  If the entry is not renamed 
- *		by the serialize function, *new_addr_ptr is undefined.  
- *
- *	new_len_ptr:  Pointer to size_t.  If the entry is resized by the 
- *		serialize function, the new length of the on disk image 
- *		must be stored in *new_len_ptr.  If the entry is not 
- *		resized by the serialize function, *new_len_ptr is 
- *		undefined.  
- *
- *	new_image_ptr_ptr:  Pointer to pointer to void.  If the entry is 
- *		resized by the serialize function, the pointer to the 
- *		new buffer containing the on disk image must be stored 
- *		in *new_image_ptr_ptr.  If the entry is not resized by 
+ *	        If the H5C2__SERIALIZE_RESIZED_FLAG is set, the new length
+ *	        and image pointer must be stored in *new_len_ptr and
+ *	        *new_image_ptr_ptr respectively.
+ *
+ *	        If the H5C2__SERIALIZE_RENAMED_FLAG flag is also set, the
+ *	        new image base address must be stored in *new_addr_ptr.
+ *	        Observe that the H5C2__SERIALIZE_RENAMED_FLAG must not
+ *	        appear without the H5C2__SERIALIZE_RESIZED_FLAG.
+ *
+ *	        Except as noted above, the locations pointed to by the
+ *	        remaining parameters are undefined, and should be ignored
+ *	        by the caller.
+ *
+ *	new_addr_ptr:  Pointer to haddr_t.  If the entry is renamed by
+ *		the serialize function, the new on disk base address must
+ *		be stored in *new_addr_ptr.  If the entry is not renamed
+ *		by the serialize function, *new_addr_ptr is undefined.
+ *
+ *	new_len_ptr:  Pointer to size_t.  If the entry is resized by the
+ *		serialize function, the new length of the on disk image
+ *		must be stored in *new_len_ptr.  If the entry is not
+ *		resized by the serialize function, *new_len_ptr is
+ *		undefined.
+ *
+ *	new_image_ptr_ptr:  Pointer to pointer to void.  If the entry is
+ *		resized by the serialize function, the pointer to the
+ *		new buffer containing the on disk image must be stored
+ *		in *new_image_ptr_ptr.  If the entry is not resized by
  *		the serialize function, *new_image_ptr_ptr is undefined.
  *
- *	Processing in the serialize function should proceed as follows: 
+ *	Processing in the serialize function should proceed as follows:
  *
- *	The serialize function must examine the in core representation 
- *	indicated by the thing parameter, and write a serialized image 
- *	of its contents into the provided buffer.  
+ *	The serialize function must examine the in core representation
+ *	indicated by the thing parameter, and write a serialized image
+ *	of its contents into the provided buffer.
  *
- *	If the serialize function does not change the size or location 
- *	of the on disk image, it must set *flags_ptr to zero.  
+ *	If the serialize function does not change the size or location
+ *	of the on disk image, it must set *flags_ptr to zero.
  *
- *	If the size of the on disk image must be changed, the serialize 
- *	function must free the old image buffer (base address in image_ptr), 
- *	allocate a new one, load the image into the new buffer, load the 
- *	base address of the new buffer into *new_image_ptr_ptr, load the 
- *	length of the new image into *new_len_ptr, and set the 
- *	H5C2__SERIALIZE_RESIZED_FLAG in *flags_ptr.  
+ *	If the size of the on disk image must be changed, the serialize
+ *	function must free the old image buffer (base address in image_ptr),
+ *	allocate a new one, load the image into the new buffer, load the
+ *	base address of the new buffer into *new_image_ptr_ptr, load the
+ *	length of the new image into *new_len_ptr, and set the
+ *	H5C2__SERIALIZE_RESIZED_FLAG in *flags_ptr.
  *
- *	If in addition, the base address of the on disk image must 
- *	be changed, the serialize function must also set *new_addr_ptr 
- *	to the new base address, and set the H5C2__SERIALIZE_RENAMED_FLAG 
+ *	If in addition, the base address of the on disk image must
+ *	be changed, the serialize function must also set *new_addr_ptr
+ *	to the new base address, and set the H5C2__SERIALIZE_RENAMED_FLAG
  *	in *flags_ptr.
  *
- *	If it is successful, the function must return SUCCEED.  
+ *	If it is successful, the function must return SUCCEED.
  *
  *	If it fails for any reason, the function must return FAIL and
- *	push error information on the error stack with the error API 
+ *	push error information on the error stack with the error API
  *	routines.
  *
  *
  * free_icr: Pointer to the free ICR Callback.
  *
- *	The free ICR callback is invoked by the metadata cache when it 
- *	wishes to evict an entry, and needs the client to free the memory 
- *	allocated for the in core representation.  
+ *	The free ICR callback is invoked by the metadata cache when it
+ *	wishes to evict an entry, and needs the client to free the memory
+ *	allocated for the in core representation.
  *
- *	The typedef for the free ICR callback is as follows: 
+ *	The typedef for the free ICR callback is as follows:
  *
- *	typedef herr_t (*N5C_free_icr_func_t)(haddr_t addr, 
+ *	typedef herr_t (*N5C_free_icr_func_t)(haddr_t addr,
  *	                                      size_t len,
  *                                            void * thing);
- * 
- * 	The parameters of the free ICR callback are as follows: 
  *
- * 	addr:   Base address in file of the entry being evicted.  
+ * 	The parameters of the free ICR callback are as follows:
  *
- * 		This parameter is supplied mainly for sanity checking.  
- * 		Sanity checks should be performed when compiled in debug 
- * 		mode, but the parameter may be unused when compiled in 
- * 		production mode.  
+ * 	addr:   Base address in file of the entry being evicted.
  *
- *	len:    Length of the in file image of the entry being evicted 
- *		in bytes.  
+ * 		This parameter is supplied mainly for sanity checking.
+ * 		Sanity checks should be performed when compiled in debug
+ * 		mode, but the parameter may be unused when compiled in
+ * 		production mode.
  *
- *		This parameter is supplied mainly for sanity checking.  
- *		Sanity checks should be performed when compiled in debug 
- *		mode, but the parameter may be unused when compiled in 
- *		production mode.  
+ *	len:    Length of the in file image of the entry being evicted
+ *		in bytes.
  *
- *	thing:  Pointer to void containing the address of the in core 
- *		representation of the target metadata cache entry.  This 
- *		is the same pointer that would be returned by a protect 
- *		of the addr and len above.  
+ *		This parameter is supplied mainly for sanity checking.
+ *		Sanity checks should be performed when compiled in debug
+ *		mode, but the parameter may be unused when compiled in
+ *		production mode.
  *
- *	Processing in the free ICR function should proceed as follows: 
+ *	thing:  Pointer to void containing the address of the in core
+ *		representation of the target metadata cache entry.  This
+ *		is the same pointer that would be returned by a protect
+ *		of the addr and len above.
  *
- *	The free ICR function must free all memory allocated to the 
- *	in core representation.  
+ *	Processing in the free ICR function should proceed as follows:
  *
- *	If the function is successful, it must return SUCCEED.  
+ *	The free ICR function must free all memory allocated to the
+ *	in core representation.
  *
- *	If it fails for any reason, the function must return FAIL and 
- *	push error information on the error stack with the error API 
- *	routines.  
+ *	If the function is successful, it must return SUCCEED.
  *
- *	At least when compiled with debug, it would be useful if the 
- *	free ICR call would fail if the in core representation has been 
+ *	If it fails for any reason, the function must return FAIL and
+ *	push error information on the error stack with the error API
+ *	routines.
+ *
+ *	At least when compiled with debug, it would be useful if the
+ *	free ICR call would fail if the in core representation has been
  *	modified since the last serialize of clear callback.
  *
  *
  * clear_dirty_bits:  Pointer to the clear dirty bits callback.
  *
- * 	For sanity checking purposes, it will be useful if cache clients 
- * 	track whether an in core representation has been modified since 
- * 	the last time it was serialized.  This data is used to flag an 
- * 	error if the cache attempts to free an in core representation 
- * 	that has not been serialized since the last time it was modified.  
+ * 	For sanity checking purposes, it will be useful if cache clients
+ * 	track whether an in core representation has been modified since
+ * 	the last time it was serialized.  This data is used to flag an
+ * 	error if the cache attempts to free an in core representation
+ * 	that has not been serialized since the last time it was modified.
  *
- * 	If this happens, either the client forgot to tell the cache that 
- * 	an entry is dirty, or the cache forgot to flush a dirty entry 
- * 	before evicting it.  In either case we want to know before we 
- * 	get file corruption complaints.  
+ * 	If this happens, either the client forgot to tell the cache that
+ * 	an entry is dirty, or the cache forgot to flush a dirty entry
+ * 	before evicting it.  In either case we want to know before we
+ * 	get file corruption complaints.
  *
- * 	However, in some cases, we want to mark an entry as clean even 
- * 	though it has not been flushed to disk -- most particularly in 
- * 	the parallel case.  Thus we need some way to tell the client 
- * 	that a free of the associated ICR is OK even though it has 
- * 	been modified since the last serialization.  Hence the clear 
- * 	dirty bits callback.  
+ * 	However, in some cases, we want to mark an entry as clean even
+ * 	though it has not been flushed to disk -- most particularly in
+ * 	the parallel case.  Thus we need some way to tell the client
+ * 	that a free of the associated ICR is OK even though it has
+ * 	been modified since the last serialization.  Hence the clear
+ * 	dirty bits callback.
  *
- * 	Since the clear dirty bits callback is purely for sanity checking, 
- * 	it is called only when we compile with debug.  
+ * 	Since the clear dirty bits callback is purely for sanity checking,
+ * 	it is called only when we compile with debug.
  *
  * 	The typedef for the clear callback is as follows:
  *
@@ -425,27 +425,27 @@ typedef struct H5C2_t H5C2_t;
  *                                                    size_t len,
  *                                                    void * thing);
  *
- *	The parameters of the clear callback are as follows: 
+ *	The parameters of the clear callback are as follows:
  *
- *	addr:   Base address in file of the entry whose dirty bits 
- *		are being cleared 
+ *	addr:   Base address in file of the entry whose dirty bits
+ *		are being cleared
  *
- *	len:    Length in bytes of the in file image of the entry 
- *		whose dirty bits are being cleared.  
+ *	len:    Length in bytes of the in file image of the entry
+ *		whose dirty bits are being cleared.
  *
- *	thing:  Pointer to void containing the address of the in 
- *		core representation of the target metadata cache entry.  
- *		This is the same pointer that would be returned by a 
- *		protect of the addr and len above.  
+ *	thing:  Pointer to void containing the address of the in
+ *		core representation of the target metadata cache entry.
+ *		This is the same pointer that would be returned by a
+ *		protect of the addr and len above.
  *
- *	Processing in the clear callback function should proceed as follows: 
+ *	Processing in the clear callback function should proceed as follows:
  *
- *	The function must clear any dirty bits associated with the ICR.  
+ *	The function must clear any dirty bits associated with the ICR.
  *
- *	If successful, the function must return SUCCEED.  
+ *	If successful, the function must return SUCCEED.
  *
- *	If it fails for any reason, the function must return FAIL and 
- *	push error information on the error stack with the error API 
+ *	If it fails for any reason, the function must return FAIL and
+ *	push error information on the error stack with the error API
  *	routines.
  *
  ***************************************************************************/
@@ -454,7 +454,7 @@ typedef void *(*H5C2_deserialize_func_t)(haddr_t addr,
                                          const void * image_ptr,
                                          void * udata_ptr,
 					 hbool_t * dirty_ptr);
- 
+
 typedef herr_t (*H5C2_image_len_func_t)(const void *thing,
                                         size_t *image_len_ptr);
 
@@ -467,12 +467,12 @@ typedef herr_t (*H5C2_serialize_func_t)(const H5F_t *f,
                                         size_t len,
                                         void * image_ptr,
                                         void * thing,
-                                        unsigned * flags_ptr, 
-				        haddr_t * new_addr_ptr, 
-				        size_t * new_len_ptr, 
+                                        unsigned * flags_ptr,
+				        haddr_t * new_addr_ptr,
+				        size_t * new_len_ptr,
 				        void ** new_image_ptr_ptr);
 
-typedef herr_t (*H5C2_free_icr_func_t)(haddr_t addr, 
+typedef herr_t (*H5C2_free_icr_func_t)(haddr_t addr,
                                        size_t len,
                                        void * thing);
 
@@ -543,23 +543,23 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *
  *						JRM - 4/26/04
  *
- * magic:	Unsigned 32 bit integer that must always be set to 
+ * magic:	Unsigned 32 bit integer that must always be set to
  *              H5C2__H5C2_CACHE_ENTRY_T_MAGIC when the entry is valid.
  *              The field must be set to H5C2__H5C2_CACHE_ENTRY_T_BAD_MAGIC
  *              just before the entry is freed.
  *
- *              This is necessary, as the LRU list can be changed out 
+ *              This is necessary, as the LRU list can be changed out
  *              from under H5C2_make_space_in_cache() by the serialize
  *              callback which may change the size of an existing entry,
  *              and/or load a new entry while serializing the target entry.
  *
- *              This in turn can cause a recursive call to 
+ *              This in turn can cause a recursive call to
  *              H5C2_make_space_in_cache() which may either flush or evict
  *              the next entry that the first invocation of that function
  *              was about to examine.
  *
  *              The magic field allows H5C2_make_space_in_cache() to
- *              detect this case, and re-start its scan from the bottom 
+ *              detect this case, and re-start its scan from the bottom
  *              of the LRU when this situation occurs.
  *
  * cache_ptr:	Pointer to the cache that this entry is contained within.
@@ -580,8 +580,8 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *		block of memory on disk.  The image of this block (i.e.
  *		the on disk image) is stored in *image_ptr (discussed below).
  *
- * image_ptr:	Pointer to void.  When not NULL, this field points to a 
- * 		dynamically allocated block of size bytes in which the 
+ * image_ptr:	Pointer to void.  When not NULL, this field points to a
+ * 		dynamically allocated block of size bytes in which the
  * 		on disk image of the metadata cache entry is stored.
  *
  * 		If the entry is dirty, the serialize callback must be used
@@ -645,20 +645,20 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *		Note that protected entries are removed from the LRU lists
  *		and inserted on the protected list.
  *
- * is_read_only: Boolean flag that is only meaningful if is_protected is 
- * 		TRUE.  In this circumstance, it indicates whether the 
+ * is_read_only: Boolean flag that is only meaningful if is_protected is
+ * 		TRUE.  In this circumstance, it indicates whether the
  * 		entry has been protected read only, or read/write.
  *
  * 		If the entry has been protected read only (i.e. is_protected
- * 		and is_read_only are both TRUE), we allow the entry to be 
+ * 		and is_read_only are both TRUE), we allow the entry to be
  * 		protected more than once.
  *
- *		In this case, the number of readers is maintained in the 
+ *		In this case, the number of readers is maintained in the
  *		ro_ref_count field (see below), and unprotect calls simply
  *		decrement that field until it drops to zero, at which point
  *		the entry is actually unprotected.
  *
- * ro_ref_count: Integer field used to maintain a count of the number of 
+ * ro_ref_count: Integer field used to maintain a count of the number of
  * 		outstanding read only protects on this entry.  This field
  * 		must be zero whenever either is_protected or is_read_only
  * 		are TRUE.
@@ -720,7 +720,7 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  * 		is in the process of being flushed.  This allows the cache
  * 		to detect when a call is the result of a flush callback.
  *
- * destroy_in_progress:  Boolean flag that is set to true iff the entry 
+ * destroy_in_progress:  Boolean flag that is set to true iff the entry
  * 		is in the process of being flushed and destroyed.
  *
  *
@@ -811,24 +811,24 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  * 		the specified transaction has made it to disk, we will
  * 		reset this field to zero as well.
  *
- * 		We must maintain this field, as to avoid messages from 
- * 		the future, we must not flush a dirty entry to disk 
- * 		until the last transaction in which it was dirtied 
+ * 		We must maintain this field, as to avoid messages from
+ * 		the future, we must not flush a dirty entry to disk
+ * 		until the last transaction in which it was dirtied
  * 		has made it to disk in the journal file.
  *
- * trans_next:  Next pointer in the entries modified in the current 
+ * trans_next:  Next pointer in the entries modified in the current
  * 		transaction list.  This field should always be null
- * 		unless journaling is enabled, the entry is dirty, 
+ * 		unless journaling is enabled, the entry is dirty,
  * 		and last_trans field contains the current transaction
- * 		number.  Even if all these conditions are fulfilled, 
- * 		the field will still be NULL if this is the last 
+ * 		number.  Even if all these conditions are fulfilled,
+ * 		the field will still be NULL if this is the last
  * 		entry on the list.
  *
- * trans_prev:  Previous pointer in the entries modified in the current 
+ * trans_prev:  Previous pointer in the entries modified in the current
  * 		transaction list.  This field should always be null
- * 		unless journaling is enabled, the entry is dirty, 
+ * 		unless journaling is enabled, the entry is dirty,
  * 		and last_trans field contains the current transaction
- * 		number.  Even if all these conditions are fulfilled, 
+ * 		number.  Even if all these conditions are fulfilled,
  * 		the field will still be NULL if this is the first
  * 		entry on the list.
  *
@@ -1045,7 +1045,7 @@ typedef struct H5C2_cache_entry_t
  *
  *
  *      With a little thought, it should be obvious that the above flash
- *      cache size increase algorithm is not sufficient for all 
+ *      cache size increase algorithm is not sufficient for all
  *      circumstances -- for example, suppose the user round robins through
  *      (1/flash_threshold) +1 groups, adding one data set to each on each
  *      pass.  Then all will increase in size at about the same time, requiring
@@ -1062,11 +1062,11 @@ typedef struct H5C2_cache_entry_t
  *      flash_incr_mode section.  This field is ignored unless flash_incr_mode
  *      is H5C_flash_incr__add_space.
  *
- * flash_threshold: Double containing the factor by which current max cache 
- * 	size is multiplied to obtain the size threshold for the add_space 
- * 	flash increment algorithm.  The field is ignored unless 
+ * flash_threshold: Double containing the factor by which current max cache
+ * 	size is multiplied to obtain the size threshold for the add_space
+ * 	flash increment algorithm.  The field is ignored unless
  * 	flash_incr_mode is H5C2_flash_incr__add_space.
- * 
+ *
  *
  * Cache size decrease control fields:
  *
@@ -1273,14 +1273,14 @@ typedef struct H5C2_auto_size_ctl_t
  *
  * structure H5C2_mdj_config_t
  *
- * H5C2_mdj_config_t is a structure intended for use in comminicating 
- * metadata journaling configuration data to and from the metadata 
- * cache. 
+ * H5C2_mdj_config_t is a structure intended for use in comminicating
+ * metadata journaling configuration data to and from the metadata
+ * cache.
  *
  * In its initial incarnation, it is identical to the H5AC2_jnl_config_t
- * structure less ther version, and journal_recovered fields.  However, 
- * in the future we may support other types of journaling -- which will 
- * likely require modification or replacement of the H5AC2_jnl_config_t 
+ * structure less ther version, and journal_recovered fields.  However,
+ * in the future we may support other types of journaling -- which will
+ * likely require modification or replacement of the H5AC2_jnl_config_t
  * structure.
  *
  * The fields of the structure are discussed individually below.  Note
@@ -1300,7 +1300,7 @@ typedef struct H5C2_auto_size_ctl_t
  *
  *      At present, the length of the journal file path is restricted to
  *      no more than H5C2__MAX_JOURNAL_FILE_NAME_LEN (which must equal
- *      H5AC2__MAX_JOURNAL_FILE_NAME_LEN). 
+ *      H5AC2__MAX_JOURNAL_FILE_NAME_LEN).
  *
  * jbrb_buf_size: size_t containing the size of each individual buffer
  *      in the journal buffer ring buffer.  This size should be chosen
@@ -1636,7 +1636,7 @@ H5_DLL herr_t H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr);
 
 H5_DLL herr_t H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr);
 
-H5_DLL herr_t H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, 
+H5_DLL herr_t H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 		                       size_t size,
                                        const char * data,
                                        hbool_t is_end_trans,
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 7c04ea2..f0623b0 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -43,12 +43,12 @@
 /* Get needed headers */
 #include "H5SLprivate.h"        /* Skip lists */
 
-/* With the introduction of the fractal heap, it is now possible for 
+/* With the introduction of the fractal heap, it is now possible for
  * entries to be dirtied, resized, and/or renamed in the flush callbacks.
  * As a result, on flushes, it may be necessary to make multiple passes
  * through the slist before it is empty.  The H5C__MAX_PASSES_ON_FLUSH
  * #define is used to set an upper limit on the number of passes.
- * The current value was obtained via personal communication with 
+ * The current value was obtained via personal communication with
  * Quincey.  I have applied a fudge factor of 2.
  */
 
@@ -99,7 +99,7 @@
  * magic:	Unsigned 32 bit integer always set to H5C__H5C_T_MAGIC.  This
  *		field is used to validate pointers to instances of H5C_t.
  *
- * flush_in_progress: Boolean flag indicating whether a flush is in 
+ * flush_in_progress: Boolean flag indicating whether a flush is in
  * 		progress.
  *
  * trace_file_ptr:  File pointer pointing to the trace file, which is used
@@ -108,7 +108,7 @@
  *              no trace file should be recorded.
  *
  *              Since much of the code supporting the parallel metadata
- *              cache is in H5AC, we don't write the trace file from 
+ *              cache is in H5AC, we don't write the trace file from
  *              H5C.  Instead, H5AC reads the trace_file_ptr as needed.
  *
  *              When we get to using H5C in other places, we may add
@@ -181,10 +181,10 @@
  * writes.  The following field is used to implement this.
  *
  * evictions_enabled:  Boolean flag that is initialized to TRUE.  When
- * 		this flag is set to FALSE, the metadata cache will not 
+ * 		this flag is set to FALSE, the metadata cache will not
  * 		attempt to evict entries to make space for newly protected
  * 		entries, and instead the will grow without limit.
- * 		
+ *
  * 		Needless to say, this feature must be used with care.
  *
  *
@@ -255,7 +255,7 @@
  * following two fields have been added.  They are only compiled in when
  * H5C_DO_SANITY_CHECKS is TRUE.
  *
- * slist_len_increase: Number of entries that have been added to the 
+ * slist_len_increase: Number of entries that have been added to the
  * 		slist since the last time this field was set to zero.
  *
  * slist_size_increase: Total size of all entries that have been added
@@ -468,13 +468,13 @@
  * flash_size_increase_possible: Depending on the configuration data given
  * 		in the resize_ctl field, it may or may not be possible
  * 		for a flash size increase to occur.  We set this flag
- * 		whenever we receive a new configuration so as to avoid 
+ * 		whenever we receive a new configuration so as to avoid
  * 		repeated calculations.
  *
  * flash_size_increase_threshold: If a flash cache size increase is possible,
  * 		this field is used to store the minimum size of a new entry
- * 		or size increase needed to trigger a flash cache size 
- * 		increase.  Note that this field must be updated whenever 
+ * 		or size increase needed to trigger a flash cache size
+ * 		increase.  Note that this field must be updated whenever
  * 		the size of the cache is changed.
  *
  * size_decrease_possible:  Depending on the configuration data given
@@ -592,9 +592,9 @@
  *		equal to the array index has not been in cache when
  *		requested in the current epoch.
  *
- * write_protects:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The 
- *		cells are used to record the number of times an entry with 
- *		type id equal to the array index has been write protected 
+ * write_protects:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The
+ *		cells are used to record the number of times an entry with
+ *		type id equal to the array index has been write protected
  *		in the current epoch.
  *
  * 		Observe that (hits + misses) = (write_protects + read_protects).
@@ -606,9 +606,9 @@
  *
  *              Observe that (hits + misses) = (write_protects + read_protects).
  *
- * max_read_protects:  Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1. 
- * 		The cells are used to maximum number of simultaneous read 
- * 		protects on any entry with type id equal to the array index 
+ * max_read_protects:  Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to maximum number of simultaneous read
+ * 		protects on any entry with type id equal to the array index
  * 		in the current epoch.
  *
  * insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
@@ -616,9 +616,9 @@
  *		id equal to the array index has been inserted into the
  *		cache in the current epoch.
  *
- * pinned_insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
- * 		The cells are used to record the number of times an entry 
- * 		with type id equal to the array index has been inserted 
+ * pinned_insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to record the number of times an entry
+ * 		with type id equal to the array index has been inserted
  * 		pinned into the cache in the current epoch.
  *
  * clears:      Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
@@ -641,13 +641,13 @@
  *		id equal to the array index has been renamed in the current
  *		epoch.
  *
- * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
- * 		The cells are used to record the number of times an entry 
+ * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to record the number of times an entry
  * 		with type id equal to the array index has been renamed
  * 		during its flush callback in the current epoch.
  *
- * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
- * 		The cells are used to record the number of times an entry 
+ * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
+ * 		The cells are used to record the number of times an entry
  * 		with type id equal to the array index has been renamed
  * 		during a cache flush in the current epoch.
  *
@@ -686,14 +686,14 @@
  *		with type id equal to the array index has decreased in
  *		size in the current epoch.
  *
- * entry_flush_size_changes:  Array of int64 of length 
- * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
- * 		the number of times an entry with type id equal to the 
+ * entry_flush_size_changes:  Array of int64 of length
+ * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record
+ * 		the number of times an entry with type id equal to the
  * 		array index has changed size while in its flush callback.
  *
- * cache_flush_size_changes:  Array of int64 of length 
- * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
- * 		the number of times an entry with type id equal to the 
+ * cache_flush_size_changes:  Array of int64 of length
+ * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record
+ * 		the number of times an entry with type id equal to the
  * 		array index has changed size during a cache flush
  *
  * total_ht_insertions: Number of times entries have been inserted into the
@@ -868,7 +868,7 @@ struct H5C_t
 
     hbool_t			size_increase_possible;
     hbool_t			flash_size_increase_possible;
-    size_t			flash_size_increase_threshold; 
+    size_t			flash_size_increase_threshold;
     hbool_t			size_decrease_possible;
     hbool_t			resize_enabled;
     hbool_t			cache_full;
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 53dcf0d..b50227b 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -222,7 +222,7 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  *              of the LRU when this situation occurs.
  *
  *              This field is only compiled in debug mode.
- * 
+ *
  * addr:	Base address of the cache entry on disk.
  *
  * size:	Length of the cache entry on disk.  Note that unlike normal
@@ -286,20 +286,20 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  *		Note that protected entries are removed from the LRU lists
  *		and inserted on the protected list.
  *
- * is_read_only: Boolean flag that is only meaningful if is_protected is 
- * 		TRUE.  In this circumstance, it indicates whether the 
+ * is_read_only: Boolean flag that is only meaningful if is_protected is
+ * 		TRUE.  In this circumstance, it indicates whether the
  * 		entry has been protected read only, or read/write.
  *
  * 		If the entry has been protected read only (i.e. is_protected
- * 		and is_read_only are both TRUE), we allow the entry to be 
+ * 		and is_read_only are both TRUE), we allow the entry to be
  * 		protected more than once.
  *
- *		In this case, the number of readers is maintained in the 
+ *		In this case, the number of readers is maintained in the
  *		ro_ref_count field (see below), and unprotect calls simply
  *		decrement that field until it drops to zero, at which point
  *		the entry is actually unprotected.
  *
- * ro_ref_count: Integer field used to maintain a count of the number of 
+ * ro_ref_count: Integer field used to maintain a count of the number of
  * 		outstanding read only protects on this entry.  This field
  * 		must be zero whenever either is_protected or is_read_only
  * 		are TRUE.
@@ -361,7 +361,7 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  * 		is in the process of being flushed.  This allows the cache
  * 		to detect when a call is the result of a flush callback.
  *
- * destroy_in_progress:  Boolean flag that is set to true iff the entry 
+ * destroy_in_progress:  Boolean flag that is set to true iff the entry
  * 		is in the process of being flushed and destroyed.
  *
  *
@@ -623,21 +623,21 @@ typedef struct H5C_cache_entry_t
  *
  * 	The addition of the flash increment mode was occasioned by performance
  * 	problems that appear when a local heap is increased to a size in excess
- * 	of the current cache size.  While the existing re-size code dealt with 
- * 	this eventually, performance was very bad for the remainder of the 
+ * 	of the current cache size.  While the existing re-size code dealt with
+ * 	this eventually, performance was very bad for the remainder of the
  * 	epoch.
- * 	
+ *
  * 	At present, there are two possible values for the flash_incr_mode:
  *
- * 	H5C_flash_incr__off:  Don't perform flash increases in the size of 
- * 		the cache. 
+ * 	H5C_flash_incr__off:  Don't perform flash increases in the size of
+ * 		the cache.
  *
- *	H5C_flash_incr__add_space:  Let x be either the size of a newly 
- *	        newly inserted entry, or the number of bytes by which the 
+ *	H5C_flash_incr__add_space:  Let x be either the size of a newly
+ *	        newly inserted entry, or the number of bytes by which the
  *	        size of an existing entry has been increased.
  *
- *	        If 
- *	        	x > flash_threshold * current max cache size, 
+ *	        If
+ *	        	x > flash_threshold * current max cache size,
  *
  *	       	increase the current maximum cache size by x * flash_multiple
  *	       	less any free space in the cache, and start a new epoch.  For
@@ -646,28 +646,28 @@ typedef struct H5C_cache_entry_t
  *
  *	With a little thought, it should be obvious that the above flash
  *	cache size increase algorithm is not sufficient for all circumstances --
- *	for example, suppose the user round robins through 
- *	(1/flash_threshold) +1 groups, adding one data set to each on each 
- *	pass.  Then all will increase in size at about the same time, requiring 
- *	the max cache size to at least double to maintain acceptable 
- *      performance, however the above flash increment algorithm will not be 
+ *	for example, suppose the user round robins through
+ *	(1/flash_threshold) +1 groups, adding one data set to each on each
+ *	pass.  Then all will increase in size at about the same time, requiring
+ *	the max cache size to at least double to maintain acceptable
+ *      performance, however the above flash increment algorithm will not be
  *	triggered.
  *
- *	Hopefully, the add space algorithm detailed above will be sufficient 
- *	for the performance problems encountered to date.  However, we should 
+ *	Hopefully, the add space algorithm detailed above will be sufficient
+ *	for the performance problems encountered to date.  However, we should
  *	expect to revisit the issue.
  *
- * flash_multiple: Double containing the multiple described above in the 
- * 	H5C_flash_incr__add_space section of the discussion of the 
- * 	flash_incr_mode	section.  This field is ignored unless flash_incr_mode 
+ * flash_multiple: Double containing the multiple described above in the
+ * 	H5C_flash_incr__add_space section of the discussion of the
+ * 	flash_incr_mode	section.  This field is ignored unless flash_incr_mode
  * 	is H5C_flash_incr__add_space.
  *
  * flash_threshold: Double containing the factor by which current max cache size
- *      is multiplied to obtain the size threshold for the add_space flash 
- *      increment algorithm.  The field is ignored unless flash_incr_mode is 
+ *      is multiplied to obtain the size threshold for the add_space flash
+ *      increment algorithm.  The field is ignored unless flash_incr_mode is
  *	H5C_flash_incr__add_space.
  *
- *	
+ *
  * Cache size decrease control fields:
  *
  * decr_mode: Instance of the H5C_cache_decr_mode enumerated type whose
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index aefa4e0..d4ac4ac 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -1317,12 +1317,12 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-hbool_t 
+hbool_t
 H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr)
 {
     const H5D_t *dataset = io_info->dset;
     hbool_t ret_value;
- 
+
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cacheable)
 
     HDassert(io_info);
@@ -1373,13 +1373,13 @@ H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr)
  *
  *-------------------------------------------------------------------------
  */
-static hbool_t 
+static hbool_t
 H5D_chunk_in_cache(const H5D_t *dset, const hsize_t *chunk_offset,
     hsize_t chunk_idx)
 {
     H5D_rdcc_t	*rdcc = &(dset->shared->cache.chunk);/*raw data chunk cache*/
     hbool_t	found = FALSE;		/*already in cache?	*/
- 
+
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_in_cache)
 
     /* Sanity checks */
@@ -2423,7 +2423,7 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
 
         if(NULL == (chunk = H5D_chunk_alloc(chunk_size, pline)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for raw data chunk")
-	
+
         /* In the case that some dataset functions look through this data,
          * clear it to all 0s. */
         HDmemset(chunk, 0, chunk_size);
@@ -4106,7 +4106,7 @@ H5D_chunk_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst,
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for raw data chunk")
 
         /* Check for reference datatype and no expanding references & clear background buffer */
-        if(!cpy_info->expand_ref && 
+        if(!cpy_info->expand_ref &&
                 ((H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) && (f_src != f_dst)))
             /* Reset value to zero */
             HDmemset(bkg, 0, buf_size);
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c
index 0458e74..bc3d475 100644
--- a/src/H5Dcompact.c
+++ b/src/H5Dcompact.c
@@ -319,7 +319,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, 
+H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst,
     H5O_layout_t *layout_dst, H5T_t *dt_src, H5O_copy_t *cpy_info, hid_t dxpl_id)
 {
     hid_t       tid_src = -1;           /* Datatype ID for source datatype */
@@ -458,7 +458,7 @@ H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst,
             /* Type conversion not necessary */
             HDmemcpy(layout_dst->u.compact.buf, layout_src->u.compact.buf, layout_src->u.compact.size);
     } /* end if */
-    else 
+    else
         /* Type conversion not necessary */
         HDmemcpy(layout_dst->u.compact.buf, layout_src->u.compact.buf, layout_src->u.compact.size);
 
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index f751298..779071f 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -243,7 +243,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
     while(npoints > 0) {
         size_t curr_points;     /* Number of elements to write on this iteration of the loop */
         size_t size;            /* Size of buffer to write */
-        
+
         /* Compute # of elements and buffer size to write for this iteration */
         curr_points = MIN(fb_info.elmts_per_buf, npoints);
         size = curr_points * fb_info.file_elmt_size;
@@ -544,7 +544,7 @@ H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size)
 
     HDassert(io_info);
 
-    if(H5D_contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off, 
+    if(H5D_contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off,
             (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed")
 
@@ -1157,7 +1157,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, 
+H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst,
     H5O_layout_t *layout_dst, H5T_t *dt_src, H5O_copy_t *cpy_info, hid_t dxpl_id)
 {
     haddr_t     addr_src;               /* File offset in source dataset */
@@ -1278,7 +1278,7 @@ H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst,
         if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) {
             /* Need to fix values of references when copying across files */
             if(f_src != f_dst)
-                fix_ref = TRUE; 
+                fix_ref = TRUE;
         } /* end if */
 
         /* Set the number of bytes to read & write to the buffer size */
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index c2441b7..da6f2c2 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -166,7 +166,7 @@ done:
     If there's VL type of data, the address of the data is copied multiple
     times into the buffer, causing some trouble when the data is released.
     Instead, make multiple copies of fill value first, then do conversion
-    on each element so that each of them has a copy of the VL data. 
+    on each element so that each of them has a copy of the VL data.
 --------------------------------------------------------------------------*/
 herr_t
 H5D_fill(const void *fill, const H5T_t *fill_type, void *buf,
@@ -237,9 +237,9 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf,
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
         } /* end if */
 
-        /* If there's VL type of data, make multiple copies of fill value first, 
-         * then do conversion on each element so that each of them has a copy 
-         * of the VL data. 
+        /* If there's VL type of data, make multiple copies of fill value first,
+         * then do conversion on each element so that each of them has a copy
+         * of the VL data.
          */
         if(TRUE == H5T_detect_class(fill_type, H5T_VLEN)) {
             H5D_dxpl_cache_t _dxpl_cache;       /* Data transfer property cache buffer */
diff --git a/src/H5Dint.c b/src/H5Dint.c
index b45d7df..024f66b 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -1200,7 +1200,7 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
     if(H5FO_top_incr(new_dset->oloc.file, new_dset->oloc.addr) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't incr object ref. count")
     if(H5FO_insert(new_dset->oloc.file, new_dset->oloc.addr, new_dset->shared, TRUE) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, NULL, "can't insert dataset into list of open objects")    
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, NULL, "can't insert dataset into list of open objects")
 
     new_dset->shared->fo_count = 1;
 
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 2160190..41f1021 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -165,9 +165,9 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer")
 
     /* If the buffer is nil, and 0 element is selected, make a fake buffer.
-     * This is for some MPI package like ChaMPIon on NCSA's tungsten which 
-     * doesn't support this feature. 
-     */ 
+     * This is for some MPI package like ChaMPIon on NCSA's tungsten which
+     * doesn't support this feature.
+     */
     if(!buf)
         buf = &fake_char;
 
@@ -255,11 +255,11 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms")
     if(!buf && H5S_GET_SELECT_NPOINTS(file_space) != 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer")
-    
+
     /* If the buffer is nil, and 0 element is selected, make a fake buffer.
-     * This is for some MPI package like ChaMPIon on NCSA's tungsten which 
-     * doesn't support this feature. 
-     */ 
+     * This is for some MPI package like ChaMPIon on NCSA's tungsten which
+     * doesn't support this feature.
+     */
     if(!buf)
         buf = &fake_char;
 
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index a87c9d3..77f92b2 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -15,7 +15,7 @@
 
 /*
  * Programmer:  rky 980813
- * KY 2005 revised the code and made the change to support and optimize 
+ * KY 2005 revised the code and made the change to support and optimize
  * collective IO support.
  * Purpose:	Functions to read/write directly between app buffer and file.
  *
@@ -557,10 +557,10 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5D_chunk_collective_io
  *
- * Purpose:	Routine for 
- *              1) choose an IO option: 
+ * Purpose:	Routine for
+ *              1) choose an IO option:
  *                    a) One collective IO defined by one MPI derived datatype to link through all chunks
- *              or    b) multiple chunk IOs,to do MPI-IO for each chunk, the IO mode may be adjusted 
+ *              or    b) multiple chunk IOs,to do MPI-IO for each chunk, the IO mode may be adjusted
  *                       due to the selection pattern for each chunk.
  *              For option a)
  *                      1. Sort the chunk address, obtain chunk info according to the sorted chunk address
@@ -572,10 +572,10 @@ done:
  *                      1. Use MPI_gather and MPI_Bcast to obtain information of *collective/independent/none*
  *                         IO mode for each chunk of the selection
  *                      2. Depending on whether the IO mode is collective or independent or none,
- *                         Create either MPI derived datatype for each chunk to do collective IO or 
+ *                         Create either MPI derived datatype for each chunk to do collective IO or
  *                         just do independent IO or independent IO with file set view
  *                      3. Set up collective IO property list for collective mode
- *                      4. DO IO               
+ *                      4. DO IO
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -584,7 +584,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
     H5D_chunk_map_t *fm)
 {
@@ -595,7 +595,7 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
     htri_t      temp_not_link_io = FALSE;
 #endif
-    herr_t      ret_value = SUCCEED;    
+    herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_collective_io)
 
@@ -604,7 +604,7 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
     HDassert(io_info->using_mpi_vfd);
     HDassert(type_info);
     HDassert(fm);
-    
+
     /* Obtain the data transfer properties */
     if(NULL == (dx_plist = H5I_object(io_info->dxpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
@@ -620,10 +620,10 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
         int mpi_size;                   /* Number of processes in MPI job */
 
         if(H5D_mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); 
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes");
         if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
             HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
-    
+
         one_link_chunk_io_threshold = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME);
 
         /* step 1: choose an IO option */
@@ -777,7 +777,7 @@ done:
  *                      1. Sort the chunk address and chunk info
  *                      2. Build up MPI derived datatype for each chunk
  *                      3. Build up the final MPI derived datatype
- *                      4. Use common collective IO routine to do MPI-IO 
+ *                      4. Use common collective IO routine to do MPI-IO
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -803,15 +803,15 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type
     MPI_Aint           *chunk_disp_array = NULL;
     MPI_Aint           *chunk_mem_disp_array = NULL;
     int                *blocklen = NULL;
-    int                 mpi_code;           /* MPI return code */ 
-    herr_t              ret_value = SUCCEED;    
-    
+    int                 mpi_code;           /* MPI return code */
+    herr_t              ret_value = SUCCEED;
+
     FUNC_ENTER_NOAPI_NOINIT(H5D_link_chunk_collective_io)
 
     /* Get the sum # of chunks, if not already available */
     if(sum_chunk < 0) {
         if(H5D_mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0)
-            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); 
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes");
     } /* end if */
 
     /* Retrieve total # of chunks in dataset */
@@ -834,7 +834,7 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type
         /* Look up address of chunk */
         if(HADDR_UNDEF == (ctg_store.contig.dset_addr = H5D_chunk_get_addr(io_info->dset, io_info->dxpl_id, coords, NULL)))
             HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
- 
+
         /* Check for this process having selection in this chunk */
         chunk_node = H5SL_first(fm->sel_chunks);
 	if(chunk_node == NULL) {
@@ -878,7 +878,7 @@ if(H5DEBUG(D))
 if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"total_chunks = %Zu, num_chunk = %Zu\n", total_chunks, num_chunk);
 #endif
-             
+
         /* Set up MPI datatype for chunks selected */
         if(num_chunk) {
             hsize_t mpi_mem_extra_offset;       /* Extra offset for memory MPI datatype */
@@ -886,7 +886,7 @@ if(H5DEBUG(D))
             size_t mpi_mem_count;               /* Memory MPI datatype count */
             size_t mpi_file_count;              /* File MPI datatype count */
             hbool_t locl_mbt_is_derived = FALSE,     /* Whether the buffer (memory) type is derived and needs to be free'd */
-                    local_mft_is_derived = FALSE;     /* Whether the file type is derived and needs to be free'd */  
+                    local_mft_is_derived = FALSE;     /* Whether the file type is derived and needs to be free'd */
             int blocklen_value;                 /* Placeholder for array fill */
 
             /* Allocate chunking information */
@@ -910,7 +910,7 @@ if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"after sorting the chunk address \n");
 #endif
 
-            /* Obtain MPI derived datatype from all individual chunks */ 
+            /* Obtain MPI derived datatype from all individual chunks */
             for(u = 0; u < num_chunk; u++) {
                 /* Disk MPI derived datatype */
                 if(H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.fspace,
@@ -923,7 +923,7 @@ if(H5DEBUG(D))
                         type_info->dst_type_size, &chunk_mtype[u], &mpi_mem_count,
                         &mpi_mem_extra_offset, &locl_mbt_is_derived) < 0)
                     HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buf type")
-                   
+
                 /* Chunk address relative to the first chunk */
                 chunk_addr_info_array[u].chunk_addr -= ctg_store.contig.dset_addr;
                 H5_ASSIGN_OVERFLOW(chunk_disp_array[u], chunk_addr_info_array[u].chunk_addr, haddr_t, MPI_Aint);
@@ -977,7 +977,7 @@ if(H5DEBUG(D))
             /* Set the MPI datatype */
             chunk_final_ftype = MPI_BYTE;
             chunk_final_mtype = MPI_BYTE;
-          
+
             /* buffer, file derived datatypes should be true */
             mpi_buf_count  = (size_t)0;
         } /* end else */
@@ -1033,7 +1033,7 @@ if(H5DEBUG(D))
  *              1. Use MPI_gather and MPI_Bcast to obtain IO mode in each chunk(collective/independent/none)
  *              2. Depending on whether the IO mode is collective or independent or none,
  *                 Create either MPI derived datatype for each chunk or just do independent IO
- *              3. Use common collective IO routine to do MPI-IO               
+ *              3. Use common collective IO routine to do MPI-IO
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -1042,7 +1042,7 @@ if(H5DEBUG(D))
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
     H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
 {
@@ -1062,7 +1062,7 @@ H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
     int mpi_rank;
 #endif
     size_t              u;                    /* Local index variable */
-    herr_t              ret_value = SUCCEED;    
+    herr_t              ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io)
 
@@ -1083,7 +1083,7 @@ if(H5DEBUG(D))
 #endif
 
     /* Obtain IO option for each chunk */
-    if(H5D_obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0) 
+    if(H5D_obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTRECV, FAIL, "unable to obtain MPIO mode")
 
     /* Set up contiguous I/O info object */
@@ -1127,7 +1127,7 @@ if(H5DEBUG(D))
             store.chunk.index   = chunk_info->index;
 	} /* end if */
 
-        /* Collective IO for this chunk, 
+        /* Collective IO for this chunk,
          * Note: even there is no selection for this process, the process still
          *      needs to contribute MPI NONE TYPE.
          */
@@ -1136,7 +1136,7 @@ if(H5DEBUG(D))
 if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"inside collective chunk IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
 #endif
-	
+
             /* Set the file & memory dataspaces */
             if(chunk_info) {
                 fspace = chunk_info->fspace;
@@ -1157,7 +1157,7 @@ if(H5DEBUG(D))
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O")
                 last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO;
             } /* end if */
-          
+
             /* Initialize temporary contiguous storage address */
             ctg_store.contig.dset_addr = chunk_addr[u];
 
@@ -1170,7 +1170,7 @@ if(H5DEBUG(D))
 if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"inside independent IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u);
 #endif
-	
+
             HDassert(chunk_io_option[u] == 0);
 
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
@@ -1296,14 +1296,14 @@ done:
  *              to replace the independent IO when we find this chunk is not good to
  *              do collective IO. However, according to our performance study,
  *              this approach may not overcome the overhead caused by MPI gather/scatter.
- *              So we decide to leave the original collective IO per chunk approach as 
+ *              So we decide to leave the original collective IO per chunk approach as
  *              an option for users. NO MPI gather/scatter calls are used.
  *              HDF5 will try to collective IO if possible.
- *              If users choose to use 
+ *              If users choose to use
  *              H5Pset_dxpl_mpio_chunk_opt(dxpl_id,H5FD_MPIO_OPT_MULTI_IO),
- *              this function will be called. 
- *              The HDF5 library won't do any IO management but leave it to MPI-IO to figure 
- *              out.  
+ *              this function will be called.
+ *              The HDF5 library won't do any IO management but leave it to MPI-IO to figure
+ *              out.
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -1312,7 +1312,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,
     const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist)
 {
@@ -1326,7 +1326,7 @@ H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,
     int             min_chunk = -1;       /* Minimum # of chunks all processes will operate on */
     int             count_chunk;          /* How many chunks have we operated on? */
     H5D_storage_t   store;                /* union of EFL and chunk pointer in file space */
-    herr_t          ret_value = SUCCEED;    
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io_no_opt)
 
@@ -1336,7 +1336,7 @@ if(H5DEBUG(D)) {
 
     mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file);
     HDfprintf(H5DEBUG(D), "coming to multi_chunk_collective_io_no_opt\n");
-}         
+}
 #endif
 
     /* Set up contiguous I/O info object */
@@ -1383,7 +1383,7 @@ if(H5DEBUG(D)) {
 
         /* Reset flags for changing parallel I/O mode */
         make_ind = make_coll = FALSE;
-          
+
         count_chunk++;
 
         /* If the number of chunk is greater than minimum number of chunk,
@@ -1396,7 +1396,7 @@ if(H5DEBUG(D)) {
 /* This case needs to be improved to check if the selected space
    is regular. If all selections are regular, collective IO can still be done.
    However, since we find an MPI-IO bug at a DOE machine(mcr) that cannot
-   handle collective I/O selection for this case correctly, 
+   handle collective I/O selection for this case correctly,
    we turn off this optimization but leave the following code
    for future optimization. Otherwise, the following else {} doesn't make sense.
    KY 2006/8/4/ */
@@ -1505,7 +1505,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
     const H5S_t *file_space, const H5S_t *mem_space)
 {
@@ -1513,7 +1513,7 @@ H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
     hbool_t mbt_is_derived = FALSE;
     hbool_t mft_is_derived = FALSE;
     MPI_Datatype        mpi_file_type, mpi_buf_type;
-    int                 mpi_code;           /* MPI return code */ 
+    int                 mpi_code;           /* MPI return code */
     herr_t       ret_value = SUCCEED;  /* return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5D_inter_collective_io)
@@ -1532,7 +1532,7 @@ H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
     } /* end if */
     else {
         /* For non-selection, participate with a none MPI derived datatype, the count is 0.  */
-        mpi_buf_type   = MPI_BYTE;   
+        mpi_buf_type   = MPI_BYTE;
         mpi_file_type  = MPI_BYTE;
         mpi_buf_count  = (size_t)0;
         mbt_is_derived = FALSE;
@@ -1576,11 +1576,11 @@ if(H5DEBUG(D))
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
     size_t mpi_buf_count, MPI_Datatype *mpi_file_type, MPI_Datatype *mpi_buf_type)
 {
-    int         mpi_code;               /* MPI return code */ 
+    int         mpi_code;               /* MPI return code */
     hbool_t	plist_is_setup = FALSE; /* Whether the dxpl has been customized */
     herr_t      ret_value = SUCCEED;
 
@@ -1609,7 +1609,7 @@ done:
             HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "unable to reset dxpl values")
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D)) 
+if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D),"ret_value before leaving final_collective_io=%d\n",ret_value);
 #endif
       FUNC_LEAVE_NOAPI(ret_value)
@@ -1630,8 +1630,8 @@ if(H5DEBUG(D))
  * Parameters:
  *              Input: H5D_io_info_t* io_info,
  *                      H5D_chunk_map_t *fm(global chunk map struct)
- *              Input/Output:  H5D_chunk_addr_info_t chunk_addr_info_array[]   : array to store chunk address and information 
- *                     many_chunk_opt                         : flag to optimize the way to obtain chunk addresses 
+ *              Input/Output:  H5D_chunk_addr_info_t chunk_addr_info_array[]   : array to store chunk address and information
+ *                     many_chunk_opt                         : flag to optimize the way to obtain chunk addresses
  *                                                              for many chunks
  *
  * Return:	Non-negative on success/Negative on failure
@@ -1641,7 +1641,7 @@ if(H5DEBUG(D))
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
     H5D_chunk_addr_info_t chunk_addr_info_array[], int sum_chunk)
 {
@@ -1656,14 +1656,14 @@ H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
     int             mpi_code;                   /* MPI return code */
     int             i;                          /* Local index variable */
     herr_t	    ret_value = SUCCEED;        /* Return value		*/
-  
+
     FUNC_ENTER_NOAPI_NOINIT(H5D_sort_chunk)
 
     /* Retrieve # of MPI processes */
     if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
 
-    /* Calculate the actual threshold to obtain all chunk addresses collectively 
+    /* Calculate the actual threshold to obtain all chunk addresses collectively
      *  The bigger this number is, the more possible the use of obtaining chunk
      * address collectively.
      */
@@ -1677,7 +1677,7 @@ H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
         many_chunk_opt = H5D_OBTAIN_ALL_CHUNK_ADDR_COL;
 
 #ifdef H5D_DEBUG
-if(H5DEBUG(D)) 
+if(H5DEBUG(D))
     HDfprintf(H5DEBUG(D), "many_chunk_opt= %d\n", many_chunk_opt);
 #endif
 
@@ -1715,12 +1715,12 @@ if(H5DEBUG(D))
     while(chunk_node) {
         if(NULL == (chunk_info = H5SL_item(chunk_node)))
             HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list")
-        
+
         if(many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND) {
             if(HADDR_UNDEF == (chunk_addr = H5D_chunk_get_addr(io_info->dset, io_info->dxpl_id, chunk_info->coords, NULL)))
                 HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list")
         } /* end if */
-        else 
+        else
             chunk_addr = total_chunk_addr_array[chunk_info->index];
 
         /* Check if chunk addresses are not in increasing order in the file */
@@ -1752,7 +1752,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_sort_chunk() */
-    
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_obtain_mpio_mode
@@ -1763,7 +1763,7 @@ done:
  * Description:
  *
  *              1) Each process provides two piece of information for all chunks having selection
- *                 a) chunk index 
+ *                 a) chunk index
  *                 b) wheather this chunk is regular(for MPI derived datatype not working case)
  *
  *              2) Gather all the information to the root process
@@ -1790,7 +1790,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
     H5P_genplist_t *dx_plist, uint8_t assign_io_mode[], haddr_t chunk_addr[])
 {
@@ -1801,7 +1801,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
     uint8_t*          recv_io_mode_info=NULL;
     uint8_t*          mergebuf=NULL;
     uint8_t*          tempbuf;
-    H5SL_node_t*      chunk_node;  
+    H5SL_node_t*      chunk_node;
     H5D_chunk_info_t* chunk_info;
     int               mpi_size,mpi_rank;
     MPI_Comm          comm;
@@ -1817,7 +1817,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
     FUNC_ENTER_NOAPI_NOINIT(H5D_obtain_mpio_mode)
 
     /* Assign the rank 0 to the root */
-    root              = 0; 
+    root              = 0;
     comm              = io_info->comm;
 
     /* Obtain the number of process and the current rank of the process */
@@ -1825,7 +1825,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
         HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank")
     if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
         HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size")
-  
+
     /* Setup parameters */
     H5_ASSIGN_OVERFLOW(total_chunks, fm->total_chunks, hsize_t, int);
     percent_nproc_per_chunk = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME);
@@ -1833,22 +1833,22 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
     chunk_opt_mode = (H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME);
     if((chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO) || (percent_nproc_per_chunk == 0)) {
         if(H5D_chunk_addrmap(io_info, chunk_addr, fm->down_chunks) < 0)
-           HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");    
+           HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address");
         for(ic = 0; ic < total_chunks; ic++)
            assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL;
 
         HGOTO_DONE(SUCCEED)
     } /* end if */
-#endif    
+#endif
     threshold_nproc_per_chunk = mpi_size * percent_nproc_per_chunk/100;
 
     /* Allocate memory */
     io_mode_info      = (uint8_t *)H5MM_calloc(total_chunks);
     mergebuf          = H5MM_malloc((sizeof(haddr_t) + 1) * total_chunks);
     tempbuf           = mergebuf + total_chunks;
-    if(mpi_rank == root) 
+    if(mpi_rank == root)
         recv_io_mode_info = (uint8_t *)H5MM_malloc(total_chunks * mpi_size);
-  
+
     mem_cleanup       = 1;
 
     /* Obtain the regularity and selection information for all chunks in this process. */
@@ -1868,7 +1868,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
 #endif
         chunk_node = H5SL_next(chunk_node);
     } /* end while */
-  
+
     /*Gather all the information */
     if(MPI_SUCCESS != (mpi_code = MPI_Gather(io_mode_info, total_chunks, MPI_BYTE, recv_io_mode_info, total_chunks, MPI_BYTE, root, comm)))
         HMPI_GOTO_ERROR(FAIL, "MPI_Gather failed", mpi_code)
@@ -1881,7 +1881,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
         int*              ind_this_chunk;
 #endif
 
-        /* pre-computing: calculate number of processes and 
+        /* pre-computing: calculate number of processes and
             regularity of the selection occupied in each chunk */
         nproc_per_chunk = (int*)H5MM_calloc(total_chunks * sizeof(int));
 #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS)
@@ -1956,7 +1956,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
         new_value = 0;
         if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, &new_value) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value")
-#else 
+#else
         for(ic = 0; ic < total_chunks; ic++) {
             if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) {
                 new_value = 0;
@@ -1985,12 +1985,12 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
         } /* end if */
     } /* end if */
 #endif
- 
+
 done:
     if(mem_cleanup) {
         HDfree(io_mode_info);
         HDfree(mergebuf);
-        if(mpi_rank == root) 
+        if(mpi_rank == root)
             HDfree(recv_io_mode_info);
     } /* end if */
 
@@ -2003,7 +2003,7 @@ H5D_cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
    haddr_t addr1, addr2;
 
    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_cmp_chunk_addr)
-   
+
    addr1 = ((const H5D_chunk_addr_info_t *)chunk_addr_info1)->chunk_addr;
    addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr;
 
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index bb7d13c..a8fbc43 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -193,7 +193,7 @@ typedef struct H5D_io_info_t {
         H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */
         H5FD_mpio_collective_opt_t coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */
         H5D_io_ops_t io_ops;    /* I/O operation function pointers */
-    } orig;                     
+    } orig;
 #endif /* H5_HAVE_PARALLEL */
     H5D_storage_t *store;       /* Dataset storage info */
     H5D_layout_ops_t layout_ops;    /* Dataset layout I/O operation function pointers */
@@ -257,7 +257,7 @@ typedef struct H5D_chunk_ud_t {
     uint32_t	nbytes;			/*size of stored data	*/
     unsigned	filter_mask;		/*excluded filters	*/
     haddr_t	addr;			/*file address of chunk */
-} H5D_chunk_ud_t; 
+} H5D_chunk_ud_t;
 
 /* Typedef for "generic" chunk callbacks */
 typedef int (*H5D_chunk_cb_func_t)(const H5D_chunk_rec_t *chunk_rec,
@@ -564,7 +564,7 @@ H5_DLL ssize_t H5D_contig_readvv(const H5D_io_info_t *io_info,
 H5_DLL ssize_t H5D_contig_writevv(const H5D_io_info_t *io_info,
     size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
     size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-H5_DLL herr_t H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, 
+H5_DLL herr_t H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst,
     H5O_layout_t *layout_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info, hid_t dxpl_id);
 
 /* Functions that operate on chunked dataset storage */
@@ -572,7 +572,7 @@ H5_DLL hbool_t H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr);
 H5_DLL herr_t H5D_chunk_cinfo_cache_reset(H5D_chunk_cached_t *last);
 H5_DLL herr_t H5D_chunk_create(H5D_t *dset /*in,out*/, hid_t dxpl_id);
 H5_DLL herr_t H5D_chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset);
-H5_DLL haddr_t H5D_chunk_get_addr(const H5D_t *dset, hid_t dxpl_id, 
+H5_DLL haddr_t H5D_chunk_get_addr(const H5D_t *dset, hid_t dxpl_id,
     const hsize_t *chunk_offset, H5D_chunk_ud_t *udata);
 H5_DLL void *H5D_chunk_lock(const H5D_io_info_t *io_info,
     H5D_chunk_ud_t *udata, hbool_t relax, unsigned *idx_hint/*in,out*/);
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index 0d8b63f..6c589e3 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -117,7 +117,7 @@ H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]);
 H5_DLL herr_t H5Ddebug(hid_t dset_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index 3ea4c69..333ed9c 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -507,7 +507,7 @@ H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
          * if necessary.
          */
 
-	/* 
+	/*
          * Gather data
          */
         n = H5D_gather_file(io_info, file_space, &file_iter, smine_nelmts,
@@ -516,7 +516,7 @@ H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed")
 
         /* If the source and destination are compound types and subset of each other
-         * and no conversion is needed, copy the data directly into user's buffer and 
+         * and no conversion is needed, copy the data directly into user's buffer and
          * bypass the rest of steps.
          */
         if(H5T_SUBSET_FALSE != type_info->cmpd_subset) {
@@ -644,7 +644,7 @@ H5D_scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed")
 
         /* If the source and destination are compound types and the destination is
-         * is a subset of the source and no conversion is needed, copy the data 
+         * is a subset of the source and no conversion is needed, copy the data
          * directly into user's buffer and bypass the rest of steps.  If the source
          * is a subset of the destination, the optimization is done in conversion
          * function H5T_conv_struct_opt to protect the background data.
@@ -705,9 +705,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5D_compound_opt_read
  *
- * Purpose:	A special optimization case when the source and 
- *              destination members are a subset of each other, and 
- *              the order is the same, and no conversion is needed.  
+ * Purpose:	A special optimization case when the source and
+ *              destination members are a subset of each other, and
+ *              the order is the same, and no conversion is needed.
  *              For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
@@ -724,7 +724,7 @@ done:
  *                  };                             TYPE4 D;
  *                                                 TYPE5 E;
  *                                             };
- *              The optimization is simply moving data to the appropriate 
+ *              The optimization is simply moving data to the appropriate
  *              places in the buffer.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -810,7 +810,7 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
 
             /* Copy the data into the right place. */
             for(i = 0; i < curr_nelmts; i++) {
-                HDmemmove(xubuf, xdbuf, type_size); 
+                HDmemmove(xubuf, xdbuf, type_size);
 
                 /* Update pointers */
                 xdbuf += src_stride;
@@ -836,9 +836,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5D_compound_opt_write
  *
- * Purpose:	A special optimization case when the source and 
- *              destination members are a subset of each other, and 
- *              the order is the same, and no conversion is needed.  
+ * Purpose:	A special optimization case when the source and
+ *              destination members are a subset of each other, and
+ *              the order is the same, and no conversion is needed.
  *              For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
@@ -855,7 +855,7 @@ done:
  *                  };                             TYPE4 D;
  *                                                 TYPE5 E;
  *                                             };
- *              The optimization is simply moving data to the appropriate 
+ *              The optimization is simply moving data to the appropriate
  *              places in the buffer.
  *
  *
@@ -887,7 +887,7 @@ H5D_compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
     xsbuf = (uint8_t *)type_info->tconv_buf;
     xdbuf = (uint8_t *)type_info->tconv_buf;
     for(i = 0; i < nelmts; i++) {
-        HDmemmove(xdbuf, xsbuf, dst_stride); 
+        HDmemmove(xdbuf, xsbuf, dst_stride);
 
         /* Update pointers */
         xsbuf += src_stride;
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index b0e93bb..932b857 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -180,7 +180,7 @@ H5_DLL ssize_t H5Eget_num(hid_t error_stack_id);
 
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
index bc4e8a7..be4863e 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -21,197 +21,197 @@
 #define _H5Eterm_H
 
 /* Reset major error IDs */
-    
-H5E_DATASET_g=    
-H5E_FUNC_g=    
-H5E_STORAGE_g=    
-H5E_FILE_g=    
-H5E_SOHM_g=    
-H5E_SYM_g=    
-H5E_VFL_g=    
-H5E_INTERNAL_g=    
-H5E_BTREE_g=    
-H5E_REFERENCE_g=    
-H5E_DATASPACE_g=    
-H5E_RESOURCE_g=    
-H5E_PLIST_g=    
-H5E_LINK_g=    
-H5E_DATATYPE_g=    
-H5E_RS_g=    
-H5E_HEAP_g=    
-H5E_OHDR_g=    
-H5E_ATOM_g=    
-H5E_ATTR_g=    
-H5E_NONE_MAJOR_g=    
-H5E_IO_g=    
-H5E_SLIST_g=    
-H5E_EFL_g=    
-H5E_TST_g=    
-H5E_ARGS_g=    
-H5E_ERROR_g=    
-H5E_PLINE_g=    
-H5E_FSPACE_g=    
+
+H5E_DATASET_g=
+H5E_FUNC_g=
+H5E_STORAGE_g=
+H5E_FILE_g=
+H5E_SOHM_g=
+H5E_SYM_g=
+H5E_VFL_g=
+H5E_INTERNAL_g=
+H5E_BTREE_g=
+H5E_REFERENCE_g=
+H5E_DATASPACE_g=
+H5E_RESOURCE_g=
+H5E_PLIST_g=
+H5E_LINK_g=
+H5E_DATATYPE_g=
+H5E_RS_g=
+H5E_HEAP_g=
+H5E_OHDR_g=
+H5E_ATOM_g=
+H5E_ATTR_g=
+H5E_NONE_MAJOR_g=
+H5E_IO_g=
+H5E_SLIST_g=
+H5E_EFL_g=
+H5E_TST_g=
+H5E_ARGS_g=
+H5E_ERROR_g=
+H5E_PLINE_g=
+H5E_FSPACE_g=
 H5E_CACHE_g= (-1);
 
 /* Reset minor error IDs */
 
 
-/* Generic low-level file I/O errors */    
-H5E_SEEKERROR_g=    
-H5E_READERROR_g=    
-H5E_WRITEERROR_g=    
-H5E_CLOSEERROR_g=    
-H5E_OVERFLOW_g=    
-H5E_FCNTL_g=    
-H5E_SYNCFAIL_g=    
-H5E_TRUNCFAIL_g=    
+/* Generic low-level file I/O errors */
+H5E_SEEKERROR_g=
+H5E_READERROR_g=
+H5E_WRITEERROR_g=
+H5E_CLOSEERROR_g=
+H5E_OVERFLOW_g=
+H5E_FCNTL_g=
+H5E_SYNCFAIL_g=
+H5E_TRUNCFAIL_g=
 H5E_REMOVEFAIL_g=
 
-/* Resource errors */    
-H5E_NOSPACE_g=    
-H5E_CANTALLOC_g=    
-H5E_CANTCOPY_g=    
-H5E_CANTFREE_g=    
-H5E_ALREADYEXISTS_g=    
-H5E_CANTLOCK_g=    
-H5E_CANTUNLOCK_g=    
-H5E_CANTGC_g=    
-H5E_CANTGETSIZE_g=    
+/* Resource errors */
+H5E_NOSPACE_g=
+H5E_CANTALLOC_g=
+H5E_CANTCOPY_g=
+H5E_CANTFREE_g=
+H5E_ALREADYEXISTS_g=
+H5E_CANTLOCK_g=
+H5E_CANTUNLOCK_g=
+H5E_CANTGC_g=
+H5E_CANTGETSIZE_g=
 H5E_OBJOPEN_g=
 
-/* Heap errors */    
-H5E_CANTRESTORE_g=    
-H5E_CANTCOMPUTE_g=    
-H5E_CANTEXTEND_g=    
-H5E_CANTATTACH_g=    
-H5E_CANTUPDATE_g=    
+/* Heap errors */
+H5E_CANTRESTORE_g=
+H5E_CANTCOMPUTE_g=
+H5E_CANTEXTEND_g=
+H5E_CANTATTACH_g=
+H5E_CANTUPDATE_g=
 H5E_CANTOPERATE_g=
 
-/* Function entry/exit interface errors */    
-H5E_CANTINIT_g=    
-H5E_ALREADYINIT_g=    
+/* Function entry/exit interface errors */
+H5E_CANTINIT_g=
+H5E_ALREADYINIT_g=
 H5E_CANTRELEASE_g=
 
-/* Property list errors */    
-H5E_CANTGET_g=    
-H5E_CANTSET_g=    
+/* Property list errors */
+H5E_CANTGET_g=
+H5E_CANTSET_g=
 H5E_DUPCLASS_g=
 
-/* Free space errors */    
-H5E_CANTMERGE_g=    
-H5E_CANTREVIVE_g=    
+/* Free space errors */
+H5E_CANTMERGE_g=
+H5E_CANTREVIVE_g=
 H5E_CANTSHRINK_g=
 
-/* Object header related errors */    
-H5E_LINKCOUNT_g=    
-H5E_VERSION_g=    
-H5E_ALIGNMENT_g=    
-H5E_BADMESG_g=    
-H5E_CANTDELETE_g=    
-H5E_BADITER_g=    
-H5E_CANTPACK_g=    
+/* Object header related errors */
+H5E_LINKCOUNT_g=
+H5E_VERSION_g=
+H5E_ALIGNMENT_g=
+H5E_BADMESG_g=
+H5E_CANTDELETE_g=
+H5E_BADITER_g=
+H5E_CANTPACK_g=
 H5E_CANTRESET_g=
 
-/* System level errors */    
+/* System level errors */
 H5E_SYSERRSTR_g=
 
-/* I/O pipeline errors */    
-H5E_NOFILTER_g=    
-H5E_CALLBACK_g=    
-H5E_CANAPPLY_g=    
-H5E_SETLOCAL_g=    
-H5E_NOENCODER_g=    
+/* I/O pipeline errors */
+H5E_NOFILTER_g=
+H5E_CALLBACK_g=
+H5E_CANAPPLY_g=
+H5E_SETLOCAL_g=
+H5E_NOENCODER_g=
 H5E_CANTFILTER_g=
 
-/* Group related errors */    
-H5E_CANTOPENOBJ_g=    
-H5E_CANTCLOSEOBJ_g=    
-H5E_COMPLEN_g=    
+/* Group related errors */
+H5E_CANTOPENOBJ_g=
+H5E_CANTCLOSEOBJ_g=
+H5E_COMPLEN_g=
 H5E_PATH_g=
 
-/* No error */    
+/* No error */
 H5E_NONE_MINOR_g=
 
-/* File accessability errors */    
-H5E_FILEEXISTS_g=    
-H5E_FILEOPEN_g=    
-H5E_CANTCREATE_g=    
-H5E_CANTOPENFILE_g=    
-H5E_CANTCLOSEFILE_g=    
-H5E_NOTHDF5_g=    
-H5E_BADFILE_g=    
-H5E_TRUNCATED_g=    
+/* File accessability errors */
+H5E_FILEEXISTS_g=
+H5E_FILEOPEN_g=
+H5E_CANTCREATE_g=
+H5E_CANTOPENFILE_g=
+H5E_CANTCLOSEFILE_g=
+H5E_NOTHDF5_g=
+H5E_BADFILE_g=
+H5E_TRUNCATED_g=
 H5E_MOUNT_g=
 
-/* Object atom related errors */    
-H5E_BADATOM_g=    
-H5E_BADGROUP_g=    
-H5E_CANTREGISTER_g=    
-H5E_CANTINC_g=    
-H5E_CANTDEC_g=    
+/* Object atom related errors */
+H5E_BADATOM_g=
+H5E_BADGROUP_g=
+H5E_CANTREGISTER_g=
+H5E_CANTINC_g=
+H5E_CANTDEC_g=
 H5E_NOIDS_g=
 
-/* Cache related errors */    
-H5E_CANTFLUSH_g=    
-H5E_CANTSERIALIZE_g=    
-H5E_CANTLOAD_g=    
-H5E_PROTECT_g=    
-H5E_NOTCACHED_g=    
-H5E_SYSTEM_g=    
-H5E_CANTINS_g=    
-H5E_CANTRENAME_g=    
-H5E_CANTPROTECT_g=    
-H5E_CANTUNPROTECT_g=    
-H5E_CANTPIN_g=    
-H5E_CANTUNPIN_g=    
-H5E_CANTMARKDIRTY_g=    
-H5E_CANTDIRTY_g=    
-H5E_CANTEXPUNGE_g=    
-H5E_CANTRESIZE_g=    
+/* Cache related errors */
+H5E_CANTFLUSH_g=
+H5E_CANTSERIALIZE_g=
+H5E_CANTLOAD_g=
+H5E_PROTECT_g=
+H5E_NOTCACHED_g=
+H5E_SYSTEM_g=
+H5E_CANTINS_g=
+H5E_CANTRENAME_g=
+H5E_CANTPROTECT_g=
+H5E_CANTUNPROTECT_g=
+H5E_CANTPIN_g=
+H5E_CANTUNPIN_g=
+H5E_CANTMARKDIRTY_g=
+H5E_CANTDIRTY_g=
+H5E_CANTEXPUNGE_g=
+H5E_CANTRESIZE_g=
 H5E_CANTJOURNAL_g=
 
-/* Link related errors */    
-H5E_TRAVERSE_g=    
-H5E_NLINKS_g=    
-H5E_NOTREGISTERED_g=    
-H5E_CANTMOVE_g=    
+/* Link related errors */
+H5E_TRAVERSE_g=
+H5E_NLINKS_g=
+H5E_NOTREGISTERED_g=
+H5E_CANTMOVE_g=
 H5E_CANTSORT_g=
 
-/* Parallel MPI errors */    
-H5E_MPI_g=    
-H5E_MPIERRSTR_g=    
+/* Parallel MPI errors */
+H5E_MPI_g=
+H5E_MPIERRSTR_g=
 H5E_CANTRECV_g=
 
-/* Dataspace errors */    
-H5E_CANTCLIP_g=    
-H5E_CANTCOUNT_g=    
-H5E_CANTSELECT_g=    
-H5E_CANTNEXT_g=    
-H5E_BADSELECT_g=    
+/* Dataspace errors */
+H5E_CANTCLIP_g=
+H5E_CANTCOUNT_g=
+H5E_CANTSELECT_g=
+H5E_CANTNEXT_g=
+H5E_BADSELECT_g=
 H5E_CANTCOMPARE_g=
 
-/* Argument errors */    
-H5E_UNINITIALIZED_g=    
-H5E_UNSUPPORTED_g=    
-H5E_BADTYPE_g=    
-H5E_BADRANGE_g=    
+/* Argument errors */
+H5E_UNINITIALIZED_g=
+H5E_UNSUPPORTED_g=
+H5E_BADTYPE_g=
+H5E_BADRANGE_g=
 H5E_BADVALUE_g=
 
-/* B-tree related errors */    
-H5E_NOTFOUND_g=    
-H5E_EXISTS_g=    
-H5E_CANTENCODE_g=    
-H5E_CANTDECODE_g=    
-H5E_CANTSPLIT_g=    
-H5E_CANTREDISTRIBUTE_g=    
-H5E_CANTSWAP_g=    
-H5E_CANTINSERT_g=    
-H5E_CANTLIST_g=    
-H5E_CANTMODIFY_g=    
+/* B-tree related errors */
+H5E_NOTFOUND_g=
+H5E_EXISTS_g=
+H5E_CANTENCODE_g=
+H5E_CANTDECODE_g=
+H5E_CANTSPLIT_g=
+H5E_CANTREDISTRIBUTE_g=
+H5E_CANTSWAP_g=
+H5E_CANTINSERT_g=
+H5E_CANTLIST_g=
+H5E_CANTMODIFY_g=
 H5E_CANTREMOVE_g=
 
-/* Datatype conversion errors */    
-H5E_CANTCONVERT_g=    
+/* Datatype conversion errors */
+H5E_CANTCONVERT_g=
 H5E_BADSIZE_g= (-1);
 
 #endif /* H5Eterm_H */
diff --git a/src/H5F.c b/src/H5F.c
index d728fca..470506e 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -43,7 +43,7 @@
 #include "H5FDmulti.h"		/*multiple files partitioned by mem usage */
 #include "H5FDsec2.h"		/*Posix unbuffered I/O			*/
 #include "H5FDstdio.h"		/* Standard C buffered I/O		*/
-#ifdef H5_HAVE_WINDOWS 
+#ifdef H5_HAVE_WINDOWS
 #include "H5FDwindows.h"        /* Windows buffered I/O     */
 #endif
 #include "H5FDdirect.h"         /*Linux direct I/O			*/
@@ -941,7 +941,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
 	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache")
 
 	/* Create a metadata cache with modified API along side the regular
-	 * version.  For now, this is just for testing.  Once we get it 
+	 * version.  For now, this is just for testing.  Once we get it
 	 * fully in use, we will delete the old version.
 	 */
 	if(H5AC2_create(f, (H5AC2_cache_config_t *)&(f->shared->mdc_initCacheCfg)) < 0)
@@ -1185,7 +1185,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
  *		multiple Boolean flags.
  *
  *		Vailin Choi, 2008-04-02
- *		To formulate path for later searching of target file for 
+ *		To formulate path for later searching of target file for
  *		external link via H5_build_extpath().
  *
  *-------------------------------------------------------------------------
@@ -1393,7 +1393,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
 
 	config_ptr = &(file->shared->initJnlCfg);
 
-        if(H5AC2_check_for_journaling(file, dxpl_id, file->shared->cache2, 
+        if(H5AC2_check_for_journaling(file, dxpl_id, file->shared->cache2,
                 config_ptr->journal_recovered) < 0 )
             HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "H5AC2_check_for_journaling() reports failure.")
 
@@ -1578,7 +1578,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
 
     /* can't journal at this point as the file is not open */
     /* In theory, opening the file shouldn't generate any dirty metadata,
-     * but we do have one case where we fix some object automatically 
+     * but we do have one case where we fix some object automatically
      * when we first touch it.  Can this happen here?  If so, we will
      * have to do somethings to start a transaction before this happens.
      */
@@ -2154,7 +2154,7 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags)
     /* If no intent flags were passed in, exit quietly */
     if(!intent_flags)
 	HGOTO_DONE(SUCCEED)
-    
+
     *intent_flags = H5F_get_intent(file);
 
     /* HDF5 uses some flags internally that users don't know about.
@@ -2207,7 +2207,7 @@ H5F_get_intent(const H5F_t *f)
  *		when searching the target file.
  *
  * Return:	'extpath' on success/abort on failure (shouldn't fail)
- * 
+ *
  * Programmer:	Vailin Choi, April 2, 2008
  *
  * Modifications:
@@ -3385,7 +3385,7 @@ done:
  *
  * Changes:	John Mainzer
  * 		8/4/08
- * 		Reworked function to use the new H5AC2_jnl_config_t 
+ * 		Reworked function to use the new H5AC2_jnl_config_t
  * 		structure and H5AC2_get_jnl_config().
  *
  *-------------------------------------------------------------------------
@@ -3414,7 +3414,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Fget_jnl_config
  *
- * Purpose:     Retrieves the current journaling configuration, and 
+ * Purpose:     Retrieves the current journaling configuration, and
  * 		return it in *config_ptr.
  *
  *		Note that the version field of *config_Ptr must be correctly
@@ -3456,8 +3456,8 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Fset_jnl_config
  *
- * Purpose:     Sets the current journaling configuration, using the 
- * 		contents of the instance of H5AC2_jnl_config_t pointed 
+ * Purpose:     Sets the current journaling configuration, using the
+ * 		contents of the instance of H5AC2_jnl_config_t pointed
  * 		to by config_ptr.
  *
  * Return:      Success:        SUCCEED
diff --git a/src/H5FD.c b/src/H5FD.c
index 3ae6d8e..e6f83d4 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -208,9 +208,9 @@ H5FD_term_interface(void)
             /* Reset the VFL drivers, if they've been closed */
             if(H5I_nmembers(H5I_VFL)==0) {
                 H5FD_sec2_term();
-#ifdef H5_HAVE_DIRECT 
+#ifdef H5_HAVE_DIRECT
                 H5FD_direct_term();
-#endif           
+#endif
                 H5FD_log_term();
                 H5FD_stdio_term();
 #ifdef H5_HAVE_WINDOWS
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 4c468b6..cc27173 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -370,9 +370,9 @@ done:
  * Modifications:
  *		Robb Matzke, 1999-10-19
  *		The backing store file is created and opened if specified.
- *              
+ *
  *              Raymond Lu, 2006-11-30
- *              Enabled the driver to read an existing file depending on 
+ *              Enabled the driver to read an existing file depending on
  *              the setting of the backing_store and file open flags.
  *-------------------------------------------------------------------------
  */
@@ -860,7 +860,7 @@ done:
  * Modifications:
  *              Raymond Lu, 2006-11-30
  *              Added a condition check for backing store flag, for an
- *              existing file can be opened for read and write now. 
+ *              existing file can be opened for read and write now.
  *-------------------------------------------------------------------------
  */
 /* ARGSUSED */
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index b078511..0cd4c9f 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -18,7 +18,7 @@
  *              Wednesday, 20 September 2006
  *
  * Purpose:	The Direct I/O file driver forces the data to be written to
- *		the file directly without being copied into system kernel 
+ *		the file directly without being copied into system kernel
  *		buffer.  The main system support this feature is Linux.
  */
 
@@ -322,7 +322,7 @@ H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbu
 
     if(boundary != 0)
     	fa.mboundary = boundary;
-    else 
+    else
 	fa.mboundary = MBOUNDARY_DEF;
     if(block_size != 0)
     	fa.fbsize = block_size;
@@ -365,7 +365,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*out*/, 
+H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*out*/,
 		size_t *cbuf_size/*out*/)
 {
     H5FD_direct_fapl_t	*fa;
@@ -573,7 +573,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
         if(write(file->fd, (void*)buf1, sizeof(int))<0) {
             if(write(file->fd, (void*)buf2, file->fa.fbsize)<0)
                 HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, NULL, "file system may not support Direct I/O")
-            else 
+            else
                 file->fa.must_align = TRUE;
         } else {
             file->fa.must_align = FALSE;
@@ -583,7 +583,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
         if(read(file->fd, (void*)buf1, sizeof(int))<0) {
             if(read(file->fd, (void*)buf2, file->fa.fbsize)<0)
                 HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "file system may not support Direct I/O")
-            else 
+            else
                 file->fa.must_align = TRUE;
         } else
             file->fa.must_align = FALSE;
@@ -929,20 +929,20 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
     if (addr+size>file->eoa)
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow")
 
-    /* If the system doesn't require data to be aligned, read the data in 
+    /* If the system doesn't require data to be aligned, read the data in
      * the same way as sec2 driver.
      */
     _must_align = file->fa.must_align;
 
-    /* Get the memory boundary for alignment, file system block size, and maximal 
+    /* Get the memory boundary for alignment, file system block size, and maximal
      * copy buffer size.
      */
     _boundary = file->fa.mboundary;
     _fbsize = file->fa.fbsize;
     _cbsize = file->fa.cbsize;
 
-    /* if the data is aligned or the system doesn't require data to be aligned, 
-     * read it directly from the file.  If not, read a bigger 
+    /* if the data is aligned or the system doesn't require data to be aligned,
+     * read it directly from the file.  If not, read a bigger
      * and aligned data first, then copy the data into memory buffer.
      */
     if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) {
@@ -950,7 +950,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 	    if ((addr!=file->pos || OP_READ!=file->op) &&
 		    file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0)
 		HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
- 	    /* Read the aligned data in file first, being careful of interrupted 
+ 	    /* Read the aligned data in file first, being careful of interrupted
 	     * system calls and partial results. */
 	    while (size>0) {
 		do {
@@ -972,8 +972,8 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 		buf = (char*)buf + nbytes;
 	    }
     } else {
-	    /* allocate memory needed for the Direct IO option up to the maximal 
-	     * copy buffer size. Make a bigger buffer for aligned I/O if size is 
+	    /* allocate memory needed for the Direct IO option up to the maximal
+	     * copy buffer size. Make a bigger buffer for aligned I/O if size is
 	     * smaller than maximal copy buffer. */
 	    if(size < _cbsize)
 	    	alloc_size = ((size / _fbsize) * _fbsize) + _fbsize;
@@ -987,15 +987,15 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 		HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 
 	    /*
-	     * Read the aligned data in file into aligned buffer first, then copy the data 
+	     * Read the aligned data in file into aligned buffer first, then copy the data
 	     * into the final buffer.  If the data size is bigger than maximal copy buffer
 	     * size, do the reading by segment (the outer while loop).  If not, do one step
-	     * reading.  
+	     * reading.
 	     */
 	    p3 = buf;
 	    do {
- 	    	/* Read the aligned data in file first.  Not able to handle interrupted 
-		 * system calls and partial results like sec2 driver does because the 
+ 	    	/* Read the aligned data in file first.  Not able to handle interrupted
+		 * system calls and partial results like sec2 driver does because the
 		 * data may no longer be aligned. It's expecially true when the data in
 		 * file is smaller than ALLOC_SIZE. */
 	    	HDmemset(copy_buf, 0, alloc_size);
@@ -1008,7 +1008,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 		    HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
 
 	    	/* look for the right position and copy the data to the original buffer.
-		 * Consider all possible situations here: file address is not aligned on 
+		 * Consider all possible situations here: file address is not aligned on
 		 * file block size; the end of data address is not aligned; the end of data
 		 * address is aligned; data size is smaller or bigger than maximal copy size.*/
 	    	p2 = (unsigned char*)copy_buf + (size_t)(copy_addr % _fbsize);
@@ -1018,7 +1018,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 	    	    HDmemcpy(p3, p2, copy_size);
 	    	else if(size >= _cbsize && copy_size > (alloc_size-(size_t)(copy_addr%_fbsize))) {
 	    	    HDmemcpy(p3, p2, (alloc_size - (size_t)(copy_addr % _fbsize)));
-	    	    p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize)); 
+	    	    p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize));
 	    	}
 
 		/* update the size and address of data being read. */
@@ -1099,20 +1099,20 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
     if (addr+size>file->eoa)
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow")
 
-    /* If the system doesn't require data to be aligned, read the data in 
+    /* If the system doesn't require data to be aligned, read the data in
      * the same way as sec2 driver.
      */
     _must_align = file->fa.must_align;
 
-    /* Get the memory boundary for alignment, file system block size, and maximal 
+    /* Get the memory boundary for alignment, file system block size, and maximal
      * copy buffer size.
      */
     _boundary = file->fa.mboundary;
     _fbsize = file->fa.fbsize;
     _cbsize = file->fa.cbsize;
 
-    /* if the data is aligned or the system doesn't require data to be aligned, 
-     * write it directly to the file.  If not, read a bigger and aligned data 
+    /* if the data is aligned or the system doesn't require data to be aligned,
+     * write it directly to the file.  If not, read a bigger and aligned data
      * first, update buffer with user data, then write the data out.
      */
     if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) {
@@ -1140,7 +1140,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 	     * copy buffer size. Make a bigger buffer for aligned I/O if size is
 	     * smaller than maximal copy buffer.
 	     */
-	    if(size < _cbsize) 
+	    if(size < _cbsize)
 	    	alloc_size = ((size / _fbsize) * _fbsize) + _fbsize;
 	    else
 		alloc_size = _cbsize;
@@ -1156,8 +1156,8 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 	    do {
 	    	/*
 	     	 * Read the aligned data first if the aligned region doesn't fall
-	    	 * entirely in the range to be writen.  Not able to handle interrupted 
-		 * system calls and partial results like sec2 driver does because the 
+	    	 * entirely in the range to be writen.  Not able to handle interrupted
+		 * system calls and partial results like sec2 driver does because the
 		 * data may no longer be aligned. It's expecially true when the data in
 		 * file is smaller than ALLOC_SIZE.
 	    	 */
@@ -1172,7 +1172,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 		    	HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
 		}
 
-	    	/* look for the right position and append or copy the data to be written to 
+	    	/* look for the right position and append or copy the data to be written to
 	     	 * the aligned buffer.
             	 * Consider all possible situations here: file address is not aligned on
             	 * file block size; the end of data address is not aligned; the end of data
@@ -1187,13 +1187,13 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 		    HDmemcpy(p1, p3, (alloc_size - (size_t)(copy_addr % _fbsize)));
 		    p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize));
 	    	}
- 
+
 	    	/*look for the aligned position for writing the data*/
 	    	if(file_seek(file->fd, (file_offset_t)(copy_addr - copy_addr % _fbsize), SEEK_SET) < 0)
 		    HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 
 	    	/*
-	     	 * Write the data. It doesn't truncate the extra data introduced by 
+	     	 * Write the data. It doesn't truncate the extra data introduced by
 		 * alignment because that step is done in H5FD_direct_flush.
 	    	 */
 		do {
@@ -1215,7 +1215,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 	/*Update the address and size*/
 	addr += (haddr_t)size;
 	buf = (const char*)buf + size;
-	
+
 	if(copy_buf)
 	    HDfree(copy_buf);
     }
@@ -1290,15 +1290,15 @@ H5FD_direct_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
         file->op = OP_UNKNOWN;
-    } 
-    else if (file->fa.must_align){ 
+    }
+    else if (file->fa.must_align){
 	/*Even though eof is equal to eoa, file is still truncated because Direct I/O
 	 *write introduces some extra data for alignment.
 	 */
         if (-1==file_truncate(file->fd, (file_offset_t)file->eof))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
     }
-    
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
diff --git a/src/H5FDdirect.h b/src/H5FDdirect.h
index 79886e7..26c70f3 100644
--- a/src/H5FDdirect.h
+++ b/src/H5FDdirect.h
@@ -43,9 +43,9 @@ extern "C" {
 
 H5_DLL hid_t H5FD_direct_init(void);
 H5_DLL void H5FD_direct_term(void);
-H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size, 
+H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size,
 			size_t cbuf_size);
-H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, 
+H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/,
 			size_t *block_size/*out*/, size_t *cbuf_size/*out*/);
 
 #ifdef __cplusplus
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 0384018..885e844 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -22,8 +22,8 @@
 #ifndef H5FDmpi_H
 #define H5FDmpi_H
 
-/***** Macros for One linked collective IO case. *****/ 
-/* The default value to do one linked collective IO for all chunks. 
+/***** Macros for One linked collective IO case. *****/
+/* The default value to do one linked collective IO for all chunks.
    If the average number of chunks per process is greater than this value,
       the library will create an MPI derived datatype to link all chunks to do collective IO.
       The user can set this value through an API. */
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 89a8637..5853d05 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -544,14 +544,14 @@ Description:
         The library won't behave as it asks for only when we find
         that the low-level MPI-IO package doesn't support this.
 
-Parameters: 
+Parameters:
         hid_t dxpl_id	      		in: Data transfer property list identifier
 	H5FD_mpio_chunk_opt_t   	in: The optimization flag for linked chunk IO
                                             or multi-chunk IO.
-                                                
 
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 *
  *-------------------------------------------------------------------------
  */
@@ -596,14 +596,14 @@ Description:
         The library won't behave as it asks for only when we find
         that the low-level MPI-IO package doesn't support this.
 
-Parameters: 
+Parameters:
         hid_t dxpl_id	      		in: Data transfer property list identifier
 	H5FD_mpio_chunk_opt_t   	in: The optimization flag for linked chunk IO
                                             or multi-chunk IO.
-                                                
 
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 *
  *-------------------------------------------------------------------------
  */
@@ -643,15 +643,15 @@ Purpose:
 	To set a threshold for doing linked chunk IO
 
 Description:
-        If the number is greater than the threshold set by the user, 
+        If the number is greater than the threshold set by the user,
         the library will do linked chunk IO; otherwise, IO will be done for every chunk.
 
-Parameters: 
+Parameters:
         hid_t dxpl_id	      		in: Data transfer property list identifier
-	unsigned num_proc_per_chunk	in: the threshold of the average number of chunks selected by each process 
+	unsigned num_proc_per_chunk	in: the threshold of the average number of chunks selected by each process
 
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 *
  *-------------------------------------------------------------------------
  */
@@ -690,13 +690,13 @@ Purpose:
 	To set a threshold for doing collective IO for each chunk
 Description:
 	The library will calculate the percentage of the number of process holding selections at each chunk. If that percentage of number of process in the individual chunk is greater than the threshold set by the user, the library will do collective chunk IO for this chunk; otherwise, independent IO will be done for this chunk.
-Parameters: 
-	hid_t dxpl_id	         				
+Parameters:
+	hid_t dxpl_id
 		in: Data transfer property list identifier
-	unsigned percent_num_proc_per_chunk	
+	unsigned percent_num_proc_per_chunk
 		in: the threshold of the percentage of the number of process holding selections per chunk
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 
 
 *
@@ -941,7 +941,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
 #ifndef H5_HAVE_MPI_GET_SIZE
     struct stat                 stat_buf;
 #endif
- 
+
     FUNC_ENTER_NOAPI(H5FD_mpio_open, NULL)
 
 #ifdef H5FDmpio_DEBUG
@@ -1016,7 +1016,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     /* Only processor p0 will get the filesize and broadcast it. */
     if (mpi_rank == 0) {
         /* Get current file size.  If MPI_File_get_size is disabled in configuration
-         * because it doesn't return correct value (SGI Altix Propack 4), 
+         * because it doesn't return correct value (SGI Altix Propack 4),
          * use stat to get the file size. */
 #ifdef H5_HAVE_MPI_GET_SIZE
         if (MPI_SUCCESS != (mpi_code=MPI_File_get_size(fh, &size)))
@@ -1514,7 +1514,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
             if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
         } /* end else */
- 
+
         /*
          * Reset the file view when we used MPI derived types
          */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 8c25a62..098e876 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1467,7 +1467,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
      * However, the library sometimes queries it through H5F_get_eoa.
      * Here the code finds the biggest EOA for individual file if
      * the query is from H5F_get_eoa (TYPE is H5FD_MEM_DEFAULT).
-     */ 
+     */
     if(H5FD_MEM_DEFAULT == type) {
         UNIQUE_MEMBERS(file->fa.memb_map, mt) {
 	    if (file->memb[mt]) {
@@ -1494,7 +1494,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
         } END_MEMBERS;
     } else {
         H5FD_mem_t mmt = file->fa.memb_map[type];
-        if (H5FD_MEM_DEFAULT==mmt) mmt = type;        
+        if (H5FD_MEM_DEFAULT==mmt) mmt = type;
 
 	if (file->memb[mmt]) {
             H5E_BEGIN_TRY {
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 839c8a3..89068c0 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -89,7 +89,7 @@ typedef enum H5FD_mem_t {
 #define H5FD_MEM_SOHM_TABLE     H5FD_MEM_OHDR
 #define H5FD_MEM_SOHM_INDEX     H5FD_MEM_BTREE
 
-/* Per discussion with Quincey, I'm mapping the metadata journaling 
+/* Per discussion with Quincey, I'm mapping the metadata journaling
  * configuration block to super.
  *
  * 						JRM -- 3/20/08
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 7bd72cc..5795729 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -1659,7 +1659,7 @@ done:
  *              5 January 2007
  *              Due to the complexity EOA for Multi driver, this function
  *              is made failed for now.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 hssize_t
@@ -1684,7 +1684,7 @@ H5FD_get_freespace(const H5FD_t *file)
      * It doesn't have eoa for the whole file. */
     if(file->driver_id == H5FD_MULTI)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "Multi driver doesn't support this function")
-    
+
     /* Retrieve the 'eoa' for the file */
     eoa = file->cls->get_eoa(file, H5FD_MEM_DEFAULT);
 
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index c66b1ab..628159a 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -539,8 +539,8 @@ H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */)
 /*-------------------------------------------------------------------------
  * Function:	H5FD_stdio_alloc
  *
- * Purpose:	Allocates file memory. If fseeko isn't available, makes 
- *              sure the file size isn't bigger than 2GB because the 
+ * Purpose:	Allocates file memory. If fseeko isn't available, makes
+ *              sure the file size isn't bigger than 2GB because the
  *              parameter OFFSET of fseek is of the type LONG INT, limiting
  *              the file size to 2GB.
  *
@@ -584,7 +584,7 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
     /* If fseeko isn't available, big files (>2GB) won't be supported. */
     if((addr + size) > BIG_FILE)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "can't write file bigger than 2GB because fseeko isn't available", HADDR_UNDEF)
-#endif 
+#endif
 
     file->eoa = addr + size;
 
diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c
index 08a8e69..d09de37 100644
--- a/src/H5FDwindows.c
+++ b/src/H5FDwindows.c
@@ -20,11 +20,11 @@
  *
  * Purpose:	We would like to create a driver specifically for Windows
  *			to utilize the Win32 API, and reduce the maintenence demands
- *			for the other file drivers.  Our other motivation is that 
+ *			for the other file drivers.  Our other motivation is that
  *			the Windows system calls of the existing sec2 driver differ
  *			from those on other platforms, and are not 64-bit compatible.
- *			From the start, this will have the structure very similar 
- *			to our sec2 driver, but make system calls more similar to 
+ *			From the start, this will have the structure very similar
+ *			to our sec2 driver, but make system calls more similar to
  *			our stdio driver.
  */
 
@@ -66,7 +66,7 @@ static hid_t H5FD_WINDOWS_g = 0;
  */
 typedef struct H5FD_windows_t {
     H5FD_t	pub;			/*public stuff, must be first	*/
-	/* 
+	/*
 	 * .NET doesn't support our 64-bit safe stdio functions,
 	 * so we will use io.h functions instead.
      */
@@ -96,7 +96,7 @@ typedef struct H5FD_windows_t {
 
 
 /* These are used by the macros below */
-#define file_offset_t		__int64 
+#define file_offset_t		__int64
 #define fseek_offset_t		__int64
 
 /*
@@ -128,7 +128,7 @@ static H5FD_t *H5FD_windows_open(const char *name, unsigned flags, hid_t fapl_id
 static herr_t H5FD_windows_close(H5FD_t *_file);
 static int H5FD_windows_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
 static herr_t H5FD_windows_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_windows_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, 
+static haddr_t H5FD_windows_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id,
 			      hsize_t size);
 static haddr_t H5FD_windows_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
 static herr_t H5FD_windows_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
@@ -346,7 +346,7 @@ H5FD_windows_open(const char *name, unsigned flags, hid_t UNUSED fapl_id,
     if (H5F_ACC_CREAT & flags) o_flags |= O_CREAT;
     if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL;
 	/* Windows needs O_BINARY to correctly handle eol characters */
-	o_flags |= O_BINARY; 
+	o_flags |= O_BINARY;
 
     /* Open the file */
     if ((fd=_open(name, o_flags, 0666))<0)
@@ -388,7 +388,7 @@ H5FD_windows_open(const char *name, unsigned flags, hid_t UNUSED fapl_id,
     H5_ASSIGN_OVERFLOW(file->eof,sb.st_size,h5_stat_size_t,haddr_t);
     file->pos = HADDR_UNDEF;
     file->op = OP_UNKNOWN;
-    
+
 #ifndef WINDOWS_USE_STDIO
     file->fd = fd;
 #else
@@ -815,7 +815,7 @@ H5FD_windows_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 				/* end of file but not end of format address space */
 				HDmemset(buf, 0, size);
 				break;
-			}	
+			}
 		}
 #endif /* WINDOWS_USE_STDIO */
         assert(nbytes>=0);
@@ -982,7 +982,7 @@ H5FD_windows_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
 		/* Extend the file to make sure it's large enough */
 		if( (filehandle = (HANDLE)_get_osfhandle(file->fd)) == INVALID_HANDLE_VALUE)
 			HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to get file handle for file")
-		
+
 		li.QuadPart = (__int64)file->eoa;
 		(void)SetFilePointer((HANDLE)filehandle,li.LowPart,&li.HighPart,FILE_BEGIN);
 		if(SetEndOfFile(filehandle) == 0)
@@ -1010,7 +1010,7 @@ H5FD_windows_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
 		/* Reset last file I/O information */
 		file->pos = HADDR_UNDEF;
 		file->op = OP_UNKNOWN;
-	
+
 	}
 
 done:
diff --git a/src/H5FS.c b/src/H5FS.c
index 212fcbe..172adae 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -484,7 +484,7 @@ done:
  *
  * Purpose:     Collect meta storage info used by the free space manager
  *
- * Return:      Success:        non-negative 
+ * Return:      Success:        non-negative
  *              Failure:        negative
  *
  * Programmer:  Vailin Choi
@@ -506,8 +506,8 @@ H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size)
 
     /* Get the free space size info */
     *meta_size += H5FS_HEADER_SIZE(f) + fspace->alloc_sect_size;
- 
-    FUNC_LEAVE_NOAPI(SUCCEED) 
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FS_size() */
 
 
diff --git a/src/H5FScache.c b/src/H5FScache.c
index 2d88011..4c85824 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -77,15 +77,15 @@ static herr_t H5FS_sinfo_serialize_node_cb(void *_item, void UNUSED *key, void *
 /* Metadata cache callbacks */
 static void *H5FS_cache_hdr_deserialize(haddr_t addr, size_t len,
     const void *image, void *udata, hbool_t *dirty);
-static herr_t H5FS_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id, 
-    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, 
+static herr_t H5FS_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id,
+    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags,
     haddr_t *new_addr, size_t *new_len, void **new_image);
 static herr_t H5FS_cache_hdr_free_icr(haddr_t addr, size_t len, void *thing);
 
 static void *H5FS_cache_sinfo_deserialize(haddr_t addr, size_t len,
     const void *image, void *udata, hbool_t *dirty);
 static herr_t H5FS_cache_sinfo_serialize(const H5F_t *f, hid_t dxpl_id,
-    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, 
+    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags,
     haddr_t *new_addr, size_t *new_len, void **new_image);
 static herr_t H5FS_cache_sinfo_free_icr(haddr_t addr, size_t len, void *thing);
 
@@ -145,7 +145,7 @@ const H5AC2_class_t H5AC2_FSPACE_SINFO[1] = {{
  *-------------------------------------------------------------------------
  */
 static void *
-H5FS_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len, 
+H5FS_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     const void *image, void *_udata, hbool_t UNUSED *dirty)
 {
     H5FS_t		*fspace = NULL; /* Free space header info */
@@ -267,9 +267,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, 
-    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, 
-    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, 
+H5FS_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id,
+    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing,
+    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len,
     void UNUSED **new_image)
 {
     H5FS_t *fspace = (H5FS_t *)_thing;    /* Pointer to free space header */
@@ -396,7 +396,7 @@ H5FS_cache_hdr_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing)
  *-------------------------------------------------------------------------
  */
 static void *
-H5FS_cache_sinfo_deserialize(haddr_t UNUSED addr, size_t UNUSED len, 
+H5FS_cache_sinfo_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     const void *image, void *_udata, hbool_t UNUSED *dirty)
 {
     H5FS_sinfo_t	*sinfo = NULL;  /* Free space section info */
@@ -417,7 +417,7 @@ H5FS_cache_sinfo_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     /* Allocate a new free space section info */
     if(NULL == (sinfo = H5FS_sinfo_new(udata->f, udata->fspace)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    
+
     /* Link free space manager to section info */
     /* (for deserializing sections) */
     HDassert(udata->fspace->sinfo == NULL);
@@ -660,8 +660,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_sinfo_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5FS_cache_sinfo_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5FS_sinfo_t * sinfo = (H5FS_sinfo_t *)_thing;
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 6e1618f..aa6d71e 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -1790,7 +1790,7 @@ HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC
     /* Update current space used for free space sections */
     if(H5FS_sect_serialize_size(f, dxpl_id, fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
-    
+
     /* Mark free space sections as dirty */
     if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index b67021f..9dfdfb4 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -160,7 +160,7 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
      * user from doing this.
      */
     if(mp_loc.oloc->holding_file != FALSE)
-        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files")    
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files")
 
     /* Open the mount point group */
     if(NULL == (mount_point = H5G_open(&mp_loc, dxpl_id)))
@@ -523,7 +523,7 @@ H5Funmount(hid_t loc_id, const char *name)
 
     /* Not sure that this will generate any dirty metadata.
      *
-     * Also, must decide how we are going to deal with journaling 
+     * Also, must decide how we are going to deal with journaling
      * in such cases.
      */
     FUNC_ENTER_API_META(H5Funmount, loc_id, H5AC_dxpl_id, FAIL)
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 354de3a..5d08eba 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -418,7 +418,7 @@ struct H5B_class_t;
 struct H5RC_t;
 
 /* Private functions */
-H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, 
+H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope,
 		        unsigned flags);
 H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id,
     hid_t fapl_id, hid_t dxpl_id);
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index aa87842..37a34a3 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -220,15 +220,15 @@ done:
  *
  * Purpose:     Create a superblock extension for the superblock.
  *
- * 		This method will be called either on superblock 
+ * 		This method will be called either on superblock
  * 		initialization, or if journaling is enabled, and there
- * 		is no superblock extension to put the journaling 
+ * 		is no superblock extension to put the journaling
  * 		configuration data into.
  *
  * 		The code in this function was hacked from existing
  * 		code in H5F_super_init().
  *
- * 		The method should fail if a superblock extension 
+ * 		The method should fail if a superblock extension
  * 		exists on entry.
  *
  * Return:      Success:        SUCCEED
@@ -323,7 +323,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc)
     lf = shared->lf;
 
     /* initialize the metadata journaling configuration sections of the
-     * super block to indicate that journaling is not turned on at 
+     * super block to indicate that journaling is not turned on at
      * present.  These initialization may be overridden shortly.
      */
     shared->mdc_jnl_enabled        = FALSE;
@@ -700,7 +700,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc)
             H5O_msg_reset(H5O_DRVINFO_ID, &drvinfo);
         } /* end else */
 
-	/* Read in the metadata journaling configuration message, 
+	/* Read in the metadata journaling configuration message,
 	 * if it exists.
 	 */
         if(NULL == H5O_msg_read(&ext_loc, H5O_MDJ_MSG_ID, &mdj_msg, dxpl_id)) {
@@ -843,19 +843,19 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
 	f->shared->extension_ok = TRUE;
         need_ext = TRUE;
     } /* end if */
-    /* If we're going to use a version of the superblock format which allows 
+    /* If we're going to use a version of the superblock format which allows
      *  for the superblock extension, check for non-default values to store
      *  in it.
      */
     else if(super_vers >= HDF5_SUPERBLOCK_VERSION_2) {
-	/* make note of the fact that we can construct a superblock 
+	/* make note of the fact that we can construct a superblock
 	 * extension later if we wish.
 	 */
 	f->shared->extension_ok = TRUE;
 
         /* Check for non-default v1 B-tree 'K' values to store */
         if(f->shared->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
-                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || 
+                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF ||
                 f->shared->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF)
             need_ext = TRUE;
         /* Check for driver info to store */
@@ -893,7 +893,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
 
         /* Check for non-default v1 B-tree 'K' values to store */
         if(f->shared->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
-                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || 
+                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF ||
                 f->shared->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF) {
             H5O_btreek_t btreek;        /* v1 B-tree 'K' value message for superblock extension */
 
@@ -929,19 +929,19 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
          * super block extension if it is.
          *
          * However, the cache has not been initialized at this point,
-         * so we don't know if we will be successful in creating the 
+         * so we don't know if we will be successful in creating the
          * journal file (the journal file may already exist, or some
-         * directory on the journal path may not exist.  
+         * directory on the journal path may not exist.
          *
          * Further, the cache should refuse to allow the file to open if
          * it detects journaling in progress -- so marking journaling in
          * progress here would introduce some complexities.
-         * status now 
+         * status now
          *
          * Thus, don't write the metadata journaling message now.  Instead,
-         * initialize the metadata journaling related fields to indicate 
+         * initialize the metadata journaling related fields to indicate
          * that journaling is not in progress.  If journaling is requested,
-         * we will write the metadata journaling message after we have 
+         * we will write the metadata journaling message after we have
          * successfully opened the journal file and started journaling.
          *
          *                                        JRM -- 2/19/09
@@ -1119,10 +1119,10 @@ done:
  * Function:    H5F_super_write_mdj_msg
  *
  *              If journaling is enabled, create a superblock extension
- *              if necessary and then write the current contents of 
- *              the mdc_jnl_enabled, mdc_jnl_magic, mdc_jnl_file_name_lenand 
- *              mdc_jnl_file_name fields of the shared structure to the 
- *              mdj_msg in the superblock extention, overwriting the old 
+ *              if necessary and then write the current contents of
+ *              the mdc_jnl_enabled, mdc_jnl_magic, mdc_jnl_file_name_lenand
+ *              mdc_jnl_file_name fields of the shared structure to the
+ *              mdj_msg in the superblock extention, overwriting the old
  *              message if it exists.
  *
  *              If journaling is not enabled, remove the old mdj message
@@ -1170,18 +1170,18 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id)
     } /* end else */
 
     /* The metadata journaling message is a variable length message.
-     * This raises the question of how to deal with any pre-existing 
+     * This raises the question of how to deal with any pre-existing
      * message.
      *
      * While in theory we could try to re-size it, after looking through
-     * the code and talking to Quincey, it appears that the standard 
-     * practice in such cases seems to be to delete the old message, 
+     * the code and talking to Quincey, it appears that the standard
+     * practice in such cases seems to be to delete the old message,
      * and then replace it with a new message.
      *
-     * Add to this the fact that the metadata journaling message 
-     * should not exist unless journaling is enabled (or to put it 
-     * another way, the message should never appear in a valid HDF5 
-     * file).  
+     * Add to this the fact that the metadata journaling message
+     * should not exist unless journaling is enabled (or to put it
+     * another way, the message should never appear in a valid HDF5
+     * file).
      *
      * Thus, here we check to see if a metadata jouraling message exists,
      * and delete it if it does.  If metadata data journaling is enabled,
@@ -1190,8 +1190,8 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id)
     if((msg_exists = H5O_msg_exists(&ext_loc, H5O_MDJ_MSG_ID, dxpl_id)) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to determine if metadata journaling message exists?!?!")
     if(msg_exists == TRUE) {
-        /* metadata journaling message exists -- delete it from the 
-         * super block extension now.  We will replace it later if 
+        /* metadata journaling message exists -- delete it from the
+         * super block extension now.  We will replace it later if
          * metadata journaling is enabled.
          */
         if(H5O_msg_remove(&ext_loc, H5O_MDJ_MSG_ID, H5O_ALL, FALSE, dxpl_id) < 0)
@@ -1201,7 +1201,7 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id)
     if(f->shared->mdc_jnl_enabled) {
         H5O_mdj_msg_t	mdj_msg;        /* Metadata journaling message to insert in superblock extension */
 
-        /* create a metadata journaling message and insert it in 
+        /* create a metadata journaling message and insert it in
          * the superblock extension.
          */
         mdj_msg.mdc_jnl_enabled       = f->shared->mdc_jnl_enabled;
diff --git a/src/H5G.c b/src/H5G.c
index 320128e..6c0572d 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -1006,7 +1006,7 @@ H5G_create(H5F_t *file, hid_t gcpl_id, hid_t dxpl_id)
 
     /* Set the count of times the object is opened */
     grp->shared->fo_count = 1;
-    
+
     /* Set return value */
     ret_value = grp;
 
@@ -1767,7 +1767,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
 
     /* Build the link's relative path name */
     HDassert(udata->path[old_path_len] == '\0');
-    HDstrcpy(&(udata->path[old_path_len]), lnk->name); 
+    HDstrcpy(&(udata->path[old_path_len]), lnk->name);
     udata->curr_path_len += link_name_len;
 
     /* Construct the link info from the link message */
@@ -1830,9 +1830,9 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
 
                 /* Add the path separator to the current path */
                 HDassert(udata->path[udata->curr_path_len] == '\0');
-                HDstrcpy(&(udata->path[udata->curr_path_len]), "/"); 
+                HDstrcpy(&(udata->path[udata->curr_path_len]), "/");
                 udata->curr_path_len++;
-                    
+
                 /* Attempt to get the link info for this group */
                 if(H5G_obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) {
                     /* Check for creation order tracking, if creation order index lookup requested */
diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c
index b0340a7..be423b5 100644
--- a/src/H5Gcompact.c
+++ b/src/H5Gcompact.c
@@ -406,7 +406,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, 
+H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
     H5G_lib_iterate_t op, void *op_data)
 {
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 8122f6a..e632cad 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -263,7 +263,7 @@ H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_to_info
  *
- * Purpose:	Retrieve information from a link object 
+ * Purpose:	Retrieve information from a link object
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -336,7 +336,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_to_loc
  *
- * Purpose:	Build group location from group and link object 
+ * Purpose:	Build group location from group and link object
  *
  * Return:	Non-negative on success/Negative on failure
  *
diff --git a/src/H5Gname.c b/src/H5Gname.c
index c5fc2c1..e5cd00a 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -460,7 +460,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id,
                 H5I_dec_ref(file);
 		HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't determine name")
             } /* end if */
-	
+
             /* Close file ID used for search */
 	    if(H5I_dec_ref(file) < 0)
 		HGOTO_ERROR(H5E_SYM, H5E_CANTCLOSEFILE, FAIL, "can't determine name")
@@ -470,7 +470,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id,
         ret_value = len;
     } /* end if */
 
-done: 
+done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_name() */
 
@@ -914,7 +914,7 @@ done:
  */
 herr_t
 H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
-    H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r, 
+    H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r,
     hid_t dxpl_id)
 {
     herr_t ret_value = SUCCEED;
@@ -1086,8 +1086,8 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
             HGOTO_DONE(H5_ITER_STOP)
         } /* end if */
     } /* end if */
-   
-done:    
+
+done:
     if(obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
@@ -1137,7 +1137,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
         udata.lapl_id = lapl_id;
         udata.dxpl_id = dxpl_id;
         udata.path = NULL;
-        
+
         /* Visit all the links in the file */
         if((status = H5G_visit(file, "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5G_get_name_by_addr_cb, &udata, lapl_id, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group traversal failed while looking for object name")
@@ -1166,8 +1166,8 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
     } /* end if */
     else
         ret_value = 0;
-   
-done:    
+
+done:
     /* Release resources */
     H5MM_xfree(udata.path);
 
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 6f796d5..b1426b7 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -77,7 +77,7 @@ static size_t H5G_node_size_real(const H5F_t *f);
 /* Metadata cache callbacks */
 static void *H5G_node_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
-static herr_t H5G_node_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+static herr_t H5G_node_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
     size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr,
     size_t *new_len, void **new_image);
 static herr_t H5G_node_free_icr(haddr_t addr, size_t len, void *thing);
@@ -418,8 +418,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_node_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5G_node_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5G_node_t *sym = (H5G_node_t *)_thing;        /* Pointer to the Symbol Table node */
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index fbadab9..d79710e 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -182,7 +182,7 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
                     ginfo_size +
                     (ginfo->est_num_entries * link_size);
     } /* end if */
-    else 
+    else
         hdr_size = 4 + 2 * H5F_SIZEOF_ADDR(f);
 
     /*
@@ -326,7 +326,7 @@ H5O_linfo_t *
 H5G_obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
 {
     H5O_linfo_t *ret_value;     /* Return value */
-    
+
     FUNC_ENTER_NOAPI(H5G_obj_get_linfo, NULL)
 
     /* check arguments */
diff --git a/src/H5Goh.c b/src/H5Goh.c
index 3ccdf16..d1c824f 100644
--- a/src/H5Goh.c
+++ b/src/H5Goh.c
@@ -271,7 +271,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
     HDassert(bh_info);
 
     /* Check for "new style" group info */
-    if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_LINFO_ID, &linfo)) { 
+    if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_LINFO_ID, &linfo)) {
         H5O_stab_t          stab;       	/* Info about symbol table */
 
         /* Must be "old style" group, clear error stack */
@@ -280,7 +280,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
         /* Get symbol table message */
         if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_STAB_ID, &stab))
 	    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't find LINFO nor STAB messages")
-	
+
         /* Get symbol table size info */
         if(H5G_stab_bh_size(f, dxpl_id, &stab, bh_info) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve symbol table size info")
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 5ba7050..5b8b054 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -86,7 +86,7 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name,
 H5_DLL herr_t H5Gclose(hid_t group_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 2b1476d..856e2e8 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -651,7 +651,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_get_name_by_idx_cb
  *
- * Purpose:     Callback for B-tree iteration 'by index' info query to 
+ * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the name of a link
  *
  * Return:	Success:        Non-negative
@@ -869,7 +869,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_lookup_by_idx_cb
  *
- * Purpose:     Callback for B-tree iteration 'by index' info query to 
+ * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the link
  *
  * Return:	Success:        Non-negative
@@ -984,7 +984,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_get_type_by_idx_cb
  *
- * Purpose:     Callback for B-tree iteration 'by index' info query to 
+ * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the type of an object
  *
  * Return:	Success:        Non-negative
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index dcc77c2..b473a97 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -422,7 +422,7 @@ H5G_traverse_mount(H5G_loc_t *obj_loc/*in,out*/)
     if(0 == cmp) {
         /* Get the child file */
         child = parent->shared->mtab.child[md].file;
-        
+
         /* Get the location for the root group in the child's file */
         oloc = H5G_oloc(child->shared->root_grp);
 
@@ -739,7 +739,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
                     linfo = &def_linfo;
                 } /* end if */
                 else {
-                    /* Only keep the creation order information from the parent 
+                    /* Only keep the creation order information from the parent
                      *  group's link info
                      */
                     HDmemcpy(&tmp_linfo, &def_linfo, sizeof(H5O_linfo_t));
@@ -814,7 +814,7 @@ done:
         H5G_loc_free(&obj_loc);
     if(group_copy && !(own_loc & H5G_OWN_GRP_LOC))
         H5G_loc_free(&grp_loc);
-    
+
     /* If there's valid information in the link, reset it */
     if(link_valid)
         H5O_msg_reset(H5O_LINK_ID, &lnk);
diff --git a/src/H5HF.c b/src/H5HF.c
index a9c4dda..0987a02 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -644,7 +644,7 @@ done:
  *
  * Purpose:	Perform an operation directly on a heap object
  *
- * Note:	The library routines currently assume that the 'op' callback 
+ * Note:	The library routines currently assume that the 'op' callback
  *		won't modify the object.  This can easily be changed later for
  *		"managed" heap objects, and, with some difficulty, for 'huge'
  *		and 'tiny' heap objects.
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c
index f57c408..4ceb0c2 100644
--- a/src/H5HFdblock.c
+++ b/src/H5HFdblock.c
@@ -431,7 +431,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
     H5HF_dblock_cache_ud_t udata;	/* parent and other infor for deserializing direct block */
     size_t odi_size;		/* On disk image size of the direct block.
 				 * Note that there is no necessary relation
-				 * between this value, and the actual 
+				 * between this value, and the actual
 				 * direct block size, as conpression may
 				 * reduce the size of the on disk image,
 				 * and check sums may increase it.
@@ -458,7 +458,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
     /* set up the direct block size */
     udata.dblock_size = dblock_size;
 
-    /* compute the on disk image size -- observe that odi_size and 
+    /* compute the on disk image size -- observe that odi_size and
      * dblock_size will be identical if there is no filtering.
      */
     if(hdr->filter_len > 0) {
@@ -661,7 +661,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-herr_t 
+herr_t
 H5HF_man_dblock_dest(H5HF_direct_t *dblock)
 {
     herr_t          ret_value = SUCCEED;    /* Return value */
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 46e37cb..06ab19a 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -409,7 +409,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "can't finish phase #1 of header final initialization")
 
     /* Copy any I/O filter pipeline */
-    /* (This code is not in the "finish init phase" routines because those 
+    /* (This code is not in the "finish init phase" routines because those
      *  routines are also called from the cache 'load' callback, and the filter
      *  length is already set in that case (its stored in the header on disk))
      */
@@ -439,7 +439,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
         hdr->heap_size = H5HF_HEADER_SIZE(hdr);
 
     /* Set the length of IDs in the heap */
-    /* (This code is not in the "finish init phase" routines because those 
+    /* (This code is not in the "finish init phase" routines because those
      *  routines are also called from the cache 'load' callback, and the ID
      *  length is already set in that case (its stored in the header on disk))
      */
@@ -1188,7 +1188,7 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
         /* (Skip direct block that will be deleted, if we find it) */
         tmp_entry = curr_entry;
         while(tmp_entry >= 0 &&
-                (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) || 
+                (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) ||
                     !H5F_addr_defined(iblock->ents[tmp_entry].addr)))
             tmp_entry--;
         /* Check for no earlier blocks in this indirect block */
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 391ff3c..defda1f 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -125,7 +125,7 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
 
         /* Sanity check */
         HDassert(par_iblock->child_iblocks);
-        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows 
+        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows
                 * iblock->hdr->man_dtable.cparam.width));
 
         /* Compute index in parent's child iblock pointer array */
@@ -179,7 +179,7 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
 
         /* Sanity check */
         HDassert(par_iblock->child_iblocks);
-        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows 
+        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows
                 * iblock->hdr->man_dtable.cparam.width));
 
         /* Compute index in parent's child iblock pointer array */
@@ -1086,7 +1086,7 @@ H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
 
             /* Sanity check */
             HDassert(par_iblock->child_iblocks);
-            HDassert(par_entry >= (hdr->man_dtable.max_direct_rows 
+            HDassert(par_entry >= (hdr->man_dtable.max_direct_rows
                     * hdr->man_dtable.cparam.width));
 
             /* Compute index in parent's child iblock pointer array */
@@ -1438,7 +1438,7 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
                 /* Are we in a direct or indirect block row */
                 if(row < hdr->man_dtable.max_direct_rows) {
                     hsize_t dblock_size;        /* Size of direct block on disk */
-                    
+
                     /* Check for I/O filters on this heap */
                     if(hdr->filter_len > 0)
                         dblock_size = iblock->filt_ents[entry].size;
@@ -1537,7 +1537,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
         entry = hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width;
 	first_row_bits = H5V_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) +
 			    H5V_log2_of2(hdr->man_dtable.cparam.width);
-        num_indirect_rows = 
+        num_indirect_rows =
 	    (H5V_log2_gen(hdr->man_dtable.row_block_size[hdr->man_dtable.max_direct_rows]) - first_row_bits) + 1;
         for(u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++, num_indirect_rows++) {
             size_t      v;                      /* Local index variable */
diff --git a/src/H5HFman.c b/src/H5HFman.c
index 29d3d4a..09b13ec 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -209,7 +209,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, 
+H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     H5HF_operator_t op, void *op_data, unsigned op_flags)
 {
     H5HF_direct_t *dblock = NULL;       /* Pointer to direct block to query */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 55c601e..b92a372 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -552,12 +552,12 @@ typedef struct H5HF_dblock_cache_ud_t {
     H5HF_parent_t par_info;     /* Parent info */
     H5F_t * f;                  /* File pointer */
     size_t dblock_size;		/* size of the direct block, which bears
-				 * no necessary relation to the block 
-				 * odi_size -- the size of the on disk 
-				 * image of the block.  Note that the 
+				 * no necessary relation to the block
+				 * odi_size -- the size of the on disk
+				 * image of the block.  Note that the
 				 * metadata cache is only interested
-				 * in the odi_size, and thus it is this 
-				 * value that is passed to the cache in 
+				 * in the odi_size, and thus it is this
+				 * value that is passed to the cache in
 				 * calls to it.
 				 */
     unsigned filter_mask;	/* Excluded filters for direct block */
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index 9587fe0..fd75a3b 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -1138,7 +1138,7 @@ H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void UNUSED *_udata)
     /* Protect the direct block for the section */
     /* (should be a root direct block) */
     HDassert(dblock_addr == hdr->man_dtable.table_addr);
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, 
+    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr,
             dblock_size, (*sect)->u.single.parent, (*sect)->u.single.par_entry, H5AC2_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
     HDassert(H5F_addr_eq(dblock->block_off + dblock_size, (*sect)->sect_info.addr + (*sect)->sect_info.size));
@@ -2306,7 +2306,7 @@ H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size,
     /* Set the 'indirect' specific fields */
     if(iblock) {
         sect->u.indirect.u.iblock = iblock;
-        sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * 
+        sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
                 sect->u.indirect.u.iblock->max_rows;
         if(H5HF_iblock_incr(sect->u.indirect.u.iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block")
@@ -2361,7 +2361,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5HF_free_section_t *
-H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, 
+H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
     H5HF_free_section_t *row_sect)
 {
     H5HF_free_section_t *sect = NULL;   /* 'Indirect' free space section to add */
@@ -2378,7 +2378,7 @@ H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
     HDassert(row_sect->u.row.row < hdr->man_dtable.max_direct_rows);
 
     /* Create free space section node */
-    if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr, 
+    if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr,
             row_sect->sect_info.size, iblock, iblock->block_off,
             row_sect->u.row.row, row_sect->u.row.col, row_sect->u.row.num_entries)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create indirect section")
@@ -2647,7 +2647,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
     sect->u.indirect.dir_nrows = dir_nrows;
 
     /* Make certain we've tracked the section's dependents correctly */
-    HDassert(sect->u.indirect.rc == 
+    HDassert(sect->u.indirect.rc ==
             (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
 
 done:
@@ -2827,7 +2827,7 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
     sect->u.indirect.u.iblock = sec_iblock;
 
     /* Set the number of entries in the indirect block */
-    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * 
+    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
             sect->u.indirect.u.iblock->max_rows;
 
     /* Unlock indirect block */
@@ -2890,7 +2890,7 @@ H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
     sect->u.indirect.u.iblock = sect_iblock;
 
     /* Set the number of entries in the indirect block */
-    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * 
+    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
             sect->u.indirect.u.iblock->max_rows;
 
     /* Section is "live" now */
@@ -3114,10 +3114,10 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
 
             /* Transfer row sections between current & peer sections */
             HDmemcpy(&peer_sect->u.indirect.dir_rows[0],
-                &sect->u.indirect.dir_rows[0], 
+                &sect->u.indirect.dir_rows[0],
                 (sizeof(H5HF_free_section_t *) * peer_dir_nrows));
-            HDmemmove(&sect->u.indirect.dir_rows[0], 
-                &sect->u.indirect.dir_rows[peer_dir_nrows], 
+            HDmemmove(&sect->u.indirect.dir_rows[0],
+                &sect->u.indirect.dir_rows[peer_dir_nrows],
                 (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows)));
             sect->u.indirect.dir_nrows -= peer_dir_nrows;
             HDassert(row_sect == sect->u.indirect.dir_rows[0]);
@@ -3149,9 +3149,9 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
             sect->u.indirect.num_entries -= (peer_nentries + 1); /* Transferred entries, plus the entry allocated out of the row */
 
             /* Make certain we've tracked the sections' dependents correctly */
-            HDassert(sect->u.indirect.rc == 
+            HDassert(sect->u.indirect.rc ==
                     (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
-            HDassert(peer_sect->u.indirect.rc == 
+            HDassert(peer_sect->u.indirect.rc ==
                     (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
         } /* end else */
     } /* end if */
@@ -3342,7 +3342,7 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
 
             /* Transfer child indirect sections between current & peer sections */
             HDmemcpy(&peer_sect->u.indirect.indir_ents[0],
-                &sect->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries], 
+                &sect->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries],
                 (sizeof(H5HF_free_section_t *) * peer_nentries));
             sect->u.indirect.indir_nents -= (peer_nentries + 1); /* Transferred blocks, plus child entry */
 
@@ -3369,9 +3369,9 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
             /* (Note modified on current section's ref. count, since we haven't
              *  detached the child section yet)
              */
-            HDassert((sect->u.indirect.rc - 1) == 
+            HDassert((sect->u.indirect.rc - 1) ==
                     (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
-            HDassert(peer_sect->u.indirect.rc == 
+            HDassert(peer_sect->u.indirect.rc ==
                     (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
         } /* end else */
     } /* end if */
@@ -3649,8 +3649,8 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
             sect1->u.indirect.dir_rows = new_dir_rows;
 
             /* Transfer the second section's rows to first section */
-            HDmemcpy(&sect1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows], 
-                &sect2->u.indirect.dir_rows[src_row2], 
+            HDmemcpy(&sect1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows],
+                &sect2->u.indirect.dir_rows[src_row2],
                 (sizeof(H5HF_free_section_t *) * nrows_moved2));
 
             /* Re-target the row sections moved from second section */
@@ -3695,8 +3695,8 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
             sect1->u.indirect.indir_ents = new_indir_ents;
 
             /* Transfer the second section's entries to first section */
-            HDmemcpy(&sect1->u.indirect.indir_ents[sect1->u.indirect.indir_nents], 
-                &sect2->u.indirect.indir_ents[0], 
+            HDmemcpy(&sect1->u.indirect.indir_ents[sect1->u.indirect.indir_nents],
+                &sect2->u.indirect.indir_ents[0],
                 (sizeof(H5HF_free_section_t *) * sect2->u.indirect.indir_nents));
         } /* end else */
 
@@ -3717,7 +3717,7 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
     sect1->u.indirect.span_size += sect2->u.indirect.span_size;
 
     /* Make certain we've tracked the first section's dependents correctly */
-    HDassert(sect1->u.indirect.rc == 
+    HDassert(sect1->u.indirect.rc ==
             (sect1->u.indirect.indir_nents + sect1->u.indirect.dir_nrows));
 
     /* Wrap up, freeing or re-inserting second row section */
@@ -3807,7 +3807,7 @@ H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
     HDassert(par_iblock);
 
     /* Create parent indirect section */
-    if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr, 
+    if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr,
             sect->sect_info.size, par_iblock, par_iblock->block_off,
             par_row, par_col, 1)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
@@ -3965,7 +3965,7 @@ H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id,
     unsigned *des_flags)
 {
     H5HF_free_section_t *new_sect;      /* New indirect section */
-    hsize_t iblock_off;                 /* Indirect block's offset */ 
+    hsize_t iblock_off;                 /* Indirect block's offset */
     unsigned start_row;                 /* Indirect section's start row */
     unsigned start_col;                 /* Indirect section's start column */
     unsigned nentries;                  /* Indirect section's number of entries */
diff --git a/src/H5HFstat.c b/src/H5HFstat.c
index d151b47..8d6b2ba 100644
--- a/src/H5HFstat.c
+++ b/src/H5HFstat.c
@@ -112,7 +112,7 @@ H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats)
  * Function:    H5HF_size
  *
  * Purpose:     Retrieve storage info for:
- *			1. fractal heap 
+ *			1. fractal heap
  *			2. btree storage used by huge objects in fractal heap
  *			3. free space storage info
  *
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 769e9d9..8db1626 100755
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -62,7 +62,7 @@
 /********************/
 
 /* Metadata cache callbacks */
-static void *H5HG_deserialize(haddr_t addr, size_t len, const void *image, 
+static void *H5HG_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
 static herr_t H5HG_image_len(const void *thing, size_t *image_len_ptr);
 static herr_t H5HG_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len,
@@ -159,7 +159,7 @@ H5HG_deserialize(haddr_t addr, size_t UNUSED len, const void *image,
         /* Allocate space for the heap->chunk */
         if(NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, (size_t)heap->size)))
     	    HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed")
-        
+
         /* Copy image into chunk */
         HDmemcpy(heap->chunk, image, heap->size);
 
@@ -270,7 +270,7 @@ H5HG_deserialize(haddr_t addr, size_t UNUSED len, const void *image,
             f->shared->cwfs[0] = heap;
         } /* end else */
 
-        /* Sanity check */    
+        /* Sanity check */
         HDassert((size_t)((const uint8_t *)p - (const uint8_t *)heap->chunk) <= len);
     } /* end if heap->size <= len */
 
@@ -317,7 +317,7 @@ H5HG_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
     if(heap->size > len) {
         /* free old image buffer */
         H5MM_free(image);
-    
+
         /* allocate new image buffer */
         if(NULL == (*new_image = H5MM_malloc(heap->size)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "new image null after H5MM_realloc()\n")
@@ -347,7 +347,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HG_image_len
  *
- * Purpose:     Tell the metadata cache about the actual size 
+ * Purpose:     Tell the metadata cache about the actual size
  *              of the global heap
  *
  * Return:	Non-negative on success/Negative on failure
@@ -362,13 +362,13 @@ static herr_t
 H5HG_image_len(const void *thing, size_t *image_len_ptr)
 {
     const H5HG_heap_t    *heap = (const H5HG_heap_t *)thing;    /* Global heap */
-    
+
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_image_len)
 
     /* Check arguments */
     HDassert(heap);
     HDassert(image_len_ptr);
-    
+
     /* Report the global heap's total size */
     *image_len_ptr = heap->size;
 
diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index 48c2633..0e34d57 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -36,7 +36,7 @@
 #include "H5FLprivate.h"	/* Free lists                           */
 
 #define H5F_PACKAGE
-#include "H5Fpkg.h"	       
+#include "H5Fpkg.h"
 
 /*****************************/
 /* Package Private Variables */
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index e0d6930..cf5668f 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -65,7 +65,7 @@
 /********************/
 
 /* Metadata cache callbacks */
-static void *H5HL_prfx_deserialize(haddr_t addr, size_t len, const void *image, 
+static void *H5HL_prfx_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
 static herr_t H5HL_prfx_image_len(const void *thing, size_t *image_len_ptr);
 static herr_t H5HL_prfx_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len,
@@ -73,7 +73,7 @@ static herr_t H5HL_prfx_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, s
     size_t *new_len, void **new_image);
 static herr_t H5HL_prfx_free_icr(haddr_t addr, size_t len, void *thing);
 
-static void *H5HL_dblk_deserialize(haddr_t addr, size_t len, const void *image, 
+static void *H5HL_dblk_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
 static herr_t H5HL_dblk_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len,
     void *image, void *thing, unsigned *flags, haddr_t *new_addr,
@@ -409,8 +409,8 @@ H5HL_prfx_image_len(const void *thing, size_t *image_len_ptr)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HL_prfx_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5HL_prfx_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5HL_prfx_t *prfx = (H5HL_prfx_t *)_thing; /* Pointer to the local heap prefix */
@@ -572,8 +572,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HL_dblk_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5HL_dblk_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing;  /* Pointer to the local heap data block */
diff --git a/src/H5L.c b/src/H5L.c
index 97f5656..035a666 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -152,7 +152,7 @@ static herr_t H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
     const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
     H5G_own_loc_t *own_loc/*out*/);
 static herr_t H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
-    H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, 
+    H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info,
     hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
 static herr_t H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size);
 static herr_t H5L_get_val_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
@@ -346,7 +346,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
             lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
-done:    
+done:
     FUNC_LEAVE_API_META(ret_value)
 } /* end H5Lmove() */
 
@@ -404,7 +404,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
                 lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
-done:    
+done:
     FUNC_LEAVE_API_META(ret_value)
 } /* end H5Lcopy() */
 
@@ -1587,7 +1587,7 @@ H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc,
     lnk.u.hard.addr = obj_loc->oloc->addr;
 
     /* Create the link */
-    if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0) 
+    if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
@@ -1630,7 +1630,7 @@ H5L_link_object(const H5G_loc_t *new_loc, const char *new_name,
     lnk.type = H5L_TYPE_HARD;
 
     /* Create the link */
-    if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0) 
+    if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
@@ -2049,7 +2049,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5L_get_val_real
  *
- * Purpose:	Retrieve link value from a link object 
+ * Purpose:	Retrieve link value from a link object
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -2081,7 +2081,7 @@ H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size)
     else if(lnk->type >= H5L_TYPE_UD_MIN) {
         const H5L_class_t *link_class;             /* User-defined link class */
 
-        /* Get the link class for this type of link.  It's okay if the class 
+        /* Get the link class for this type of link.  It's okay if the class
          * isn't registered, though--we just can't give any more information
          * about it
          */
@@ -2672,7 +2672,7 @@ H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc,
 
     /* Do the move */
     if(H5G_traverse(src_loc, src_name, target_flags, H5L_move_cb, &udata, lapl_id, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link")    
+	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index d5b8b96..bde987c 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -170,7 +170,7 @@ done:
  *              Monday, July 10, 2006
  * Modifications:
  *		Vailin Choi, April 2, 2008
- *		Add handling to search for the target file 
+ *		Add handling to search for the target file
  *		See description in RM: H5Lcreate_external
  *
  *-------------------------------------------------------------------------
@@ -270,7 +270,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
 	    HDstrcpy(tempname, &file_name[2]);
 	}
     }
-    
+
     /* try searching from paths set in the environment variable */
     if ((ext_file == NULL) && (env_prefix=HDgetenv("HDF5_EXT_PREFIX"))) {
 
@@ -296,7 +296,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
         if (pp)
             H5MM_xfree(pp);
     }
-    
+
     /* try searching from property list */
     if (ext_file == NULL) {
         if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 823b046..eba09b2 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -60,7 +60,7 @@ extern "C" {
  * defined by HDF5 but their behavior can be overridden by users.
  * Users who want to create new classes of links should contact the HDF5
  * development team at hdfhelp@ncsa.uiuc.edu .
- * These values can never change because they appear in HDF5 files. 
+ * These values can never change because they appear in HDF5 files.
  */
 typedef enum {
     H5L_TYPE_ERROR = (-1),      /* Invalid link type id         */
diff --git a/src/H5O.c b/src/H5O.c
index 1200aa6..f2054f4 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -352,7 +352,7 @@ done:
  *              H5Odecr_refcount() should be used when the object is
  *              no longer being referenced by address (e.g. when the UD link
  *              is deleted).
- *         
+ *
  *              The address of the HDF5 file on disk has no effect on
  *              H5Oopen_by_addr(), nor does the use of any unusual file
  *              drivers. The "address" is really the offset within the
@@ -1227,7 +1227,7 @@ done:
  * Modification:
  *              Raymond Lu
  *              5 November 2007
- *              Turn off the holding file variable if it's on.  When it's 
+ *              Turn off the holding file variable if it's on.  When it's
  *              needed, the caller will turn it on again.
  *-------------------------------------------------------------------------
  */
@@ -1750,7 +1750,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5O_pin
  *
- * Purpose:	Wrapper around H5AC2_pin_entry 
+ * Purpose:	Wrapper around H5AC2_pin_entry
  *
  * Return:	Success:	Non-negative
  *		Failure:	Negative
@@ -1784,7 +1784,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5O_unpin
  *
- * Purpose:	Wrapper around H5AC2_unpin_entry 
+ * Purpose:	Wrapper around H5AC2_unpin_entry
  *
  * Return:	Success:	Non-negative
  *		Failure:	Negative
@@ -3093,7 +3093,7 @@ H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
         udata.dxpl_id = dxpl_id;
         udata.op = op;
         udata.op_data = op_data;
-        
+
         /* Create skip list to store visited object information */
         if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, 0.5, (size_t)16)) == NULL)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index 0eb6a20..3680cb7 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -154,7 +154,7 @@ H5O_add_gap(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, unsigned idx,
                 oh->mesg[u].raw -= new_gap_size;
 
         /* Slide raw message info forward in chunk image */
-        HDmemmove(new_gap_loc, new_gap_loc + new_gap_size, 
+        HDmemmove(new_gap_loc, new_gap_loc + new_gap_size,
                 (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) - (new_gap_loc + new_gap_size)));
 
         /* Add existing gap size to new gap size */
@@ -935,7 +935,7 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size)
         if(H5O_alloc_msgs(oh, (size_t)3) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, UFAIL, "can't allocate more space for messages")
 
-    /* Move message (that will be replaced with continuation message) 
+    /* Move message (that will be replaced with continuation message)
      *  to new chunk, if necessary.
      */
     if(found_null < 0) {
@@ -1191,7 +1191,7 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
     /* Check if chunk has a gap currently */
     if(oh->chunk[mesg->chunkno].gap) {
         /* Eliminate the gap in the chunk */
-        if(H5O_eliminate_gap(f, dxpl_id, oh, mesg, 
+        if(H5O_eliminate_gap(f, dxpl_id, oh, mesg,
                 ((oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap)),
                 oh->chunk[mesg->chunkno].gap) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
@@ -1250,7 +1250,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
 
                 /* Check if null message is not last in chunk */
                 chunk = &(oh->chunk[curr_msg->chunkno]);
-                if((curr_msg->raw + curr_msg->raw_size) 
+                if((curr_msg->raw + curr_msg->raw_size)
                         != ((chunk->image + chunk->size) - (H5O_SIZEOF_CHKSUM_OH(oh) + chunk->gap))) {
                     H5O_mesg_t *nonnull_msg;       /* Pointer to current message to operate on */
                     unsigned	v;              /* Local index variable */
@@ -1353,7 +1353,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             /* Check for gap in null message's chunk */
                             if(oh->chunk[old_chunkno].gap > 0) {
                                 /* Eliminate the gap in the chunk */
-                                if(H5O_eliminate_gap(f, dxpl_id, oh, null_msg, 
+                                if(H5O_eliminate_gap(f, dxpl_id, oh, null_msg,
                                         ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
                                         oh->chunk[old_chunkno].gap) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
@@ -1425,7 +1425,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             /* Check for gap in new null message's chunk */
                             if(oh->chunk[old_chunkno].gap > 0) {
                                 /* Eliminate the gap in the chunk */
-                                if(H5O_eliminate_gap(f, dxpl_id, oh, &oh->mesg[new_null_msg], 
+                                if(H5O_eliminate_gap(f, dxpl_id, oh, &oh->mesg[new_null_msg],
                                         ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
                                         oh->chunk[old_chunkno].gap) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 4bfeb3d..d1a5261 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -229,7 +229,7 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags,
     /* Indicate that the fill values aren't to be written out */
     attr->shared->initialized = 1;
 
-    /* Increment the reference count for this object header message in cache(compact 
+    /* Increment the reference count for this object header message in cache(compact
        storage) or for the object from dense storage. */
     attr->shared->nrefs++;
 
@@ -459,9 +459,9 @@ H5O_attr_size(const H5F_t UNUSED *f, const void *_mesg)
  * Modification:Raymond Lu
  *              25 June 2008
  *              Made this function empty.  The freeing action is actually
- *              done in H5O_attr_free (see H5O_msg_free_real).  But this 
- *              empty reset function needs to be here.  Otherwise, the 
- *              caller function H5O_msg_reset_real will zero-set the whole 
+ *              done in H5O_attr_free (see H5O_msg_free_real).  But this
+ *              empty reset function needs to be here.  Otherwise, the
+ *              caller function H5O_msg_reset_real will zero-set the whole
  *              message.
  *-------------------------------------------------------------------------
  */
@@ -675,10 +675,10 @@ H5O_attr_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t UNUSED *mesg_ty
     H5O_loc_reset(&(attr_dst->shared->oloc));
     H5G_name_reset(&(attr_dst->path));
     attr_dst->obj_opened = FALSE;
-    
+
     /* Reference count for the header message in the cache */
     attr_dst->shared->nrefs = 1;
- 
+
     /* Copy attribute's name */
     attr_dst->shared->name = H5MM_strdup(attr_src->shared->name);
     HDassert(attr_dst->shared->name);
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index eb2e5a9..244dd5e 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -138,7 +138,7 @@ typedef struct {
 static herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc,
     hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
     hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data);
-static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, 
+static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr,
     const char* name_to_open);
 
 /*********************/
@@ -353,10 +353,10 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header")
     } /* end else */
 
-    /* Increment reference count for shared attribute object for the 
+    /* Increment reference count for shared attribute object for the
      * object handle created by the caller function H5A_create.  The count
      * for the cached object header has been incremented in the step above
-     * (in H5O_msg_append_real).  The dense storage doesn't need a count. */ 
+     * (in H5O_msg_append_real).  The dense storage doesn't need a count. */
     attr->shared->nrefs += 1;
 
     /* Was new attribute shared? */
@@ -469,7 +469,7 @@ done:
  *
  * Modification:Raymond Lu
  *              23 June 2008
- *              If the attribute is in dense storage and has already been 
+ *              If the attribute is in dense storage and has already been
  *              opened, make a copy of already opened object to share some
  *              object information.
  *-------------------------------------------------------------------------
@@ -633,11 +633,11 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     /* Find out whether it has already been opened.  If it has, close the object
      * and make a copy of the already opened object to share the object info. */
     if(ret_value) {
-        if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, 
+        if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr,
             ret_value->shared->name)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute")
 
-        /* If found that the attribute is already opened, make a copy of it 
+        /* If found that the attribute is already opened, make a copy of it
            and close the object just opened. */
         if(found_open_attr && exist_attr) {
             if(H5A_close(ret_value) < 0)
@@ -663,7 +663,7 @@ done:
  *              the name.  Return the pointer to the object if found.
  *
  * Return:	TRUE:	found the already opened object
- *              FALSE:  didn't find the opened object 
+ *              FALSE:  didn't find the opened object
  *              FAIL:	function failed.
  *
  * Programmer:	Raymond Lu
@@ -691,7 +691,7 @@ htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char*
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "can't get number of opened attributes")
 
     /* Find out whether the attribute has been opened */
-    if(num_open_attr) { 
+    if(num_open_attr) {
         attr_id_list = (hid_t*)H5MM_malloc(num_open_attr*sizeof(hid_t));
 
         /* Retrieve the IDs of all opened attributes */
@@ -815,7 +815,7 @@ done:
  * Modification:Raymond Lu
  *              4 June 2008
  *              Took out the data copying part because the attribute data
- *              is shared between attribute handle and object header. 
+ *              is shared between attribute handle and object header.
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1082,7 +1082,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
                     old_version != ((H5A_t *)mesg->native)->shared->version) {
                 H5A_t *attr;            /* Attribute to re-add */
 
-                /* Take ownership of the message's native info (the attribute) 
+                /* Take ownership of the message's native info (the attribute)
                  *      so any shared objects in the file aren't adjusted (and
                  *      possibly deleted) when the message is released.
                  */
@@ -1365,9 +1365,9 @@ done:
  *
  * Modification:Raymond Lu
  *              24 June 2008
- *              When converting storage from dense to compact, if found 
- *              the attribute is already opened, use the opened message 
- *              to insert.  If not, still use the message in the attribute 
+ *              When converting storage from dense to compact, if found
+ *              the attribute is already opened, use the opened message
+ *              to insert.  If not, still use the message in the attribute
  *              table. This will guarantee that the attribute message is
  *              shared between the object in metadata cache and the opened
  *              object.
@@ -1432,14 +1432,14 @@ H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo,
                     (atable.attrs[u])->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
                 } /* end else */
 
-                /* Insert attribute message into object header (Will increment 
+                /* Insert attribute message into object header (Will increment
                    reference count on shared attributes) */
                 /* Find out whether the attribute has been opened */
                 if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, (atable.attrs[u])->shared->name)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "failed in finding opened attribute")
 
                 /* If found the attribute is already opened, use the opened message to insert.
-                   If not, still use the message in the attribute table. */ 
+                   If not, still use the message in the attribute table. */
                 if(found_open_attr && exist_attr) {
                     if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0)
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message")
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 8370394..f6b5cbb 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -63,7 +63,7 @@
 static void *H5O_cache_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
 static herr_t H5O_cache_image_len(const void *thing, size_t *image_len_ptr);
-static herr_t H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
+static herr_t H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
     size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr,
     size_t *new_len, void **new_image);
 static herr_t H5O_cache_free_icr(haddr_t addr, size_t len, void *thing);
@@ -71,7 +71,7 @@ static herr_t H5O_cache_free_icr(haddr_t addr, size_t len, void *thing);
 static void *H5O_cache_chk_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
 static herr_t H5O_cache_chk_serialize(const H5F_t *f, hid_t dxpl_id,
-    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, 
+    haddr_t addr, size_t len, void *image, void *thing, unsigned *flags,
     haddr_t *new_addr, size_t *new_len, void **new_image);
 static herr_t H5O_cache_chk_free_icr(haddr_t addr, size_t len, void *thing);
 
@@ -81,7 +81,7 @@ static herr_t H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chunk_proxy);
 /* Chunk routines */
 static herr_t H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len,
     const uint8_t *image, H5O_common_cache_ud_t *udata, hbool_t *dirty);
-static herr_t H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno, 
+static herr_t H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno,
     uint8_t *image);
 
 /* Misc. routines */
@@ -362,8 +362,8 @@ H5O_cache_image_len(const void *thing, size_t *image_len_ptr)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5O_t       *oh = (H5O_t *)_thing;  /* Pointer to the object header */
@@ -604,9 +604,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cache_chk_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, 
-    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, 
-    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, 
+H5O_cache_chk_serialize(const H5F_t *f, hid_t UNUSED dxpl_id,
+    haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing,
+    unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len,
     void UNUSED **new_image)
 {
     H5O_chunk_proxy_t *chk_proxy = (H5O_chunk_proxy_t *)_thing;  /* Pointer to the object header chunk proxy */
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 55b38db..0aac469 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -100,11 +100,11 @@ H5FL_DEFINE(H5O_addr_map_t);
  * Purpose:     Copy an object (group or dataset) to destination location
  *              within a file or cross files. PLIST_ID is a property list
  *              which is used to pass user options and properties to the
- *              copy. The name, dst_name, must not already be taken by some 
+ *              copy. The name, dst_name, must not already be taken by some
  *              other object in the destination group.
  *
  *              H5Ocopy() will fail if the name of the destination object
- *                  exists in the destination group.  For example,  
+ *                  exists in the destination group.  For example,
  *                  H5Ocopy(fid_src, "/dset", fid_dst, "/dset", ...)
  *                  will fail if "/dset" exists in the destination file
  *
@@ -114,21 +114,21 @@ H5FL_DEFINE(H5O_addr_map_t);
  *                      the group are copied. Otherwise (default), it will
  *                      recursively copy all objects below the group
  *                  H5O_COPY_EXPAND_SOFT_LINK_FLAG
- *                      If this flag is specified, it will copy the objects 
- *                      pointed by the soft links. Otherwise (default), it 
+ *                      If this flag is specified, it will copy the objects
+ *                      pointed by the soft links. Otherwise (default), it
  *                      will copy the soft link as they are
  *                  H5O_COPY_WITHOUT_ATTR_FLAG
- *                      If this flag is specified, it will copy object without 
+ *                      If this flag is specified, it will copy object without
  *                      copying attributes. Otherwise (default), it will
  *                      copy object along with all its attributes
  *                  H5O_COPY_EXPAND_REFERENCE_FLAG
  *                      1) Copy object between two different files:
- *                          When this flag is specified, it will copy objects that 
+ *                          When this flag is specified, it will copy objects that
  *                          are pointed by the references and update the values of
  *                          references in the destination file.  Otherwise (default)
  *                          the values of references in the destination will set to
  *                          zero
- *                          The current implementation does not handle references 
+ *                          The current implementation does not handle references
  *                          inside of other datatype structure. For example, if
  *                          a member of compound datatype is reference, H5Ocopy()
  *                          will copy that field as it is. It will not set the
@@ -139,11 +139,11 @@ H5FL_DEFINE(H5O_addr_map_t);
  *                          Datasets or attributes of references are copied as they
  *                          are, i.e. values of references of the destination object
  *                          are the same as the values of the source object
- *  
+ *
  *              OPTIONS THAT MAY APPLY TO COPY IN THE FUTURE.
  *                  H5O_COPY_EXPAND_EXT_LINK_FLAG
  *                      If this flag is specified, it will expand the external links
- *                      into new objects, Otherwise (default), it will keep external 
+ *                      into new objects, Otherwise (default), it will keep external
  *                      links as they are (default)
  *
  *              PROPERTIES THAT MAY APPLY TO COPY IN FUTURE
@@ -473,7 +473,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
 
             /* Copy the source message */
             recompute_size = FALSE;
-            if((mesg_dst->native = H5O_msg_copy_file(copy_type, 
+            if((mesg_dst->native = H5O_msg_copy_file(copy_type,
                     oloc_src->file, mesg_src->native, oloc_dst->file,
                     &recompute_size, cpy_info, udata, dxpl_id)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object header message")
@@ -592,7 +592,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
      * header.  This will be written when the header is flushed to disk.
      */
     if(oh_dst->version > H5O_VERSION_1)
-        HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5O_SIZEOF_MAGIC); 
+        HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5O_SIZEOF_MAGIC);
     current_pos += H5O_SIZEOF_HDR(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst);
 
     /* Loop through destination messages, updating their "raw" info */
@@ -997,8 +997,8 @@ done:
  *
  * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:  Peter Cao       
- *              Aug 7 2006 
+ * Programmer:  Peter Cao
+ *              Aug 7 2006
  *
  *-------------------------------------------------------------------------
  */
@@ -1053,8 +1053,8 @@ done:
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:  Peter Cao	
- *		Aug 7 2006 
+ * Programmer:  Peter Cao
+ *		Aug 7 2006
  *
  *-------------------------------------------------------------------------
  */
@@ -1120,7 +1120,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
         uint8_t *buf;           /* Buffer to store serialized selection in */
         H5HG_t hobjid;          /* Heap object ID */
         size_t buf_size;        /* Length of object in heap */
-  
+
         /* Making equivalent references in the destination file */
         for(i = 0; i < ref_count; i++) {
             /* Get the heap ID for the dataset region */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index ba343bc..a39d7cc 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -60,7 +60,7 @@ static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
 #define H5O_SHARED_COPY_FILE		H5O_dtype_shared_copy_file
 #define H5O_SHARED_COPY_FILE_REAL	H5O_dtype_copy_file
 #define H5O_SHARED_POST_COPY_FILE	H5O_dtype_shared_post_copy_file
-#undef  H5O_SHARED_POST_COPY_FILE_REAL	
+#undef  H5O_SHARED_POST_COPY_FILE_REAL
 #define H5O_SHARED_DEBUG		H5O_dtype_shared_debug
 #define H5O_SHARED_DEBUG_REAL		H5O_dtype_debug
 #include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
@@ -1131,7 +1131,7 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
                         ret_value += offset_nbytes; 	/*member offset*/
                     if(dt->shared->version >= H5O_DTYPE_VERSION_2)
                         ret_value += 4; 	/*member offset*/
-                    else 
+                    else
                         ret_value += 4 +	/*member offset*/
                              1 +		/*dimensionality*/
                              3 +		/*reserved*/
@@ -1295,7 +1295,7 @@ done:
  * Function:	H5O_dtype_can_share
  *
  * Purpose:	Determines if this datatype is allowed to be shared or
- *              not.  Immutable datatypes or datatypes that are already 
+ *              not.  Immutable datatypes or datatypes that are already
  *              shared cannot be shared (again).
  *
  * Return:	TRUE if datatype can be shared
@@ -1389,12 +1389,12 @@ done:
 
 /*-------------------------------------------------------------------------
  * Function:    H5O_dtype_copy_file
- *  
+ *
  * Purpose:     Copy a native datatype message from one file to another.
  *
  * Return:      Success:        Native copy of message
  *              Failure:        NULL
- *  
+ *
  * Programmer:  James Laird
  *              December 12, 2006
  *
diff --git a/src/H5Omdj_msg.c b/src/H5Omdj_msg.c
index e63aafe..954f61f 100644
--- a/src/H5Omdj_msg.c
+++ b/src/H5Omdj_msg.c
@@ -28,8 +28,8 @@
  *
  * Modifications:
  *
- *              Re-worked message to include the journal file name and 
- *		magic, instead of simply containing a pointer to a 
+ *              Re-worked message to include the journal file name and
+ *		magic, instead of simply containing a pointer to a
  *		journal configuration block containing this data.
  *
  *-------------------------------------------------------------------------
@@ -104,7 +104,7 @@ const H5O_msg_class_t H5O_MSG_MDJ_CONF[1] = {{
 /*-------------------------------------------------------------------------
  * Function:    H5O_mdj_msg_decode
  *
- * Purpose:     Decode a journaling configuration message and return a 
+ * Purpose:     Decode a journaling configuration message and return a
  * 		pointer to a newly allocated H5O_mdj_msg_t struct.
  *
  * Return:      Success:        Ptr to new message in native struct.
@@ -117,8 +117,8 @@ const H5O_msg_class_t H5O_MSG_MDJ_CONF[1] = {{
  */
 
 static void *
-H5O_mdj_msg_decode(H5F_t *f, 
-		    hid_t UNUSED dxpl_id, 
+H5O_mdj_msg_decode(H5F_t *f,
+		    hid_t UNUSED dxpl_id,
 		    unsigned UNUSED mesg_flags,
 		    const uint8_t *p)
 {
@@ -145,7 +145,7 @@ H5O_mdj_msg_decode(H5F_t *f,
 
     /* Allocate space for message */
 
-    if ( NULL == 
+    if ( NULL ==
          (mesg = (H5O_mdj_msg_t *)H5MM_calloc(sizeof(H5O_mdj_msg_t))) ) {
 
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, \
@@ -186,8 +186,8 @@ H5O_mdj_msg_decode(H5F_t *f,
 
     /* copy out the journal file path -- check length in passing.
      *
-     * we could probably do this faster with a memcpy(), but this 
-     * operation happens very infrequently, and doing it this way 
+     * we could probably do this faster with a memcpy(), but this
+     * operation happens very infrequently, and doing it this way
      * adds a bit of sanity checking.
      */
     i = 0;
@@ -199,7 +199,7 @@ H5O_mdj_msg_decode(H5F_t *f,
     } while ( ( ch != '\0' ) && ( i <= path_len ) );
 
     if ( ( ch != '\0' ) || ( i != path_len + 1 ) ) {
-    
+
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, \
 		    "bad path and/or path len")
     }
@@ -228,9 +228,9 @@ done:
  */
 
 static herr_t
-H5O_mdj_msg_encode(H5F_t *f, 
-		    hbool_t UNUSED disable_shared, 
-		    uint8_t *p, 
+H5O_mdj_msg_encode(H5F_t *f,
+		    hbool_t UNUSED disable_shared,
+		    uint8_t *p,
 		    const void *_mesg)
 {
     const H5O_mdj_msg_t *mesg = (const H5O_mdj_msg_t *)_mesg;
@@ -245,7 +245,7 @@ H5O_mdj_msg_encode(H5F_t *f,
     HDassert(f);
     HDassert(p);
     HDassert(mesg);
-    
+
     if ( ( f == NULL ) || ( p == NULL ) || ( mesg == NULL ) ) {
 
 	HGOTO_ERROR(H5E_SYSTEM, H5E_SYSERRSTR, FAIL, "Bad params on entry.");
@@ -335,8 +335,8 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest)
 
     /* copy the journal file path -- check length in passing.
      *
-     * we could probably do this faster with a memcpy(), but this 
-     * operation happens very infrequently, and doing it this way 
+     * we could probably do this faster with a memcpy(), but this
+     * operation happens very infrequently, and doing it this way
      * adds a bit of sanity checking.
      */
     if ( mesg->mdc_jnl_file_name_len == 0 ) {
@@ -350,7 +350,7 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest)
         size_t path_len;
 
         path_len = mesg->mdc_jnl_file_name_len;
-    
+
         do {
 
 	    ch = (mesg->mdc_jnl_file_name)[i];
@@ -359,7 +359,7 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest)
         } while ( ( ch != '\0' ) && ( i <= path_len ) );
 
         if ( ( ch != '\0' ) || ( i != path_len + 1 ) ) {
-    
+
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, \
 		    "bad path and/or path len???")
         }
@@ -390,8 +390,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_mdj_msg_size(const H5F_t *f, 
-		  hbool_t UNUSED disable_shared, 
+H5O_mdj_msg_size(const H5F_t *f,
+		  hbool_t UNUSED disable_shared,
 		  const void *_mesg)
 {
     const H5O_mdj_msg_t * mesg = (const H5O_mdj_msg_t *)_mesg;
@@ -459,11 +459,11 @@ H5O_mdj_msg_reset(void *_mesg)
  */
 
 static herr_t
-H5O_mdj_msg_debug(H5F_t UNUSED *f, 
-		   hid_t UNUSED dxpl_id, 
-		   const void *_mesg, 
+H5O_mdj_msg_debug(H5F_t UNUSED *f,
+		   hid_t UNUSED dxpl_id,
+		   const void *_mesg,
 		   FILE *stream,
-		   int indent, 
+		   int indent,
 		   int fwidth)
 {
     const H5O_mdj_msg_t *mesg = (const H5O_mdj_msg_t *)_mesg;
@@ -478,19 +478,19 @@ H5O_mdj_msg_debug(H5F_t UNUSED *f,
     HDassert(fwidth >= 0);
 
     HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
-             "mdc_jnl_enabled:", 
+             "mdc_jnl_enabled:",
 	     (int)(mesg->mdc_jnl_enabled));
 
     HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
-             "mdc_jnl_magic:", 
+             "mdc_jnl_magic:",
 	     (int)(mesg->mdc_jnl_magic));
 
     HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth,
-             "mdc_jnl_file_name_len:", 
+             "mdc_jnl_file_name_len:",
 	     (int)(mesg->mdc_jnl_file_name_len));
 
     HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth,
-             "mdc_jnl_file_name:", 
+             "mdc_jnl_file_name:",
 	     (char *)(mesg->mdc_jnl_file_name));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 38cce08..d3c14cd 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -74,7 +74,7 @@ typedef struct {
 /********************/
 
 static herr_t H5O_msg_reset_real(const H5O_msg_class_t *type, void *native);
-static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, 
+static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
     unsigned sequence, hbool_t *oh_modified, void *_udata/*in,out*/);
 static herr_t H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx,
     const H5O_msg_class_t *type, const void *mesg, unsigned mesg_flags,
@@ -1685,7 +1685,7 @@ H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg)
     HDassert(share);
     HDassert(share->type != H5O_SHARE_TYPE_UNSHARED);
 
-    /* If there's a special action for this class that needs to be performed 
+    /* If there's a special action for this class that needs to be performed
      *  when setting the shared component, do that
      */
     if(type->set_share) {
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index df4bdd4..be6c754 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -242,7 +242,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fla
 
 	the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0);
     }
-#else 
+#else
     /*
      * The catch-all.  If we can't convert a character string universal
      * coordinated time to a time_t value reliably then we can't decode the
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index 2e180ef..d18d7e6 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -43,7 +43,7 @@
  */
 #define H5O_VERSION_2		2
 
-/* The latest version of the format.  Look through the 'flush' 
+/* The latest version of the format.  Look through the 'flush'
  *      and 'size' callback for places to change when updating this. */
 #define H5O_VERSION_LATEST	H5O_VERSION_2
 
@@ -450,7 +450,7 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_NAME[1];
  */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_MTIME[1];
 
-/* Shared Message information message (0x000f) 
+/* Shared Message information message (0x000f)
  * A message for the superblock extension, holding information about
  * the file-wide shared message "SOHM" table
  */
@@ -468,13 +468,13 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_STAB[1];
  */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_MTIME_NEW[1];
 
-/* v1 B-tree 'K' value message (0x0013) 
+/* v1 B-tree 'K' value message (0x0013)
  * A message for the superblock extension, holding information about
  * the file-wide v1 B-tree 'K' values.
  */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_BTREEK[1];
 
-/* Driver info message (0x0014) 
+/* Driver info message (0x0014)
  * A message for the superblock extension, holding information about
  * the file driver settings
  */
@@ -573,7 +573,7 @@ H5_DLL herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg);
 H5_DLL herr_t H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst, 
+H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst,
     const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst,
     hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
 H5_DLL herr_t H5O_shared_post_copy_file (H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *mesg);
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 9a926c1..5f983ff 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -38,7 +38,7 @@ static void *H5O_pline_copy(const void *_mesg, void *_dest);
 static size_t H5O_pline_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O_pline_reset(void *_mesg);
 static herr_t H5O_pline_free(void *_mesg);
-static herr_t H5O_pline_pre_copy_file(H5F_t *file_src, 
+static herr_t H5O_pline_pre_copy_file(H5F_t *file_src,
     const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata);
 static herr_t H5O_pline_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
     FILE * stream, int indent, int fwidth);
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 4cac29d..657b3b5 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -517,11 +517,11 @@ typedef uint32_t H5O_refcount_t;        /* Contains # of links to object, if >1
  * below:
  *
  * mdc_jnl_enabled: Boolean flag indicating whether metadata journaling
- * 	is currently enabled.  
+ * 	is currently enabled.
  *
  * mdc_jnl_magic: Randomly selected int32_t used to reduce the possibility
- *	of running the wrong journal on an HDF5 file.  The basic idea is 
- *	to pick a random number, store it in both the HDF5 file and the 
+ *	of running the wrong journal on an HDF5 file.  The basic idea is
+ *	to pick a random number, store it in both the HDF5 file and the
  *	journal file, and then refuse to run the journal unless the numbers
  *	match.
  *
@@ -531,8 +531,8 @@ typedef uint32_t H5O_refcount_t;        /* Contains # of links to object, if >1
  *
  *	The value of this field is undefined unless mdc_jnl_enabled is TRUE.
  *
- * mdc_jnl_file_name: Array of char of length 
- *	H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1 used to store the journal 
+ * mdc_jnl_file_name: Array of char of length
+ *	H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1 used to store the journal
  *	file path.
  *
  *	The value of this field is undefined unless mdc_jnl_enabled is TRUE.
@@ -656,7 +656,7 @@ H5_DLL herr_t H5O_msg_get_crt_index(unsigned type_id, const void *mesg,
     H5O_msg_crt_idx_t *crt_idx);
 H5_DLL herr_t H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared,
     unsigned char *buf, const void *obj);
-H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, unsigned type_id, 
+H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     const unsigned char *buf);
 H5_DLL herr_t H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     unsigned type_id, void *mesg);
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index acce42c..ddf1a93 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -171,7 +171,7 @@ H5_DLL herr_t H5Ovisit_by_name(hid_t loc_id, const char *obj_name,
 H5_DLL herr_t H5Oclose(hid_t object_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index e406065..9e0c4b2 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -489,7 +489,7 @@ H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     HDassert(f);
     HDassert(sh_mesg);
 
-    /* 
+    /*
      * Committed datatypes increment the OH of the original message when they
      * are written (in H5O_shared_link) and decrement it here.
      * SOHMs in the heap behave differently; their refcount is incremented
@@ -555,7 +555,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_copy_file(H5F_t UNUSED *file_src, H5F_t *file_dst, 
+H5O_shared_copy_file(H5F_t UNUSED *file_src, H5F_t *file_dst,
     const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst,
     hbool_t UNUSED *recompute_size, H5O_copy_t *cpy_info, void UNUSED *udata,
     hid_t dxpl_id)
@@ -614,7 +614,7 @@ done:
  * Purpose:     Delate a shared message and replace with a new one.
  *              The function is needed at cases such as coping a shared reg_ref attribute.
  *              When a shared reg_ref attribute is copied from one file to
- *              another, the values in file need to be replaced. The only way 
+ *              another, the values in file need to be replaced. The only way
  *              to complish that is to delete the old message and write the
  *              new message with the correct values.
  *
diff --git a/src/H5Oshared.h b/src/H5Oshared.h
index 582d29b..0482e71 100644
--- a/src/H5Oshared.h
+++ b/src/H5Oshared.h
@@ -350,7 +350,7 @@ done:
     if(!ret_value)
         if(dst_mesg)
             H5O_msg_free(H5O_SHARED_TYPE->id, dst_mesg);
-    
+
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_COPY_FILE() */
 
@@ -395,7 +395,7 @@ H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src,
 
 #ifdef H5O_SHARED_POST_COPY_FILE_REAL
     /* Call native message's copy file callback to copy the message */
-    if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 ) 
+    if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 )
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy native message to another file")
 #endif /* H5O_SHARED_POST_COPY_FILE_REAL */
 
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 49c59bf..2ee2802 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -254,7 +254,7 @@ H5P_dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void UNUSED *copy_data)
         {
             dst_efl.slot[i].name_offset = 0;
         }
-        
+
     }
 
 
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 8bc263a..11d8ddb 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -572,7 +572,7 @@ H5Pset_data_transform(hid_t plist_id, const char *expression)
     /* See if a data transform is already set, and free it if it is */
     if(H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) >= 0)
 	H5Z_xform_destroy(data_xform_prop);
-	    
+
     /* Create data transform info from expression */
     if(NULL == (data_xform_prop = H5Z_xform_create(expression)))
         HGOTO_ERROR(H5E_PLINE, H5E_NOSPACE, FAIL, "unable to create data transform info")
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 8fd4909..e7f0518 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -100,7 +100,7 @@ static herr_t H5P_fcrt_reg_prop(H5P_genclass_t *pclass);
 
 /* File creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_FCRT[1] = {{
-    "file create",		/* Class name for debugging     */ 
+    "file create",		/* Class name for debugging     */
     &H5P_CLS_GROUP_CREATE_g,	/* Parent class ID              */
     &H5P_CLS_FILE_CREATE_g,	/* Pointer to class ID          */
     &H5P_LST_FILE_CREATE_g,	/* Pointer to default property list ID */
@@ -878,7 +878,7 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_
 
     /* Check that values are sensible.  The min_btree value must be no greater
      * than the max list plus one.
-     * 
+     *
      * Range check to make certain they will fit into encoded form.
      */
     if(max_list + 1 < min_btree)
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 8987c49..db80148 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -315,7 +315,7 @@ done:
  * Purpose:     Set a prefix to be applied to the path of any external links
  *              traversed.  The prefix is appended to the filename stored
  *              in the external link.
- * 
+ *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	James Laird
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 52cc945..9e7bea8 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -385,7 +385,7 @@ H5_DLL herr_t H5Pset_copy_object(hid_t plist_id, unsigned crt_intmd);
 H5_DLL herr_t H5Pget_copy_object(hid_t plist_id, unsigned *crt_intmd /*out*/);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Ptest.c b/src/H5Ptest.c
index 4a3bca5..a91da47 100644
--- a/src/H5Ptest.c
+++ b/src/H5Ptest.c
@@ -154,8 +154,8 @@ H5P_reset_external_file_test(hid_t dcpl_id)
     /* Check arguments */
     if(NULL == (plist = H5I_object(dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
-     
-    /* get external file list */ 
+
+    /* get external file list */
     if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
@@ -163,7 +163,7 @@ H5P_reset_external_file_test(hid_t dcpl_id)
     if(H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release external file list info")
 
-    /* set external file list */ 
+    /* set external file list */
     if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index 975104e..04d319b 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -68,7 +68,7 @@ H5_DLL ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref,
     char *name/*out*/, size_t size);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5SM.c b/src/H5SM.c
index a2d5bbb..8950f80 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -69,7 +69,7 @@ static herr_t H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     unsigned *cache_flags_ptr);
 static herr_t H5SM_decr_ref(void *record, void *op_data, hbool_t *changed);
 static herr_t H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5SM_index_header_t *header, const H5O_shared_t * mesg, 
+    H5SM_index_header_t *header, const H5O_shared_t * mesg,
     unsigned *cache_flags, void ** /*out*/ encoded_mesg);
 static herr_t H5SM_type_to_flag(unsigned type_id, unsigned *type_flag);
 static herr_t H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence,
@@ -2039,7 +2039,7 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data)
 herr_t
 H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     const H5O_shared_t *sh_mesg, hsize_t *ref_count)
-{    
+{
     H5HF_t *fheap = NULL;               /* Fractal heap that contains shared messages */
     H5SM_master_table_t *table = NULL;  /* SOHM master table */
     H5SM_list_t *list = NULL;           /* SOHM index list for message type (if in list form) */
@@ -2581,7 +2581,7 @@ done:
  *
  * Purpose:     Loop through the master SOHM table (if there is one) to:
  *			1. collect storage used for header
- *                      1. collect storage used for B-tree and List 
+ *                      1. collect storage used for B-tree and List
  *			   (include btree storage used by huge objects in fractal heap)
  *                      2. collect fractal heap storage
  *
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 35b13ba..5945cea 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -63,7 +63,7 @@ static herr_t H5SM_table_free_icr(haddr_t addr, size_t len, void *thing);
 
 static void *H5SM_list_deserialize(haddr_t addr, size_t len, const void *image,
     void *udata, hbool_t *dirty);
-static herr_t H5SM_list_serialize(const H5F_t * f, hid_t dxpl_id, haddr_t addr, 
+static herr_t H5SM_list_serialize(const H5F_t * f, hid_t dxpl_id, haddr_t addr,
     size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr,
     size_t *new_len, void **new_image);
 static herr_t H5SM_list_free_icr(haddr_t addr, size_t len, void *thing);
@@ -121,7 +121,7 @@ const H5AC2_class_t H5AC2_SOHM_LIST[1] = {{
  *-------------------------------------------------------------------------
  */
 static void *
-H5SM_table_deserialize(haddr_t UNUSED addr, size_t UNUSED len, 
+H5SM_table_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     const void *image, void *_udata, hbool_t UNUSED *dirty)
 {
     H5SM_master_table_t *table = NULL;
@@ -224,7 +224,7 @@ done:
         (void)H5SM_table_dest(table);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5SM_table_deserialize() */ 
+} /* end H5SM_table_deserialize() */
 
 
 /*-------------------------------------------------------------------------
@@ -242,7 +242,7 @@ done:
  */
 static herr_t
 H5SM_table_serialize(const H5F_t * f, hid_t UNUSED dxlp_id, haddr_t UNUSED addr,
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5SM_master_table_t *table = (H5SM_master_table_t *)_thing;
@@ -254,7 +254,7 @@ H5SM_table_serialize(const H5F_t * f, hid_t UNUSED dxlp_id, haddr_t UNUSED addr,
 
     /* check arguments */
     HDassert(f);
-    HDassert(image);    
+    HDassert(image);
     HDassert(table);
     HDassert(H5F_addr_defined(addr));
 
@@ -340,7 +340,7 @@ H5SM_table_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing)
 
     /* Destroy Shared Object Header Message */
     H5SM_table_dest(thing);
-    
+
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_table_free_icr() */
 
@@ -454,8 +454,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5SM_list_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, 
-    size_t UNUSED len, void *image, void *_thing, unsigned *flags, 
+H5SM_list_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
+    size_t UNUSED len, void *image, void *_thing, unsigned *flags,
     haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image)
 {
     H5SM_list_t *list = (H5SM_list_t *)_thing;
@@ -536,6 +536,6 @@ H5SM_list_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing)
 
     /* Destroy Shared Object Header Message */
     H5SM_list_dest(thing);
-    
+
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5SM_list_free_icr() */
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index d2afe6c..b74d27a 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -78,7 +78,7 @@
 herr_t
 H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     size_t *mesg_count)
-{    
+{
     H5SM_master_table_t *table = NULL;  /* SOHM master table */
     herr_t ret_value = SUCCEED;         /* Return value */
 
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 725b8fc..1f69706 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -293,7 +293,7 @@ H5S_mpio_hyper_type( const H5S_t *space, size_t elmt_size,
             goto empty;
 #ifdef H5S_DEBUG
   if(H5DEBUG(S))
-            HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC); 
+            HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC);
 #endif
         for ( i=0; i<rank; ++i) {
             d[i].start = diminfo[i].start+space->select.offset[i];
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index e13e6be..b7818a2 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -44,7 +44,7 @@
  */
 #define H5O_SDSPACE_VERSION_2	2
 
-/* The latest version of the format.  Look through the 'encode' 
+/* The latest version of the format.  Look through the 'encode'
  *      and 'size' callbacks for places to change when updating this. */
 #define H5O_SDSPACE_VERSION_LATEST H5O_SDSPACE_VERSION_2
 
diff --git a/src/H5T.c b/src/H5T.c
index 98597cc..5910301 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -4476,7 +4476,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
     }
 
     /* Set the flag to indicate both source and destination types are compound types
-     * for the optimization of data reading (in H5Dio.c). */ 
+     * for the optimization of data reading (in H5Dio.c). */
     if(H5T_COMPOUND==H5T_get_class(src, TRUE) && H5T_COMPOUND==H5T_get_class(dst, TRUE))
         path->are_compounds = TRUE;
 
@@ -4528,8 +4528,8 @@ H5T_path_noop(const H5T_path_t *p)
  * Function:	H5T_path_compound_subset
  *
  * Purpose:	Checks if the source and destination types are both compound.
- *              Tells whether whether the source members are a subset of 
- *              destination, and the order is the same, and no conversion 
+ *              Tells whether whether the source members are a subset of
+ *              destination, and the order is the same, and no conversion
  *              is needed.  For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index a91c09a..b92c894 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -35,7 +35,7 @@ typedef struct H5T_conv_struct_t {
     hid_t	*src_memb_id;		/*source member type ID's	     */
     hid_t	*dst_memb_id;		/*destination member type ID's	     */
     H5T_path_t	**memb_path;		/*conversion path for each member    */
-    H5T_subset_t     smembs_subset;     /*are source and dest members a subset of each other? */ 
+    H5T_subset_t     smembs_subset;     /*are source and dest members a subset of each other? */
 } H5T_conv_struct_t;
 
 /* Conversion data for H5T_conv_enum() */
@@ -1703,8 +1703,8 @@ done:
  *
  * Modifications:
  *              Raymond Lu, 3 May 2007
- *              Added the detection for a special optimization case when the 
- *              source and destination members are a subset of each other, and 
+ *              Added the detection for a special optimization case when the
+ *              source and destination members are a subset of each other, and
  *              the order is the same, and no conversion is needed.  For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
@@ -1721,9 +1721,9 @@ done:
  *                  };                             TYPE4 D;
  *                                                 TYPE5 E;
  *                                             };
- *              The optimization is simply moving data to the appropriate 
+ *              The optimization is simply moving data to the appropriate
  *              places in the buffer.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1834,9 +1834,9 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
             priv->smembs_subset = H5T_SUBSET_SRC;
             for (i=0; i<src_nmembs; i++) {
                 /* If any of source members doesn't have counterpart in the same order or
-                 * there's conversion between members, don't do the optimization. */ 
+                 * there's conversion between members, don't do the optimization. */
                 if(src2dst[i] != i || (src->shared->u.compnd.memb[i].offset !=
-                    dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == 
+                    dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop ==
                     FALSE)
                     priv->smembs_subset = H5T_SUBSET_FALSE;
             }
@@ -1844,16 +1844,16 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
             priv->smembs_subset = H5T_SUBSET_DST;
             for (i=0; i<dst_nmembs; i++) {
                 /* If any of source members doesn't have counterpart in the same order or
-                 * there's conversion between members, don't do the optimization. */ 
+                 * there's conversion between members, don't do the optimization. */
                 if(src2dst[i] != i || (src->shared->u.compnd.memb[i].offset !=
-                    dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == 
+                    dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop ==
                     FALSE)
                     priv->smembs_subset = H5T_SUBSET_FALSE;
             }
         } else /* If the numbers of source and dest members are equal and no conversion is needed,
                 * the case should have been handled as noop earlier in H5Dio.c. */
           ;
-     
+
     }
 
     cdata->recalc = FALSE;
@@ -1868,7 +1868,7 @@ done:
  *
  * Purpose:     A quick way to return a field in a struct private in this
  *              file.  The flag SMEMBS_SUBSET indicates whether the source
- *              members are a subset of destination or the destination 
+ *              members are a subset of destination or the destination
  *              members are a subset of the source, and the order is the
  *              same, and no conversion is needed.  For example:
  *                  struct source {            struct destination {
@@ -1879,7 +1879,7 @@ done:
  *                                                 TYPE5 E;
  *                                             };
  *
- * Return:      One of the value from H5T_subset_t.	
+ * Return:      One of the value from H5T_subset_t.
  *
  * Programmer:	Raymond Lu
  *		8 June 2007
@@ -2173,8 +2173,8 @@ done:
  *              datatype.
  *
  *              Raymond Lu, 3 May 2007
- *              Optimize a special case when the source and destination members 
- *              are a subset of each other, and the order is the same, and no 
+ *              Optimize a special case when the source and destination members
+ *              are a subset of each other, and the order is the same, and no
  *              conversion is needed.  For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
@@ -2183,9 +2183,9 @@ done:
  *                  };                             TYPE4 D;
  *                                                 TYPE5 E;
  *                                             };
- *              The optimization is simply moving data to the appropriate 
+ *              The optimization is simply moving data to the appropriate
  *              places in the buffer.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -2323,16 +2323,16 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
             }
 
             if(priv->smembs_subset == H5T_SUBSET_SRC || priv->smembs_subset == H5T_SUBSET_DST) {
-                /* If the optimization flag is set to indicate source members are a subset and 
+                /* If the optimization flag is set to indicate source members are a subset and
                  * in the top of the destination, simply copy the source members to background buffer. */
                 xbuf = buf;
                 xbkg = bkg;
                 if(dst->shared->size <= src->shared->size)
                     /* This is to deal with a very special situation when the fields and their
-                     * offset for both source and destination are identical but the datatype 
-                     * sizes of source and destination are different.  The library still 
-                     * considers these two types different and does conversion.  It happens 
-                     * in table API test (hdf5/hl/test/test_table.c) when a table field is 
+                     * offset for both source and destination are identical but the datatype
+                     * sizes of source and destination are different.  The library still
+                     * considers these two types different and does conversion.  It happens
+                     * in table API test (hdf5/hl/test/test_table.c) when a table field is
                      * deleted.
                      */
                     copy_size = dst->shared->size;
@@ -2340,7 +2340,7 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                     copy_size = src->shared->size;
 
                 for (elmtno=0; elmtno<nelmts; elmtno++) {
-                    HDmemmove(xbkg, xbuf, copy_size); 
+                    HDmemmove(xbkg, xbuf, copy_size);
 
                     /* Update pointers */
                     xbuf += buf_stride;
@@ -3049,7 +3049,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                                 uint8_t *tmp_p;
                                 /* TMP_P is reset each time in the loop because DST_BASE_SIZE may include some data in addition to VL info. - SLU */
                                 for(u=seq_len; u<bg_seq_len; u++) {
-                                    tmp_p = (uint8_t*)tmp_buf + u*dst_base_size;  
+                                    tmp_p = (uint8_t*)tmp_buf + u*dst_base_size;
                                     UINT32DECODE(tmp_p, parent_seq_len);
                                     if(parent_seq_len>0) {
                                         H5F_addr_decode(dst->shared->u.vlen.f, (const uint8_t **)&tmp_p, &(parent_hobjid.addr));
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 36f8006..ba3d749 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -73,7 +73,7 @@ typedef struct H5T_conv_cb_t {
  */
 typedef enum {
     H5T_SUBSET_BADVALUE = -1,   /* Invalid value */
-    H5T_SUBSET_FALSE = 0,       /* Source and destination aren't subset of each other */ 
+    H5T_SUBSET_FALSE = 0,       /* Source and destination aren't subset of each other */
     H5T_SUBSET_SRC,             /* Source is the subset of dest and no conversion is needed */
     H5T_SUBSET_DST,             /* Dest is the subset of source and no conversion is needed */
     H5T_SUBSET_CAP              /* Must be the last value */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 40a2a4d..95539ab 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -592,7 +592,7 @@ H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts,
 			  void *buf, void *background, hid_t plist_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 7211a2b..ce60650 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -77,7 +77,7 @@ typedef int H5Z_filter_t;
 /* Macros for the shuffle filter */
 #define H5Z_SHUFFLE_USER_NPARMS    0    /* Number of parameters that users can set */
 #define H5Z_SHUFFLE_TOTAL_NPARMS   1    /* Total number of parameters for filter */
- 
+
 /* Macros for the szip filter */
 #define H5Z_SZIP_USER_NPARMS    2       /* Number of parameters that users can set */
 #define H5Z_SZIP_TOTAL_NPARMS   4       /* Total number of parameters for filter */
@@ -85,7 +85,7 @@ typedef int H5Z_filter_t;
 #define H5Z_SZIP_PARM_PPB       1       /* "User" parameter for pixels-per-block */
 #define H5Z_SZIP_PARM_BPP       2       /* "Local" parameter for bits-per-pixel */
 #define H5Z_SZIP_PARM_PPS       3       /* "Local" parameter for pixels-per-scanline */
-   
+
 /* Macros for the nbit filter */
 #define H5Z_NBIT_USER_NPARMS     0     /* Number of parameters that users can set */
 
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index a58988e..d80d415 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -977,7 +977,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
 	if(H5Z_xform_eval_full(tree, array_size, array_type, &res) < 0)
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
 
-	if(data_xform_prop->dat_val_pointers->num_ptrs > 1)	
+	if(data_xform_prop->dat_val_pointers->num_ptrs > 1)
 	    HDmemcpy(array, res.value.dat_val, array_size * H5Tget_size(array_type));
 
         /* Free the temporary arrays we used */
diff --git a/src/H5checksum.c b/src/H5checksum.c
index 3359722..6c01508 100644
--- a/src/H5checksum.c
+++ b/src/H5checksum.c
@@ -270,7 +270,7 @@ This was tested for:
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
@@ -280,7 +280,7 @@ satisfy this are
    14  9  3  7 17  3
 Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
 for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
+used http://burtleburtle.net/bob/hash/avalanche.html to choose
 the operations, constants, and arrangements of the variables.
 
 This does not achieve avalanche.  There are input bits of (a,b,c)
@@ -320,7 +320,7 @@ produce values of c that look totally different.  This was tested for
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 These constants passed:
diff --git a/src/H5private.h b/src/H5private.h
index d5c412a..ae71826 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -495,7 +495,7 @@ typedef struct {
  * Redefine all the POSIX functions.  We should never see a POSIX
  * function (or any other non-HDF5 function) in the source!
  */
- 
+
  /* Use platform-specific versions if necessary */
 #include "H5win32defs.h"
 
@@ -503,7 +503,7 @@ typedef struct {
     #define HDabort()		abort()
 #endif /* HDabort */
 #ifndef HDabs
-    #define HDabs(X)		abs(X) 
+    #define HDabs(X)		abs(X)
 #endif /* HDabs */
 #ifndef HDaccess
     #define HDaccess(F,M)		access(F, M)
diff --git a/src/H5system.c b/src/H5system.c
index b713441..980d840 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -626,7 +626,7 @@ H5_build_extpath(const char *name, char **extpath/*out*/)
 
     *extpath = NULL;
 
-    /* 
+    /*
      * Unix: name[0] is a "/"
      * Windows: name[0-2] is "<drive letter>:\" or "<drive-letter>:/"
      */
@@ -639,17 +639,17 @@ H5_build_extpath(const char *name, char **extpath/*out*/)
         if (NULL == (new_name = (char *)H5MM_strdup(name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
-	/* 
+	/*
 	 * Windows: name[0-1] is "<drive-letter>:"
-	 * 	Get current working directory on the drive specified in NAME 
+	 * 	Get current working directory on the drive specified in NAME
 	 * Unix: does not apply
 	 */
         if (CHECK_ABS_DRIVE(name)) {
             drive = name[0] - 'A' + 1;
             retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN);
             HDstrcpy(new_name, &name[2]);
-	/* 
-	 * Windows: name[0] is a '/' or '\' 
+	/*
+	 * Windows: name[0] is a '/' or '\'
 	 *	Get current drive
 	 * Unix: does not apply
 	 */
@@ -696,11 +696,11 @@ done:
  *
  * Function: H5_get_free_ram
  *
- * Purpose:  Determine how much free ram the host system contains, and 
- *           return that value in bytes.  If this data is not available, 
+ * Purpose:  Determine how much free ram the host system contains, and
+ *           return that value in bytes.  If this data is not available,
  *           return 0.
  *
- * Return:	Number of bytes of free ram on the host system, or 
+ * Return:	Number of bytes of free ram on the host system, or
  *		zero if unable to determine this value.
  *
  * Programmer:	John Mainzer
@@ -713,7 +713,7 @@ H5_get_free_ram(void)
 {
     /* const char * fcn_name = "H5_get_free_ram()"; */
     unsigned long long free_ram = 0;
-    
+
 #ifdef H5_HAVE_SYS_SYSINFO_H /* LINUX */
 #ifdef H5_HAVE_SYSINFO /* LINUX */
     {
@@ -742,11 +742,11 @@ H5_get_free_ram(void)
  *
  * Function: H5_get_free_swap
  *
- * Purpose:  Determine how much free swap the host system contains, and 
- *           return that value in bytes.  If this data is not available, 
+ * Purpose:  Determine how much free swap the host system contains, and
+ *           return that value in bytes.  If this data is not available,
  *           return 0.
  *
- * Return:	Number of bytes of free swap on the host system, or 
+ * Return:	Number of bytes of free swap on the host system, or
  *		zero if unable to determine this value.
  *
  * Programmer:	John Mainzer
@@ -759,7 +759,7 @@ H5_get_free_swap(void)
 {
     /* const char * fcn_name = "H5_get_free_swap()"; */
     unsigned long long free_swap = 0;
-    
+
 #ifdef H5_HAVE_SYS_SYSINFO_H /* LINUX */
 #ifdef H5_HAVE_SYSINFO /* LINUX */
     {
@@ -788,11 +788,11 @@ H5_get_free_swap(void)
  *
  * Function: H5_get_physical_ram
  *
- * Purpose:  Determine how much physical ram the host system contains, and 
- *           return that value in bytes.  If this data is not available, 
+ * Purpose:  Determine how much physical ram the host system contains, and
+ *           return that value in bytes.  If this data is not available,
  *           return 0.
  *
- * Return:	Number of bytes of physical ram on the host system, or 
+ * Return:	Number of bytes of physical ram on the host system, or
  *		zero if unable to determine this value.
  *
  * Programmer:	John Mainzer
@@ -805,7 +805,7 @@ H5_get_physical_ram(void)
 {
     /* const char * fcn_name = "H5_get_physical_ram()"; */
     unsigned long long physical_ram = 0;
-    
+
 #ifdef H5_HAVE_SYS_SYSINFO_H /* LINUX */
 #ifdef H5_HAVE_SYSINFO /* LINUX */
     {
@@ -841,7 +841,7 @@ H5_get_physical_ram(void)
 
             if ( len == sizeof(l_physical_mem) ) {
 
-                if ( sysctl(pm_mib, 2, &l_physical_mem, &len, NULL, (size_t)0)  
+                if ( sysctl(pm_mib, 2, &l_physical_mem, &len, NULL, (size_t)0)
                      == -1 ) {
 
 	            /* sysctl() failed for some reason -- do nothing */
@@ -853,7 +853,7 @@ H5_get_physical_ram(void)
                 }
             } else if ( len == sizeof(ll_physical_mem) ) {
 
-                if ( sysctl(pm_mib, 2, &ll_physical_mem, &len, NULL, (size_t)0)  
+                if ( sysctl(pm_mib, 2, &ll_physical_mem, &len, NULL, (size_t)0)
                      == -1 ) {
 
 	            /* sysctl() failed for some reason -- do nothing */
@@ -865,9 +865,9 @@ H5_get_physical_ram(void)
 
             } else {
 
-		/* the initial call to sysctl() returned an unexpected size 
-		 * for the field in which to return the number of bytes of 
-                 * physical memory.  We don't know how to handle this, so 
+		/* the initial call to sysctl() returned an unexpected size
+		 * for the field in which to return the number of bytes of
+                 * physical memory.  We don't know how to handle this, so
                  * just do nothing.
                  */
 
diff --git a/test/big.c b/test/big.c
index 9899754..0874c5a 100644
--- a/test/big.c
+++ b/test/big.c
@@ -600,7 +600,7 @@ main (int ac, char **av)
     puts("Test passed with the Family Driver.");
 
     /*
-     * We shouldn't run this test if the file system doesn't support big files 
+     * We shouldn't run this test if the file system doesn't support big files
      * because we would generate multi-gigabyte files.
      */
     puts("\nChecking if file system supports big files...");
diff --git a/test/btree2.c b/test/btree2.c
index e01de65..d4347d4 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -7450,9 +7450,9 @@ main(void)
     unsigned	nerrors = 0;            /* Cumulative error count */
     int		ExpressMode;
     const char  *envval = NULL;
- 
+
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) {
 	/* Reset library */
diff --git a/test/cache.c b/test/cache.c
index 6ea92ef..7de613e 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -965,7 +965,7 @@ smoke_check_5(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -1205,7 +1205,7 @@ smoke_check_6(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -1445,7 +1445,7 @@ smoke_check_7(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (8 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -1686,7 +1686,7 @@ smoke_check_8(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -1871,9 +1871,9 @@ smoke_check_8(void)
  * 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 renames in the mix, along 
- * 		with repeated protects and unprotects.  All entries are 
+ * 		Recall that smoke check 1 is a basic functional test,
+ * 		with inserts, destroys, and renames in the mix, along
+ * 		with repeated protects and unprotects.  All entries are
  * 		marked as clean.
  *
  * Return:	void
@@ -2178,9 +2178,9 @@ smoke_check_9(void)
  * 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 renames in the mix, along 
- * 		with some repeated protects and unprotects.  About half 
+ * 		Recall that smoke check 2 is a basic functional test,
+ * 		with inserts, destroys, and renames in the mix, along
+ * 		with some repeated protects and unprotects.  About half
  * 		the entries are marked as dirty.
  *
  * Return:	void
@@ -2708,12 +2708,12 @@ check_insert_entry(void)
 
     pass = TRUE;
 
-    /* Allocate a cache, and insert entries into it using all 
+    /* Allocate a cache, and insert entries into it using all
      * combinations of flags.  Verify that the entries are inserted,
      * and that the flags have the desired effects.
      *
      * Note that the dirty parameter in insert_entry is no longer
-     * used, as we have decided that all inserted entries are 
+     * used, as we have decided that all inserted entries are
      * dirty by definition. (Which sounds very reasonable, but didn't
      * used to be the case.)
      */
@@ -2729,10 +2729,10 @@ check_insert_entry(void)
     if ( pass ) {
 
         insert_entry(cache_ptr, entry_type, 0, TRUE, H5C__NO_FLAGS_SET);
-        insert_entry(cache_ptr, entry_type, 1, TRUE, 
+        insert_entry(cache_ptr, entry_type, 1, TRUE,
                      H5C__SET_FLUSH_MARKER_FLAG);
         insert_entry(cache_ptr, entry_type, 2, TRUE, H5C__PIN_ENTRY_FLAG);
-        insert_entry(cache_ptr, entry_type, 3, TRUE, 
+        insert_entry(cache_ptr, entry_type, 3, TRUE,
 		     (H5C__SET_FLUSH_MARKER_FLAG | H5C__PIN_ENTRY_FLAG));
     }
 
@@ -2748,7 +2748,7 @@ check_insert_entry(void)
 	/* Start by checking everything we can via H5C_get_entry_status() */
 
 	result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-			              &in_cache, &is_dirty, &is_protected, 
+			              &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
         if ( result < 0 ) {
@@ -2757,10 +2757,10 @@ check_insert_entry(void)
             failure_mssg = "H5AC_get_entry_status() reports failure.";
         }
 
-	if ( pass ) { 
+	if ( pass ) {
 
 	    /* check the universals */
-	    if ( ( ! in_cache ) || ( ! is_dirty ) || ( is_protected ) || 
+	    if ( ( ! in_cache ) || ( ! is_dirty ) || ( is_protected ) ||
                  ( entry_size != entry_sizes[entry_type] ) ) {
 
                 pass = FALSE;
@@ -2819,7 +2819,7 @@ check_insert_entry(void)
 		search_ptr = cache_ptr->pel_head_ptr;
 
 		while ( ( search_ptr != NULL ) &&
-			( search_ptr != 
+			( search_ptr !=
 			  (struct H5C_cache_entry_t *)entry_ptr ) )
 		{
 		    search_ptr = search_ptr->next;
@@ -2841,7 +2841,7 @@ check_insert_entry(void)
 		search_ptr = cache_ptr->LRU_head_ptr;
 
 		while ( ( search_ptr != NULL ) &&
-			( search_ptr != 
+			( search_ptr !=
 			  (struct H5C_cache_entry_t *)entry_ptr ) )
 		{
 		    search_ptr = search_ptr->next;
@@ -2864,7 +2864,7 @@ check_insert_entry(void)
 		search_ptr = cache_ptr->dLRU_head_ptr;
 
 		while ( ( search_ptr != NULL ) &&
-			( search_ptr != 
+			( search_ptr !=
 			  (struct H5C_cache_entry_t *)entry_ptr ) )
 		{
 		    search_ptr = search_ptr->aux_next;
@@ -2884,8 +2884,8 @@ check_insert_entry(void)
     } /* while */
 
 
-    /* So much for looking at the individual entries.  Now verify 
-     * that the various counts and sized in the cache header are 
+    /* So much for looking at the individual entries.  Now verify
+     * that the various counts and sized in the cache header are
      * as expected.
      */
 
@@ -5383,9 +5383,9 @@ check_flush_cache__pe_multi_entry_test(H5C_t * cache_ptr,
 /*-------------------------------------------------------------------------
  * 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 
+ * 		These are tests that test the cache's ability to handle
  * 		the case in which the flush callback dirties, resizes,
  * 		and/or renames entries.
  *
@@ -5421,7 +5421,7 @@ check_flush_cache__flush_ops(H5C_t * cache_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 
+	 * 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;
@@ -5431,9 +5431,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 2 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 2;
 	size_t expected_index_size	= 2 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[2] = 
+	struct fo_flush_cache_test_spec spec[2] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 0,
@@ -5461,7 +5461,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
 	  },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 1,
@@ -5529,8 +5529,8 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	 * 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.  
+	 * 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;
@@ -5539,9 +5539,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 2 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[2] = 
+	struct fo_flush_cache_test_spec spec[2] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -5569,7 +5569,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
 	  },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -5644,9 +5644,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -5723,9 +5723,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -5793,8 +5793,8 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	 * which the call back function renames 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 this entry twice, as the first run moves the entry to its
+	 * alternate address, and the second moves it back.
 	 */
         int test_num			= 5; /* and 6 */
 	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
@@ -5803,9 +5803,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -5866,15 +5866,15 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 	if ( pass ) {
@@ -5898,15 +5898,15 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 
     if ( pass ) /* test #7 & #8 */
     {
-	/* Run tests 5 & 6 again, using the flush invalidate flag on the 
+	/* 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 renames 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 this entry twice, as the first run moves the entry to its
+	 * alternate address, and the second moves it back.
 	 */
         int test_num			= 7; /* and 8 */
 	unsigned int flush_flags	= H5C__NO_FLAGS_SET;
@@ -5915,9 +5915,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -5978,15 +5978,15 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 
@@ -6016,11 +6016,11 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     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 renames the entry 
+	 * which the call back function both resizes and renames 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.  
+	 * 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;
@@ -6029,9 +6029,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6092,15 +6092,15 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 	if ( pass ) {
@@ -6128,11 +6128,11 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	 * second test.
 	 *
 	 * Single entry test verifying that the cache can handle the case in
-	 * which the call back function both resizes and renames the entry 
+	 * which the call back function both resizes and renames 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.  
+	 * 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;
@@ -6141,9 +6141,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6204,15 +6204,15 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 	if ( pass ) {
@@ -6241,9 +6241,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 
     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 
+	/* 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
@@ -6256,9 +6256,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 1 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 3;
 	size_t expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 1,
@@ -6339,9 +6339,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     {
 	/* 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 
+	 * 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
@@ -6354,9 +6354,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 1 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 1,
@@ -6435,8 +6435,8 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 
     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 
+	/* 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
@@ -6451,9 +6451,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6534,8 +6534,8 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     {
 	/* 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 
+	 * 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
@@ -6548,9 +6548,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 1 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6629,8 +6629,8 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 
     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 
+	/* 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 renames two entries that are not in cache.
 	 *
 	 * At present, I am assured that this case will never occur, but
@@ -6645,9 +6645,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6710,7 +6710,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_destroyed = */ FALSE
 	  }
 	};
-	
+
         check_flush_cache__flush_op_test(cache_ptr,
                                          test_num,
                                          flush_flags,
@@ -6723,12 +6723,12 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the renames to move the target entries back to 
-	 * their main address.  The first test moved them to their alternate 
+	/* this change forces the renames 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 renamed entries are moved forward in the slist.  In the second 
+	 * the renamed entries are moved forward in the slist.  In the second
 	 * they are moved backwards.
 	 */
 	if ( pass ) {
@@ -6758,8 +6758,8 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	/* 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 
+	 * 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 renames two entries that are not in cache.
 	 *
 	 * At present, I am assured that this case will never occur, but
@@ -6774,9 +6774,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6852,12 +6852,12 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the renames to move the target entries back to 
-	 * their main address.  The first test moved them to their alternate 
+	/* this change forces the renames 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 renamed entries are moved forward in the slist.  In the second 
+	 * the renamed entries are moved forward in the slist.  In the second
 	 * they are moved backwards.
 	 */
 	if ( pass ) {
@@ -6894,14 +6894,14 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     {
 	/* Now mix things up a bit.
 	 *
-	 * Load several entries, two of which have flush functions that 
-	 * resize, dirty, and rename two entries that are not in the 
-	 * cache.  Mark only one of these entries, and then flush the 
+	 * Load several entries, two of which have flush functions that
+	 * resize, dirty, and rename 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 
+	 * 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 
+	 * we test the two features extensively by themselves, so
 	 * it should be sufficient to verify that they play together
 	 * as expected.
 	 */
@@ -6915,9 +6915,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2) +
 					  (2 * PICO_ENTRY_SIZE);
-	struct fo_flush_cache_test_spec spec[4] = 
+	struct fo_flush_cache_test_spec spec[4] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6945,7 +6945,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 11,
@@ -6973,7 +6973,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ FALSE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -7001,7 +7001,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7113,9 +7113,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     {
 	/* Mix things up some more.
 	 *
-	 * Load lots of entries, some of which have flush functions that 
-	 * resize, dirty, and rename two entries that are not in the 
-	 * cache.  
+	 * Load lots of entries, some of which have flush functions that
+	 * resize, dirty, and rename two entries that are not in the
+	 * cache.
 	 *
 	 * Also load entries that have flush ops on entries that are in
 	 * cache.
@@ -7130,9 +7130,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 		                          (2 * (VARIABLE_ENTRY_SIZE / 4)) +
 					  (2 * (VARIABLE_ENTRY_SIZE / 2)) +
 					  (4 * PICO_ENTRY_SIZE);
-	struct fo_flush_cache_test_spec spec[6] = 
+	struct fo_flush_cache_test_spec spec[6] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7160,7 +7160,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 11,
@@ -7188,7 +7188,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -7216,7 +7216,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7244,7 +7244,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ FALSE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 4,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 10,
@@ -7272,7 +7272,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 5,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 20,
@@ -7386,9 +7386,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	 *
 	 * Mix things up some more.
 	 *
-	 * Load lots of entries, some of which have flush functions that 
-	 * resize, dirty, and rename two entries that are not in the 
-	 * cache.  
+	 * Load lots of entries, some of which have flush functions that
+	 * resize, dirty, and rename two entries that are not in the
+	 * cache.
 	 *
 	 * Also load entries that have flush ops on entries that are in
 	 * cache.
@@ -7400,9 +7400,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) + (4 * PICO_ENTRY_SIZE);
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[6] = 
+	struct fo_flush_cache_test_spec spec[6] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7430,7 +7430,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 11,
@@ -7458,7 +7458,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -7486,7 +7486,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7514,7 +7514,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 4,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 10,
@@ -7542,7 +7542,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 5,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 20,
@@ -7666,9 +7666,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 3 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 3;
 	size_t expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[3] = 
+	struct fo_flush_cache_test_spec spec[3] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -7800,9 +7800,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 3 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[3] = 
+	struct fo_flush_cache_test_spec spec[3] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -7922,22 +7922,22 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 
     if ( pass ) /* test #26 */
     {
-	/* This one is complex.  
+	/* This one is complex.
 	 *
-	 * In the following overvies table, VET stands for 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * 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
@@ -8004,9 +8004,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 10 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 13;
 	size_t expected_index_size	= 9 * VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[10] = 
+	struct fo_flush_cache_test_spec spec[10] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 200,
@@ -8357,24 +8357,24 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     {
 	/* Repeat test #26 with the flush invalidate flag.
 	 *
-	 * In the following overview table, VET stands for 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * Thus this is a bit of a smoke check to * verify that we
 	 * get the expected results.
 	 *
 	 * (VET, 100)	initially not resident in cache
@@ -8441,9 +8441,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 10 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[10] = 
+	struct fo_flush_cache_test_spec spec[10] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 200,
@@ -8793,7 +8793,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
     if ( pass ) /* test #28 */
     {
 	/* Test the expected fheap case, in which an entry dirties
-	 * and resizes itself, and dirties an entry which it has 
+	 * and resizes itself, and dirties an entry which it has
 	 * pinned.
 	 */
         int test_num			= 28;
@@ -8803,9 +8803,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 3 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 5;
 	size_t expected_index_size	= 4 * VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[5] = 
+	struct fo_flush_cache_test_spec spec[5] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -8986,7 +8986,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	/* 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 
+	 * and resizes itself, and dirties an entry which it has
 	 * pinned.
 	 */
         int test_num			= 29;
@@ -8996,9 +8996,9 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 	size_t init_expected_index_size	= 3 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[5] = 
+	struct fo_flush_cache_test_spec spec[5] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -9185,7 +9185,7 @@ check_flush_cache__flush_ops(H5C_t * cache_ptr)
 /*-------------------------------------------------------------------------
  * Function:	check_flush_cache__flush_op_test()
  *
- * Purpose:	Run a flush op flush cache test.  Of the nature of 
+ * Purpose:	Run a flush op flush cache test.  Of the nature of
  * 		flush operations, this is a multi-entry test.
  *
  * Return:	void
@@ -9222,7 +9222,7 @@ check_flush_cache__flush_op_test(H5C_t * cache_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);
-#endif 
+#endif
 
     if ( cache_ptr == NULL ) {
 
@@ -9282,23 +9282,23 @@ check_flush_cache__flush_op_test(H5C_t * cache_ptr,
              ( check[i].entry_index < 0 ) ||
              ( check[i].entry_index > max_indices[check[i].entry_type] ) ||
              ( check[i].expected_size <= (size_t)0 ) ||
-	     ( ( check[i].in_cache != TRUE ) && 
+	     ( ( check[i].in_cache != TRUE ) &&
 	       ( check[i].in_cache != FALSE ) ) ||
-	     ( ( check[i].at_main_addr != TRUE ) && 
+	     ( ( check[i].at_main_addr != TRUE ) &&
 	       ( check[i].at_main_addr != FALSE ) ) ||
-	     ( ( check[i].is_dirty != TRUE ) && 
+	     ( ( check[i].is_dirty != TRUE ) &&
 	       ( check[i].is_dirty != FALSE ) ) ||
-	     ( ( check[i].is_protected != TRUE ) && 
+	     ( ( check[i].is_protected != TRUE ) &&
 	       ( check[i].is_protected != FALSE ) ) ||
-	     ( ( check[i].is_pinned != TRUE ) && 
+	     ( ( check[i].is_pinned != TRUE ) &&
 	       ( check[i].is_pinned != FALSE ) ) ||
-	     ( ( check[i].expected_loaded != TRUE ) && 
+	     ( ( check[i].expected_loaded != TRUE ) &&
 	       ( check[i].expected_loaded != FALSE ) ) ||
-	     ( ( check[i].expected_cleared != TRUE ) && 
+	     ( ( check[i].expected_cleared != TRUE ) &&
 	       ( check[i].expected_cleared != FALSE ) ) ||
-	     ( ( check[i].expected_flushed != TRUE ) && 
+	     ( ( check[i].expected_flushed != TRUE ) &&
 	       ( check[i].expected_flushed != FALSE ) ) ||
-	     ( ( check[i].expected_destroyed != TRUE ) && 
+	     ( ( check[i].expected_destroyed != TRUE ) &&
 	       ( check[i].expected_destroyed != FALSE ) ) ) {
 
             pass = FALSE;
@@ -9338,7 +9338,7 @@ check_flush_cache__flush_op_test(H5C_t * cache_ptr,
 
 	for ( j = 0; j < spec[i].num_flush_ops; j++ )
 	{
-	    add_flush_op(spec[i].entry_type, 
+	    add_flush_op(spec[i].entry_type,
 			 spec[i].entry_index,
 			 spec[i].flush_ops[j].op_code,
 			 spec[i].flush_ops[j].type,
@@ -9420,7 +9420,7 @@ check_flush_cache__flush_op_test(H5C_t * cache_ptr,
         i = 0;
         while ( ( pass ) && ( i < check_size ) )
         {
-	    if ( check[i].in_cache != entry_in_cache(cache_ptr, 
+	    if ( check[i].in_cache != entry_in_cache(cache_ptr,
 				                     check[i].entry_type,
 						     check[i].entry_index) ) {
 
@@ -9460,7 +9460,7 @@ check_flush_cache__flush_op_test(H5C_t * cache_ptr,
 		if ( ( ! entry_ptr->header.destroy_in_progress ) &&
 		     ( check[i].in_cache ) &&
                      ( entry_ptr->header.size != check[i].expected_size ) ) {
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "(!destroy in progress and in cache and size (expected) = %d (%d).\n",
                               (int)(entry_ptr->header.size),
 			      (int)(check[i].expected_size));
@@ -9654,9 +9654,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
     test_entry_t * base_addr;
     struct expected_entry_status expected[8 + 31 + 14] =
     {
-      /* the expected array is used to maintain a table of the expected status of every 
+      /* the expected array is used to maintain a table of the expected status of every
        * entry used in this test.  Note that since the function that processes this
-       * array only processes as much of it as it is told to, we don't have to 
+       * 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                                                       */
@@ -9745,9 +9745,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
     if ( pass ) {
 
         /* the basic idea in this test is to insert a bunch of entries
-         * with flush operations associated with them, and then load 
-         * other entries into the cache until the cache is full.  At 
-         * that point, load yet more entries into the cache, and see 
+         * with flush operations associated with them, and then load
+         * 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
@@ -9765,43 +9765,43 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 */
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 0);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 0, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 0,
 			           H5C__DIRTIED_FLAG | H5C__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 2));
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 1);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 1, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 1,
 			                 H5C__NO_FLAGS_SET, (size_t)0);
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 2);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 2, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 2,
 			                 H5C__NO_FLAGS_SET, (size_t)0);
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 3);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 3, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 3,
 			           H5C__DIRTIED_FLAG | H5C__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 2));
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 4);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 4, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 4,
 			           H5C__DIRTIED_FLAG | H5C__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 2));
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 5);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 5, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 5,
 			           H5C__DIRTIED_FLAG | H5C__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 2));
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 6);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 6, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 6,
 			                 H5C__NO_FLAGS_SET, (size_t)0);
 
 	protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 7);
-	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 7, 
+	unprotect_entry_with_size_change(cache_ptr, VARIABLE_ENTRY_TYPE, 7,
 			                 H5C__NO_FLAGS_SET, (size_t)0);
 
 	if ( ( cache_ptr->index_len != 8 ) ||
-             ( cache_ptr->index_size != (4 * (VARIABLE_ENTRY_SIZE / 2)) + 
+             ( cache_ptr->index_size != (4 * (VARIABLE_ENTRY_SIZE / 2)) +
 	                                (4 * VARIABLE_ENTRY_SIZE) ) ) {
 
             pass = FALSE;
@@ -9811,7 +9811,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 
     if ( pass ) {
 
-	/* Now set up the pinning relationships: 
+	/* Now set up the pinning relationships:
 	 *
 	 * Briefly, (VET, 0) is pinned by (VET, 1), (VET, 2), and (VET, 3)
 	 *          (VET, 7) is pinned by (VET, 3), and (VET, 5)
@@ -9841,39 +9841,39 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 *
 	 *          (VET, 7) dirties (VET, 6)
 	 */
-        add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
-        add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE, 
-                     VARIABLE_ENTRY_TYPE, 0, FALSE, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE,
+                     VARIABLE_ENTRY_TYPE, 0, FALSE,
 		     3 * VARIABLE_ENTRY_SIZE / 4);
 
-        add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__DIRTY, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
-        add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__RESIZE, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__RESIZE,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE);
-        add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__RENAME, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__RENAME,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
 
-        add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
-        add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE,
                      VARIABLE_ENTRY_TYPE, 3, FALSE, VARIABLE_ENTRY_SIZE);
 
-        add_flush_op(VARIABLE_ENTRY_TYPE, 7, FLUSH_OP__DIRTY, 
+        add_flush_op(VARIABLE_ENTRY_TYPE, 7, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 6, FALSE, (size_t)0);
     }
 
     if ( pass ) {
 
-	/* to summarize, at present the following variable size entries 
+	/* 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	 5 KB	Y	Y	-	-
 	 *
-	 * (VET, 1)	Y	10 KB	N	N	0	dirty (VET, 0), 
+	 * (VET, 1)	Y	10 KB	N	N	0	dirty (VET, 0),
 	 * 							resize (VET, 0) to 7.5 KB
 	 *
 	 * (VET, 2)	Y	10 KB	N	N	0	dirty (VET, 0)
@@ -9888,11 +9888,11 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	Y	 5 KB	Y	N	7	-
 	 *
 	 * (VET, 6)	Y	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	N	Y	-	dirty (VET, 6)
 	 *
-	 * Recall that in this test bed, flush operations are excuted the 
-	 * first time the associated entry is flushed, and are then 
+	 * Recall that in this test bed, flush operations are excuted the
+	 * first time the associated entry is flushed, and are then
 	 * deleted.
 	 */
 
@@ -9900,14 +9900,14 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 0; i < 31; i++ )
 	{
 	    protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < 1; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -9926,9 +9926,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 
 	    /* verify the expected status of all entries we have loaded to date: */
             num_large_entries = 1;
-	    verify_entry_status(cache_ptr, 
+	    verify_entry_status(cache_ptr,
 			        0,
-			        (num_variable_entries + num_monster_entries + num_large_entries), 
+			        (num_variable_entries + num_monster_entries + num_large_entries),
 				expected);
 	}
     }
@@ -9936,8 +9936,8 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 
     if ( pass ) {
 
-	/* Now load a large entry.  This should result in the eviction 
-	 * of (VET,1), and the increase in the size of (VET, 0) from .5 
+	/* Now load a large entry.  This should result in the eviction
+	 * of (VET,1), and the increase in the size of (VET, 0) from .5
 	 * VARIABLE_ENTRY_SIZE to .75 VARIABLE_ENTRY_SIZE.
 	 *
 	 * The following table illustrates the intended state of affairs
@@ -9945,7 +9945,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 *
 	 * 		in
 	 * entry:	cache?	size:	dirty?	pinned?	pins:	flush operations:
-	 * 
+	 *
 	 * (VET, 0) 	Y	7.5 KB	Y	Y	-	-
 	 *
 	 * (VET, 1)	N	10 KB	N	N	-	-
@@ -9962,7 +9962,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	Y	 5 KB	Y	N	7	-
 	 *
 	 * (VET, 6)	Y	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	Y	Y	-	dirty (VET, 6)
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -9975,7 +9975,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
         num_large_entries = 2;
 
 	protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 1);
-	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 1, 
+	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 1,
                                          H5C__DIRTIED_FLAG, (size_t)0);
 
 	if ( ( cache_ptr->index_len != 40 ) ||
@@ -9994,25 +9994,25 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    1,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass ) {
 
-	/* Now load another large entry.  This should result in the eviction 
+	/* Now load another large entry.  This should result in the eviction
 	 * of (VET, 2), 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 
+	 * 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)	N	10 KB	N	N	-	-
@@ -10027,7 +10027,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	Y	 5 KB	Y	N	7	-
 	 *
 	 * (VET, 6)	Y	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	Y	Y	-	dirty (VET, 6)
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -10041,7 +10041,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
         num_large_entries = 3;
 
 	protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 2);
-	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 2, 
+	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 2,
                                          H5C__DIRTIED_FLAG, (size_t)0);
 
 	if ( ( cache_ptr->index_len != 40 ) ||
@@ -10051,7 +10051,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	                                (2 * LARGE_ENTRY_SIZE) ) ||
 	     ( cache_ptr->index_size != ((3 * VARIABLE_ENTRY_SIZE / 2) +
 				         (3 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) + 
+				         (31 * MONSTER_ENTRY_SIZE) +
 				         (3 * LARGE_ENTRY_SIZE)) ) ) {
 
             pass = FALSE;
@@ -10059,9 +10059,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    2,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
@@ -10071,16 +10071,16 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * flushed, and increasing its size from 1/2 VARIABLE_ENTRY_SIZE to
 	 * VARIABLE_ENTRY_SIZE.
 	 *
-	 * As a result of this size increase, the cache will have to look 
+	 * As a result of this size increase, the cache will have to look
 	 * for another entry to evict.  After flushing (VET, 4) and (VET, 5),
 	 * it should evict (VET, 6), yielding the needed memory.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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)	N	10 KB	N	N	-	-
@@ -10094,7 +10094,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	Y	 5 KB	N	N	7	-
 	 *
 	 * (VET, 6)	N	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	Y	Y	-	dirty (VET, 6)
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -10114,11 +10114,11 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
         num_large_entries = 5;
 
 	protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3);
-	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 3, 
+	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 3,
                                          H5C__DIRTIED_FLAG, (size_t)0);
 
 	protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 4);
-	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 4, 
+	unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, 4,
                                          H5C__DIRTIED_FLAG, (size_t)0);
 
         /* verify cache size */
@@ -10137,16 +10137,16 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    3,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    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 
+	 * 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, 7)
@@ -10155,14 +10155,14 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 0; i < 31; i++ )
 	{
 	    protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < 5; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10177,9 +10177,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    4,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
@@ -10188,12 +10188,12 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	/* Now load three more large entries.  This should result
 	 * in the eviction of (VET, 3), and the unpinning of (VET, 0)
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	10 KB	N	N	-	-
@@ -10207,7 +10207,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	Y	 5 KB	N	N	7	-
 	 *
 	 * (VET, 6)	N	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	Y	Y	-	dirty (VET, 6)
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -10222,7 +10222,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 5; i < 8; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10241,9 +10241,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    5,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
@@ -10251,12 +10251,12 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 
 	/* load another large entry.  (VET, 4) should be evicted.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	10 KB	N	N	-	-
@@ -10270,7 +10270,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	Y	 5 KB	N	N	7	-
 	 *
 	 * (VET, 6)	N	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	Y	Y	-	dirty (VET, 6)
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -10284,7 +10284,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 8; i < 9; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10304,24 +10304,24 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    6,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass ) {
 
-	/* Load another large entry.  
+	/* Load another large entry.
 	 *
-	 * (VET, 5) should be evicted, and (VET, 7) should be unpinned. 
+	 * (VET, 5) should be evicted, and (VET, 7) should be unpinned.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	10 KB	N	N	-	-
@@ -10335,7 +10335,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	N	 5 KB	N	N	-	-
 	 *
 	 * (VET, 6)	N	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	Y	10 KB	Y	N	-	dirty (VET, 6)
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -10350,7 +10350,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 9; i < 10; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10368,16 +10368,16 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    7,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    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 
+	 * 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
@@ -10386,14 +10386,14 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 0; i < 31; i++ )
 	{
 	    protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < 10; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10411,35 +10411,35 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    8,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass ) {
 
-	/* load two more large entries.  
+	/* load two more large entries.
 	 *
 	 * (VET, 0) should be flushed, but not evicted initially since it is dirty.
 	 *
-	 * (VET, 7) should be evicted, but (VET, 7) has an eviction operation that 
-	 * dirties (VET, 6).  Since (VET, 6) is not in the cache, it will be loaded.  
+	 * (VET, 7) should be evicted, but (VET, 7) has an eviction operation that
+	 * dirties (VET, 6).  Since (VET, 6) is not in the cache, it will be loaded.
 	 * Since this results in no net increase in free space, the cache will
 	 * continue to attempt to create free space.
 	 *
 	 * The cache will then flush all the monster and large entries, but since they
-	 * are all dirty, they will not be evicted.  
+	 * are all dirty, they will not be evicted.
 	 *
 	 * Finally, it will reach (VET, 0) again, and evict it on the second pass.
 	 * This finally makes the necessary space.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	10 KB	N	N	-	-
@@ -10453,12 +10453,12 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	N	 5 KB	N	N	-	-
 	 *
 	 * (VET, 6)	Y	10 KB	Y	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	N	10 KB	N	N	-	-
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
 	 *
-	 * Note that we reset the loaded, cleared, flushed, and destroyed fields of 
+	 * Note that we reset the loaded, cleared, flushed, and destroyed fields of
 	 * (VET,6) so we can track what is happening.
 	 */
 	base_addr = entries[VARIABLE_ENTRY_TYPE];
@@ -10486,7 +10486,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	/* a newly loaded entry is not inserted in the cache until after space has been
 	 * made for it.  Thus (LET, 11) will not be flushed.
 	 */
-	for ( i = num_variable_entries; 
+	for ( i = num_variable_entries;
 	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
 	      i++ )
 	{
@@ -10497,7 +10497,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 10; i < 12; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10515,34 +10515,34 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    9,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass ) {
 
         /* Again, touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to bring the last remaining VARIABLE_ENTRY_TYPE entry to the 
-	 * end of the LRU list. 
+	 * cache to bring the last remaining VARIABLE_ENTRY_TYPE entry to the
+	 * end of the LRU list.
 	 */
 	for ( i = 0; i < num_monster_entries; i++ )
 	{
 	    protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < num_large_entries; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
 	/* update the expected array to mark all these entries dirty again. */
-	for ( i = num_variable_entries; 
+	for ( i = num_variable_entries;
 	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
 	      i++ )
 	{
@@ -10563,27 +10563,27 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    10,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass ) {
-	    
-        /* Load two more large entries.  
+
+        /* Load two more large entries.
 	 *
 	 * Since (VET, 6) is dirty, at first this will just cause (VET, 6) to be flushed.
 	 *
 	 * But all other entries in the cache are dirty, so the cache will flush them all,
 	 * and then evict (VET, 6) on the second pass.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	10 KB	N	N	-	-
@@ -10597,7 +10597,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	 * (VET, 5)	N	 5 KB	N	N	-	-
 	 *
 	 * (VET, 6)	N	10 KB	N	N	-	-
-	 * 
+	 *
 	 * (VET, 7)	N	10 KB	N	N	-	-
 	 *
 	 * Start by updating the expected table for the expected changes in entry status:
@@ -10613,7 +10613,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	/* 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; 
+	for ( i = num_variable_entries;
 	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
 	      i++ )
 	{
@@ -10624,7 +10624,7 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	for ( i = 12; i < 14; i++ )
 	{
 	    protect_entry(cache_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change(cache_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10641,9 +10641,9 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status(cache_ptr, 
+	verify_entry_status(cache_ptr,
 			    11,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
@@ -10671,12 +10671,12 @@ check_flush_cache__flush_op_eviction_test(H5C_t * cache_ptr)
         }
     }
 
-#if H5C_COLLECT_CACHE_STATS 
+#if H5C_COLLECT_CACHE_STATS
     /* If we are collecting stats, check to see if we get the expected
      * values.
      *
      * Testing the stats code is fairly new, but given the extent
-     * to which I find myself depending on the stats, I've decided 
+     * to which I find myself depending on the stats, I've decided
      * to start testing the stats whenever it is convenient to do
      * so.
      */
@@ -12544,7 +12544,7 @@ check_flush_cache__single_entry_test(H5C_t * cache_ptr,
               (int)expected_flushed,
               (int)(entry_ptr->destroyed),
               (int)expected_destroyed);
-#endif 
+#endif
             pass = FALSE;
             HDsnprintf(msg, (size_t)128,
                 "Unexpected entry status after flush in single entry test #%d.",
@@ -13084,7 +13084,7 @@ check_expunge_entry(void)
          */
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13151,14 +13151,14 @@ check_expunge_entry(void)
     }
 
     /* Expunge the entry and then verify that it is no longer in the cache.
-     * Also verify that the entry was loaded, cleared, and destroyed, but 
+     * Also verify that the entry was loaded, cleared, and destroyed, but
      * not flushed.
      */
     expunge_entry(cache_ptr, 0, 0);
 
     if ( pass ) {
 
-        /* entry shouldn't be in cache -- only in_cache should be touched 
+        /* entry shouldn't be in cache -- only in_cache should be touched
 	 * by the status call.  Thus, only check that boolean.
          */
 
@@ -13193,7 +13193,7 @@ check_expunge_entry(void)
     /* now repeat the process with a different entry.  On unprotect
      * mark the entry as dirty.  Verify that it is not flushed.
      */
-    
+
     base_addr = entries[0];
     entry_ptr = &(base_addr[1]);
 
@@ -13204,7 +13204,7 @@ check_expunge_entry(void)
          */
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13243,7 +13243,7 @@ check_expunge_entry(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13279,12 +13279,12 @@ check_expunge_entry(void)
 
     if ( pass ) {
 
-        /* entry shouldn't be in cache -- only in_cache should be touched 
+        /* entry shouldn't be in cache -- only in_cache should be touched
 	 * by the status call.  Thus, only check that boolean.
          */
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13333,7 +13333,7 @@ check_expunge_entry(void)
 /*-------------------------------------------------------------------------
  * Function:	check_multiple_read_protect()
  *
- * Purpose:	Verify that multiple, simultaneous read protects of a 
+ * Purpose:	Verify that multiple, simultaneous read protects of a
  * 		single entry perform as expectd.
  *
  * Return:	void
@@ -13390,7 +13390,7 @@ check_multiple_read_protect(void)
 
         entry_ptr = &((entries[0])[0]);
 
-        if ( ( entry_ptr->header.is_protected ) || 
+        if ( ( entry_ptr->header.is_protected ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -13413,7 +13413,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro(cache_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 1 ) ) {
 
@@ -13436,7 +13436,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro(cache_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 2 ) ) {
 
@@ -13459,7 +13459,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry(cache_ptr, 0, 0, FALSE, H5C__NO_FLAGS_SET);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 1 ) ) {
 
@@ -13482,7 +13482,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro(cache_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 2 ) ) {
 
@@ -13505,7 +13505,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro(cache_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 3 ) ) {
 
@@ -13528,7 +13528,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry(cache_ptr, 0, 0, FALSE, H5C__NO_FLAGS_SET);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 2 ) ) {
 
@@ -13551,7 +13551,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry(cache_ptr, 0, 0, FALSE, H5C__NO_FLAGS_SET);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 1 ) ) {
 
@@ -13574,7 +13574,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry(cache_ptr, 0, 0, FALSE, H5C__NO_FLAGS_SET);
 
-        if ( ( entry_ptr->header.is_protected ) || 
+        if ( ( entry_ptr->header.is_protected ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -13594,7 +13594,7 @@ check_multiple_read_protect(void)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
 
-    /* If we get this far, do a write protect and unprotect to verify 
+    /* If we get this far, do a write protect and unprotect to verify
      * that the stats are getting collected properly here as well.
      */
 
@@ -13602,7 +13602,7 @@ check_multiple_read_protect(void)
     {
         protect_entry(cache_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -13625,7 +13625,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry(cache_ptr, 0, 0, FALSE, H5C__NO_FLAGS_SET);
 
-        if ( ( entry_ptr->header.is_protected ) || 
+        if ( ( entry_ptr->header.is_protected ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -13645,7 +13645,7 @@ check_multiple_read_protect(void)
 #endif /* H5C_COLLECT_CACHE_STATS */
 
 
-    /* Finally, mix things up a little, using a mix of reads and 
+    /* Finally, mix things up a little, using a mix of reads and
      * and writes on different entries.  Also include a pin to verify
      * that it works as well.
      *
@@ -14142,7 +14142,7 @@ check_resize_entry(void)
 
     /* Setup a cache and verify that it is empty.
      *
-     * Then force the load of an entry by protecting it, and verify that 
+     * Then force the load of an entry by protecting it, and verify that
      * the entry and cache have the expected sizes.
      *
      * Then unprotect the entry with the size changed flag and a reduced
@@ -14150,10 +14150,10 @@ check_resize_entry(void)
      * sizes.
      *
      * Use a second protect/unprotect cycle to restore the entry to
-     * its original size.  Verify that the entry and cache have the 
+     * its original size.  Verify that the entry and cache have the
      * expected sizes.
      *
-     * Protect and unprotect the entry again to pin it.  Use 
+     * Protect and unprotect the entry again to pin it.  Use
      * H5C_resize_entry to reduce its size.  Verify that the entry
      * and cache have the expected sizes.
      *
@@ -14165,7 +14165,7 @@ check_resize_entry(void)
      *
      *
      * Obesrve that all the above tests have been done with only one
-     * entry in the cache.  Repeat the tests with several entries in 
+     * entry in the cache.  Repeat the tests with several entries in
      * the cache.
      */
 
@@ -14218,8 +14218,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14249,9 +14249,9 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_unprotect(NULL, -1, -1, cache_ptr, 
+        result = H5C_unprotect(NULL, -1, -1, cache_ptr,
 			       &(types[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       H5C__SIZE_CHANGED_FLAG | H5C__DIRTIED_FLAG,
 			       (LARGE_ENTRY_SIZE / 2));
 
@@ -14288,8 +14288,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14322,9 +14322,9 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_unprotect(NULL, -1, -1, cache_ptr, 
+        result = H5C_unprotect(NULL, -1, -1, cache_ptr,
 			       &(types[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       (H5C__DIRTIED_FLAG | H5C__SIZE_CHANGED_FLAG),
 			       LARGE_ENTRY_SIZE);
 
@@ -14361,8 +14361,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14397,17 +14397,17 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr, 
+        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr,
 			                 (LARGE_ENTRY_SIZE / 4));
 
 	if ( result < 0 ) {
 
             pass = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C_resize_pinned_entry() reports failure 1.");
             failure_mssg = msg;
 
-	} 
+	}
     }
 
     if ( pass ) {
@@ -14426,8 +14426,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14458,17 +14458,17 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr, 
+        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr,
 			                 LARGE_ENTRY_SIZE);
 
 	if ( result < 0 ) {
 
             pass = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C_resize_pinned_entry() reports failure 2.");
             failure_mssg = msg;
 
-	} 
+	}
     }
 
     if ( pass ) {
@@ -14487,8 +14487,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14519,13 +14519,13 @@ check_resize_entry(void)
 
     protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0);
 
-    unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0, FALSE, 
+    unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0, FALSE,
 		    H5C__UNPIN_ENTRY_FLAG | H5C__DELETED_FLAG);
 
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -14630,8 +14630,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14661,9 +14661,9 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_unprotect(NULL, -1, -1, cache_ptr, 
+        result = H5C_unprotect(NULL, -1, -1, cache_ptr,
 			       &(types[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       H5C__SIZE_CHANGED_FLAG | H5C__DIRTIED_FLAG,
 			       (LARGE_ENTRY_SIZE / 2));
 
@@ -14687,10 +14687,10 @@ check_resize_entry(void)
     if ( pass ) {
 
 	if ( ( cache_ptr->index_len != 4 ) ||
-	     ( cache_ptr->index_size != 
+	     ( cache_ptr->index_size !=
 	       ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 2)) ) ||
 	     ( cache_ptr->slist_len != 2 ) ||
-	     ( cache_ptr->slist_size != 
+	     ( cache_ptr->slist_size !=
 	       (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 2)) ) ) {
 
             pass = FALSE;
@@ -14702,8 +14702,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14736,9 +14736,9 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_unprotect(NULL, -1, -1, cache_ptr, 
+        result = H5C_unprotect(NULL, -1, -1, cache_ptr,
 			       &(types[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       (H5C__DIRTIED_FLAG | H5C__SIZE_CHANGED_FLAG),
 			       LARGE_ENTRY_SIZE);
 
@@ -14775,8 +14775,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14811,26 +14811,26 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr, 
+        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr,
 			                 (LARGE_ENTRY_SIZE / 4));
 
 	if ( result < 0 ) {
 
             pass = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C_resize_pinned_entry() reports failure 3.");
             failure_mssg = msg;
 
-	} 
+	}
     }
 
     if ( pass ) {
 
 	if ( ( cache_ptr->index_len != 4 ) ||
-	     ( cache_ptr->index_size != 
+	     ( cache_ptr->index_size !=
 	       ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 4)) ) ||
 	     ( cache_ptr->slist_len != 2 ) ||
-	     ( cache_ptr->slist_size != 
+	     ( cache_ptr->slist_size !=
 	       (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 4)) ) ) {
 
             pass = FALSE;
@@ -14842,8 +14842,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14874,17 +14874,17 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr, 
+        result = H5C_resize_pinned_entry(cache_ptr, (void *)entry_ptr,
 			                 LARGE_ENTRY_SIZE);
 
 	if ( result < 0 ) {
 
             pass = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C_resize_pinned_entry() reports failure 4.");
             failure_mssg = msg;
 
-	} 
+	}
     }
 
     if ( pass ) {
@@ -14903,8 +14903,8 @@ check_resize_entry(void)
 
     if ( pass ) {
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14935,13 +14935,13 @@ check_resize_entry(void)
 
     protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3);
 
-    unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3, FALSE, 
+    unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3, FALSE,
 		    H5C__UNPIN_ENTRY_FLAG | H5C__DELETED_FLAG);
 
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -15028,7 +15028,7 @@ check_resize_entry(void)
 /*-------------------------------------------------------------------------
  * Function:	check_evictions_enabled()
  *
- * Purpose:	Verify that H5C_get_evictions_enabled() and 
+ * Purpose:	Verify that H5C_get_evictions_enabled() and
  * 		H5C_set_evictions_enabled() functions perform as expected.
  *
  * Return:	void
@@ -15077,7 +15077,7 @@ check_evictions_enabled(void)
      * Load another entry -- verify that this does not cause an entry
      * to be evicted.
      *
-     * Insert an entry -- verify that this does not cause an entry to 
+     * Insert an entry -- verify that this does not cause an entry to
      * be evicted.
      *
      * Use H5C_set_evictions_enabled() to re-enable evictions.  Verify
@@ -15090,7 +15090,7 @@ check_evictions_enabled(void)
      * Protect an entry not in the cache.  Verify that this causes
      * two evictions.
      *
-     * Used H5C_set_evictions_enabled() to disable evictions again.  
+     * Used H5C_set_evictions_enabled() to disable evictions again.
      * Verify with a call to H5C_get_evictions_enabled().
      *
      * Now flush and discard the cache -- should succeed.
@@ -15159,7 +15159,7 @@ check_evictions_enabled(void)
     for ( i = 0; i < 16 ; i++ )
     {
         protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i);
-        unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i, 
+        unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, i,
 			FALSE, H5C__NO_FLAGS_SET);
     }
 
@@ -15190,7 +15190,7 @@ check_evictions_enabled(void)
 
     /* protect and unprotect another entry */
     protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 16);
-    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 16, 
+    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 16,
 		    FALSE, H5C__NO_FLAGS_SET);
 
     if ( show_progress ) /* 7 */
@@ -15221,7 +15221,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[0]);
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -15284,7 +15284,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[1]);
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -15355,7 +15355,7 @@ check_evictions_enabled(void)
 
     /* protect and unprotect another entry */
     protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 18);
-    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 18, 
+    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 18,
 		    FALSE, H5C__NO_FLAGS_SET);
 
     if ( show_progress ) /* 15 */
@@ -15428,7 +15428,7 @@ check_evictions_enabled(void)
 
     /* protect and unprotect an entry that is in the cache */
     protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 19);
-    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 19, 
+    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 19,
 		    FALSE, H5C__NO_FLAGS_SET);
 
     if ( show_progress ) /* 20 */
@@ -15457,14 +15457,14 @@ check_evictions_enabled(void)
 
     /* protect and unprotect an entry that isn't in the cache */
     protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 20);
-    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 20, 
+    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 20,
 		    FALSE, H5C__NO_FLAGS_SET);
 
     if ( show_progress ) /* 22 */
         HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
                   fcn_name, mile_stone++, (int)pass);
 
-    /* verify that the entries have been evicted to bring the 
+    /* verify that the entries have been evicted to bring the
      * cache back down to its normal size.
      */
 
@@ -15491,7 +15491,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[2]);
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -15527,7 +15527,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[3]);
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -15576,11 +15576,11 @@ check_evictions_enabled(void)
         HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
                   fcn_name, mile_stone++, (int)pass);
 
-    /* protect and unprotect an entry that isn't in the cache, forcing 
+    /* protect and unprotect an entry that isn't in the cache, forcing
      * the cache to grow.
      */
     protect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 21);
-    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 21, 
+    unprotect_entry(cache_ptr, MONSTER_ENTRY_TYPE, 21,
 		    FALSE, H5C__NO_FLAGS_SET);
 
 
@@ -15656,7 +15656,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[4]);
 
-        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, 
+        result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -16777,7 +16777,7 @@ check_expunge_entry_errs(void)
 
     if ( pass ) {
 
-	result = H5C_expunge_entry(NULL, -1, -1, cache_ptr, 
+	result = H5C_expunge_entry(NULL, -1, -1, cache_ptr,
                                    &(types[0]), entry_ptr->addr);
 
         if ( result > 0 ) {
@@ -16795,7 +16795,7 @@ check_expunge_entry_errs(void)
 
     if ( pass ) {
 
-	result = H5C_expunge_entry(NULL, -1, -1, cache_ptr, 
+	result = H5C_expunge_entry(NULL, -1, -1, cache_ptr,
                                    &(types[0]), entry_ptr->addr);
 
         if ( result > 0 ) {
@@ -16813,7 +16813,7 @@ check_expunge_entry_errs(void)
 
     if ( pass ) {
 
-	result = H5C_expunge_entry(NULL, -1, -1, cache_ptr, 
+	result = H5C_expunge_entry(NULL, -1, -1, cache_ptr,
                                    &(types[0]), entry_ptr->addr);
 
         if ( result < 0 ) {
@@ -16874,11 +16874,11 @@ check_resize_entry_errs(void)
 
     pass = TRUE;
 
-    /* Allocate a cache, protect an entry, and then call 
+    /* Allocate a cache, protect an entry, and then call
      * H5C_resize_pinned_entry() to resize it -- this should fail.
      *
      * Unprotect the the entry with the pinned flag, and then call
-     * H5C_resize_pinned_entry() again with new size of zero.  
+     * H5C_resize_pinned_entry() again with new size of zero.
      * This should fail too.
      *
      * Finally, unpin the entry and destroy the cache.
@@ -16980,7 +16980,7 @@ check_unprotect_ro_dirty_err(void)
 
     pass = TRUE;
 
-    /* allocate a cache, protect an entry read only, and then unprotect it 
+    /* allocate a cache, protect an entry read only, and then unprotect it
      * with the dirtied flag set.  This should fail.  Destroy the cache
      * -- should succeed.
      */
@@ -17022,8 +17022,8 @@ check_unprotect_ro_dirty_err(void)
         takedown_cache(cache_ptr, FALSE, FALSE);
     }
 
-    /* allocate a another cache, protect an entry read only twice, and 
-     * then unprotect it with the dirtied flag set.  This should fail.  
+    /* allocate a another cache, protect an entry read only twice, and
+     * then unprotect it with the dirtied flag set.  This should fail.
      * Unprotect it with no flags set twice and then destroy the cache.
      * This should succeed.
      */
@@ -17110,9 +17110,9 @@ check_protect_ro_rw_err(void)
 
     pass = TRUE;
 
-    /* allocate a cache, protect an entry read only, and then try to protect 
+    /* allocate a cache, protect an entry read only, and then try to protect
      * it again rw.  This should fail.
-     * 
+     *
      * Unprotect the entry and destroy the cache -- should succeed.
      */
 
@@ -17166,7 +17166,7 @@ check_protect_ro_rw_err(void)
 /*-------------------------------------------------------------------------
  * 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
@@ -17200,7 +17200,7 @@ check_check_evictions_enabled_err(void)
      *
      * Repeat with a NULL evictions_enabled_ptr, should fail as well.
      *
-     * Configure the cache to use auto cache resize.  Call 
+     * Configure the cache to use auto cache resize.  Call
      * H5C_set_evictions_enabled() to disable evictions.  Should fail.
      *
      * Unprotect the entry and destroy the cache -- should succeed.
@@ -17317,7 +17317,7 @@ check_check_evictions_enabled_err(void)
  *
  * 		John Mainzer 1/8/08
  * 		Added a basic set of tests for the flash cache size
- * 		increment code.  
+ * 		increment code.
  *
  *-------------------------------------------------------------------------
  */
@@ -17372,7 +17372,7 @@ check_auto_cache_resize(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -20523,10 +20523,10 @@ check_auto_cache_resize(void)
     }
 
     /* now test the flash cache size increment code.  At least at present,
-     * there should be no interaction between the regular auto-resize 
-     * code and the flash cache size increment code other than a reset 
+     * there should be no interaction between the regular auto-resize
+     * code and the flash cache size increment code other than a reset
      * of the counter and stats collection used by the regular auto-resize
-     * code.  Thus we do only limited tests of the two pieces of code 
+     * code.  Thus we do only limited tests of the two pieces of code
      * operating together.
      *
      * Start with simple test to verify that the flash cache increment
@@ -20535,7 +20535,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* allocate a cache, enable the flash cache size increase code, and 
+    /* allocate a cache, enable the flash cache size increase code, and
      * then force the flash size increase code through all its operational
      * modes.  Verify that all performs as expected.
      */
@@ -20648,7 +20648,7 @@ check_auto_cache_resize(void)
 
     /* Now load a monster entry.  Since a monster entry is larger than
      * half the size of the cache, and there is not sufficient space
-     * for a monster entry in the cache, we will add space to the 
+     * for a monster entry in the cache, we will add space to the
      * cache to make room for the entry.
      */
     if ( pass ) {
@@ -20664,7 +20664,7 @@ check_auto_cache_resize(void)
 	     ( ( ( 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 + 
+                 ( cache_ptr->index_size != (HUGE_ENTRY_SIZE +
 		                             MONSTER_ENTRY_SIZE) ) ||
 		 ( cache_ptr->cache_accesses != 1 ) ) ) ) {
 
@@ -20726,9 +20726,9 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* delete existing entries to prepare for next test, and reset 
+    /* delete existing entries to prepare for next test, and reset
      * the size of the cache.
-     */ 
+     */
     if ( pass ) {
 
 	expunge_entry(cache_ptr, MONSTER_ENTRY_TYPE, 1);
@@ -20736,12 +20736,12 @@ check_auto_cache_resize(void)
 
         if ( pass ) {
 
-            result = H5C_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass = FALSE; 
+                pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n";
 	    }
         }
@@ -20758,7 +20758,7 @@ check_auto_cache_resize(void)
 	}
     }
 
-    /* repeat the above basic test, only this time, use inserts to add 
+    /* repeat the above basic test, only this time, use inserts to add
      * entries to the cache, not protects.
      */
 
@@ -20793,7 +20793,7 @@ check_auto_cache_resize(void)
 
     /* Now insert a monster entry.  Since a monster entry is larger than
      * half the size of the cache, and there is not sufficient space
-     * for a monster entry in the cache, we will add space to the 
+     * for a monster entry in the cache, we will add space to the
      * cache to make room for the entry.
      */
     if ( pass ) {
@@ -20805,7 +20805,7 @@ check_auto_cache_resize(void)
 	     ( ( ( cache_ptr->max_cache_size != (80 * 1024) ) ||
 		 ( cache_ptr->min_clean_size != (40 * 1024) ) ||
 		 ( cache_ptr->index_len != 2 ) ||
-                 ( cache_ptr->index_size != 
+                 ( cache_ptr->index_size !=
 		   HUGE_ENTRY_SIZE + MONSTER_ENTRY_SIZE ) ||
 		 ( cache_ptr->cache_accesses != 0 ) ) ) ) {
 
@@ -20820,14 +20820,14 @@ check_auto_cache_resize(void)
      */
     if ( pass ) {
 
-        insert_entry(cache_ptr, MONSTER_ENTRY_TYPE, 5, TRUE, 
+        insert_entry(cache_ptr, MONSTER_ENTRY_TYPE, 5, TRUE,
 		     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 ) ||
-                 ( cache_ptr->index_size != 
+                 ( cache_ptr->index_size !=
 		   2 * MONSTER_ENTRY_SIZE + HUGE_ENTRY_SIZE ) ||
 		 ( cache_ptr->cache_accesses != 0 ) ) ) ) {
 
@@ -20862,11 +20862,11 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* delete existing entries to prepare for next test, and reset 
+    /* delete existing entries to prepare for next test, and reset
      * the size of the cache.  We must also change the size of the needed
-     * variable entries before we run the test, so will protect and 
+     * variable entries before we run the test, so will protect and
      * unprotect them now so as to get the correct initial size.
-     */ 
+     */
     if ( pass ) {
 
 	expunge_entry(cache_ptr, MONSTER_ENTRY_TYPE, 5);
@@ -20894,12 +20894,12 @@ check_auto_cache_resize(void)
         if ( pass ) {
 
             auto_size_ctl.initial_size           = 6 * 1024;
-            result = H5C_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass = FALSE; 
+                pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 13.\n";
 	    }
         }
@@ -20922,11 +20922,11 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C__NO_FLAGS_SET);
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C__NO_FLAGS_SET);
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12);
@@ -21049,7 +21049,7 @@ check_auto_cache_resize(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* re-size the variable entries back down to their initial size, and
-     * restore the cache to its initial size as well, in preparation 
+     * restore the cache to its initial size as well, in preparation
      * for the next test.
      */
     if ( pass ) {
@@ -21067,12 +21067,12 @@ check_auto_cache_resize(void)
         if ( pass ) {
 
             auto_size_ctl.initial_size           = 6 * 1024;
-            result = H5C_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass = FALSE; 
+                pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 14.\n";
 	    }
         }
@@ -21096,7 +21096,7 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C__PIN_ENTRY_FLAG);
         resize_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, TRUE);
 
@@ -21135,7 +21135,7 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C__PIN_ENTRY_FLAG);
         resize_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, TRUE);
 
@@ -21156,7 +21156,7 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C__PIN_ENTRY_FLAG);
         resize_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, TRUE);
 
@@ -21180,15 +21180,15 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C__UNPIN_ENTRY_FLAG);
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C__UNPIN_ENTRY_FLAG);
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C__UNPIN_ENTRY_FLAG);
 
 	if ( ( pass ) &&
@@ -21206,7 +21206,7 @@ check_auto_cache_resize(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* re-size the variable entries back down to their initial size, and
-     * restore the cache to its initial size as well, in preparation 
+     * restore the cache to its initial size as well, in preparation
      * for the next test.
      */
     if ( pass ) {
@@ -21224,12 +21224,12 @@ check_auto_cache_resize(void)
         if ( pass ) {
 
             auto_size_ctl.initial_size           = 6 * 1024;
-            result = H5C_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass = FALSE; 
+                pass = FALSE;
                 failure_mssg = "H5C_set_cache_auto_resize_config failed 15.\n";
 	    }
         }
@@ -21249,7 +21249,7 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C__PIN_ENTRY_FLAG);
         resize_pinned_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024);
 
@@ -21288,7 +21288,7 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C__PIN_ENTRY_FLAG);
         resize_pinned_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024);
 
@@ -21309,7 +21309,7 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C__PIN_ENTRY_FLAG);
         resize_pinned_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024);
 
@@ -21333,15 +21333,15 @@ check_auto_cache_resize(void)
     if ( pass ) {
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C__UNPIN_ENTRY_FLAG);
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C__UNPIN_ENTRY_FLAG);
 
         protect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C__UNPIN_ENTRY_FLAG);
 
 	if ( ( pass ) &&
@@ -21455,14 +21455,14 @@ check_auto_cache_resize(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect and unprotect a large entry -- no change in cache size since
-     * a large entry will just fill the available space in the cache.  
+     * a large entry will just fill the available space in the cache.
      */
     if ( pass ) {
 
         rpt_fcn_called = FALSE;
 
         protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0);
-        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE, 
+        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE,
 			H5C__NO_FLAGS_SET);
 
 	if ( ( pass ) &&
@@ -21480,7 +21480,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* protect and unprotect another a large entry -- should trigger a 
+    /* protect and unprotect another a large entry -- should trigger a
      * flash cache size increase to 12 KB (remember that flash_multiple is
      * set to 2.0).
      */
@@ -21489,7 +21489,7 @@ check_auto_cache_resize(void)
         rpt_fcn_called = FALSE;
 
         protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 1);
-        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 1, NO_CHANGE, 
+        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 1, NO_CHANGE,
 			H5C__NO_FLAGS_SET);
 
 	if ( ( pass ) &&
@@ -21507,7 +21507,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* protect and unprotect two more large entries -- shouldnt trigger a 
+    /* protect and unprotect two more large entries -- shouldnt trigger a
      * flash cache size increase.
      */
     if ( pass ) {
@@ -21515,10 +21515,10 @@ check_auto_cache_resize(void)
         rpt_fcn_called = FALSE;
 
         protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 2);
-        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 2, NO_CHANGE, 
+        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 2, NO_CHANGE,
 			H5C__NO_FLAGS_SET);
         protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3);
-        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3, NO_CHANGE, 
+        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 3, NO_CHANGE,
 			H5C__NO_FLAGS_SET);
 
 	if ( ( pass ) &&
@@ -21536,7 +21536,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* do many accesses of a single entry to talk the cache into reducing 
+    /* do many accesses of a single entry to talk the cache into reducing
      * its size to the minimum.
      */
     if ( pass ) {
@@ -21572,17 +21572,17 @@ check_auto_cache_resize(void)
         rpt_fcn_called = FALSE;
 
         protect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0);
-        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE, 
+        unprotect_entry(cache_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE,
 			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 ) ||
-                 ( cache_ptr->index_size != 
+                 ( cache_ptr->index_size !=
 		   LARGE_ENTRY_SIZE + TINY_ENTRY_SIZE ) ||
 		 ( cache_ptr->cache_accesses != 1 )  ||
-		 ( rpt_fcn_called == FALSE ) || 
+		 ( rpt_fcn_called == FALSE ) ||
                  ( rpt_status != flash_increase ) ) ) ) {
 
             pass = FALSE;
@@ -21610,7 +21610,7 @@ check_auto_cache_resize(void)
 
         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;
@@ -21654,7 +21654,7 @@ check_auto_cache_resize(void)
  *
  * Modifications:
  *
- * 		Added code to include the flash cache size increment 
+ * 		Added code to include the flash cache size increment
  * 		code in this test.
  * 							JRM -- 1/10/08
  *
@@ -21695,7 +21695,7 @@ check_auto_cache_resize_disable(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 1.0,
         /* double      flash_threshold        = */ 0.25,
@@ -24207,27 +24207,27 @@ check_auto_cache_resize_disable(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* Now test the flash cache size increment code to verify that it
-     * is disabled when it should be.  
+     * is disabled when it should be.
      *
-     * Since the flash size increase code doesn't look at hit rate, or 
+     * Since the flash size increase code doesn't look at hit rate, or
      * use epochs (other than to start a new epoch if a flash cache size
      * increase is triggered), we go about these tests somewhat differently
      * than the rest of the tests in this function.
      *
-     * As of this writing, there is only one flash cache size increment 
+     * As of this writing, there is only one flash cache size increment
      * mode (add space), which is triggered whenever the size of a newly
      * loaded or inserted entry, or the delta between old and new entry
      * sizes exceeds some fraction of the current maximum cache size, and
      * the cache doesn't have enough free space to accomodate the new/
      * resize entry without performing evictions.  The range of permissible
      * values for the flash_threshold (0.1 to 1.0 as of this writing), and
-     * for the flash_multiple (0.1 to 10.0) do not permit the facility to 
+     * for the flash_multiple (0.1 to 10.0) do not permit the facility to
      * be turned off by configuration.  Thus, flash cache size increases
-     * can be disabled only via the flash_incr_mode, and by setting the 
+     * can be disabled only via the flash_incr_mode, and by setting the
      * current max_cache_size equal to max_size.
      *
      * We have already tested the latter in check_auto_cache_resize(), so
-     * we need only thest the former here.  Do this by disabling flash 
+     * we need only thest the former here.  Do this by disabling flash
      * cache size increments via the flash_incr_mode, and then creating
      * situations that would trigger flash cache size increases were that
      * code enabled.
@@ -24339,7 +24339,7 @@ check_auto_cache_resize_disable(void)
      * size increment code was active, this would trigger an increase.
      * Verify that it doesn't.
      *
-     * This finishes the additional tests needed for the flash cache 
+     * This finishes the additional tests needed for the flash cache
      * size increase code.
      */
     if ( pass ) {
@@ -24446,7 +24446,7 @@ check_auto_cache_resize_epoch_markers(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -25116,7 +25116,7 @@ check_auto_cache_resize_epoch_markers(void)
  *
  * 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
@@ -25186,7 +25186,7 @@ check_auto_cache_resize_input_errs(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
@@ -26567,7 +26567,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
        			(enum H5C_cache_flash_incr_mode) -1; /* INVALID */
 	invalid_auto_size_ctl.flash_multiple         = 2.0;
 	invalid_auto_size_ctl.flash_threshold        = 0.5;
@@ -26643,7 +26643,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 0.09; /* INVALID */
 	invalid_auto_size_ctl.flash_threshold        = 0.5;
@@ -26717,7 +26717,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 10.01; /* INVALID */
 	invalid_auto_size_ctl.flash_threshold        = 0.5;
@@ -26793,7 +26793,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 1.0;
 	invalid_auto_size_ctl.flash_threshold        = 0.09; /* INVALID */
@@ -26867,7 +26867,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 1.0;
 	invalid_auto_size_ctl.flash_threshold        = 1.001; /* INVALID */
@@ -27632,7 +27632,7 @@ check_auto_cache_resize_aux_fcns(void)
         /* hbool_t     apply_max_increment    = */ TRUE,
         /* size_t      max_increment          = */ (4 * 1024 * 1024),
 
-        /* enum H5C_cache_flash_incr_mode       */   
+        /* enum H5C_cache_flash_incr_mode       */
 	/*                    flash_incr_mode = */ H5C_flash_incr__off,
         /* double      flash_multiple         = */ 2.0,
         /* double      flash_threshold        = */ 0.5,
diff --git a/test/cache2.c b/test/cache2.c
index b3dd0b5..4865ce8 100644
--- a/test/cache2.c
+++ b/test/cache2.c
@@ -339,7 +339,7 @@ smoke_check_1(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -444,7 +444,7 @@ smoke_check_2(void)
 			    /* do_mult_ro_protects    */ TRUE,
                             /* dirty_destroys         */ dirty_destroys,
                             /* dirty_unprotects       */ dirty_unprotects);
- 
+
     if ( show_progress ) /* 4 */
         HDfprintf(stdout, "%s() - %0d -- pass2 = %d\n",
                   fcn_name, mile_stone++, (int)pass2);
@@ -560,7 +560,7 @@ smoke_check_2(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -780,7 +780,7 @@ smoke_check_3(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -997,11 +997,11 @@ smoke_check_4(void)
 
         HDfprintf(stdout, "%s(): failure_mssg2 = \"%s\".\n",
                   fcn_name, failure_mssg2);
-    } 
+    }
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -1259,7 +1259,7 @@ smoke_check_5(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -1517,7 +1517,7 @@ smoke_check_6(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -1776,7 +1776,7 @@ smoke_check_7(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -2035,7 +2035,7 @@ smoke_check_8(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -2051,9 +2051,9 @@ smoke_check_8(void)
  * 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 renames in the mix, along 
- * 		with repeated protects and unprotects.  All entries are 
+ * 		Recall that smoke check 1 is a basic functional test,
+ * 		with inserts, destroys, and renames in the mix, along
+ * 		with repeated protects and unprotects.  All entries are
  * 		marked as clean.
  *
  * Return:	void
@@ -2371,7 +2371,7 @@ smoke_check_9(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -2387,9 +2387,9 @@ smoke_check_9(void)
  * 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 renames in the mix, along 
- * 		with some repeated protects and unprotects.  About half 
+ * 		Recall that smoke check 2 is a basic functional test,
+ * 		with inserts, destroys, and renames in the mix, along
+ * 		with some repeated protects and unprotects.  About half
  * 		the entries are marked as dirty.
  *
  * Return:	void
@@ -2702,7 +2702,7 @@ smoke_check_10(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -2921,7 +2921,7 @@ write_permitted_check(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -2992,12 +2992,12 @@ check_insert_entry(void)
         HDfprintf(stdout, "%s: point = %d\n", fcn_name, point++); /* 0 */
     }
 
-    /* Allocate a cache, and insert entries into it using all 
+    /* Allocate a cache, and insert entries into it using all
      * combinations of flags.  Verify that the entries are inserted,
      * and that the flags have the desired effects.
      *
      * Note that the dirty parameter in insert_entry is no longer
-     * used, as we have decided that all inserted entries are 
+     * used, as we have decided that all inserted entries are
      * dirty by definition. (Which sounds very reasonable, but didn't
      * used to be the case.)
      */
@@ -3018,10 +3018,10 @@ check_insert_entry(void)
     if ( pass2 ) {
 
         insert_entry2(file_ptr, entry_type, 0, TRUE, H5C2__NO_FLAGS_SET);
-        insert_entry2(file_ptr, entry_type, 1, TRUE, 
+        insert_entry2(file_ptr, entry_type, 1, TRUE,
                       H5C2__SET_FLUSH_MARKER_FLAG);
         insert_entry2(file_ptr, entry_type, 2, TRUE, H5C2__PIN_ENTRY_FLAG);
-        insert_entry2(file_ptr, entry_type, 3, TRUE, 
+        insert_entry2(file_ptr, entry_type, 3, TRUE,
  		      (H5C2__SET_FLUSH_MARKER_FLAG | H5C2__PIN_ENTRY_FLAG));
     }
 
@@ -3042,16 +3042,16 @@ check_insert_entry(void)
 	/* Start by checking everything we can via H5C2_get_entry_status() */
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
 	result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-			              &in_cache, &is_dirty, &is_protected, 
+			              &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3062,14 +3062,14 @@ check_insert_entry(void)
         }
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
-	if ( pass2 ) { 
+	if ( pass2 ) {
 
 	    /* check the universals */
-	    if ( ( ! in_cache ) || ( ! is_dirty ) || ( is_protected ) || 
+	    if ( ( ! in_cache ) || ( ! is_dirty ) || ( is_protected ) ||
                  ( entry_size != entry_sizes2[entry_type] ) ) {
 
                 pass2 = FALSE;
@@ -3078,7 +3078,7 @@ check_insert_entry(void)
 	}
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3105,7 +3105,7 @@ check_insert_entry(void)
 	}
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3131,7 +3131,7 @@ check_insert_entry(void)
 	}
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3143,7 +3143,7 @@ check_insert_entry(void)
 		search_ptr = cache_ptr->pel_head_ptr;
 
 		while ( ( search_ptr != NULL ) &&
-			( search_ptr != 
+			( search_ptr !=
 			  (struct H5C2_cache_entry_t *)entry_ptr ) )
 		{
 		    search_ptr = search_ptr->next;
@@ -3158,7 +3158,7 @@ check_insert_entry(void)
 	}
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3170,7 +3170,7 @@ check_insert_entry(void)
 		search_ptr = cache_ptr->LRU_head_ptr;
 
 		while ( ( search_ptr != NULL ) &&
-			( search_ptr != 
+			( search_ptr !=
 			  (struct H5C2_cache_entry_t *)entry_ptr ) )
 		{
 		    search_ptr = search_ptr->next;
@@ -3185,7 +3185,7 @@ check_insert_entry(void)
 	}
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
 	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3198,7 +3198,7 @@ check_insert_entry(void)
 		search_ptr = cache_ptr->dLRU_head_ptr;
 
 		while ( ( search_ptr != NULL ) &&
-			( search_ptr != 
+			( search_ptr !=
 			  (struct H5C2_cache_entry_t *)entry_ptr ) )
 		{
 		    search_ptr = search_ptr->aux_next;
@@ -3214,7 +3214,7 @@ check_insert_entry(void)
 #endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
         if ( show_progress ) {
-            HDfprintf(stdout, "%s:%d point = %d.%d\n", 
+            HDfprintf(stdout, "%s:%d point = %d.%d\n",
   	 	      fcn_name, i, point, subpoint++);
 	}
 
@@ -3227,8 +3227,8 @@ check_insert_entry(void)
         HDfprintf(stdout, "%s: point = %d\n", fcn_name, point++);
     }
 
-    /* So much for looking at the individual entries.  Now verify 
-     * that the various counts and sized in the cache header are 
+    /* So much for looking at the individual entries.  Now verify
+     * that the various counts and sized in the cache header are
      * as expected.
      */
 
@@ -3321,7 +3321,7 @@ check_insert_entry(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -3445,7 +3445,7 @@ check_flush_cache(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -3497,7 +3497,7 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
 
     if ( pass2 ) {
 
-        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			          H5C2__NO_FLAGS_SET);
 
         if ( result < 0 ) {
@@ -5432,7 +5432,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 
     if ( pass2 ) {
 
-        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			          flush_flags);
 
         if ( result < 0 ) {
@@ -5684,7 +5684,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
 
     if ( pass2 ) {
 
-        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			          flush_flags);
 
         if ( result < 0 ) {
@@ -5821,9 +5821,9 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
 /*-------------------------------------------------------------------------
  * 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 
+ * 		These are tests that test the cache's ability to handle
  * 		the case in which the flush callback dirties, resizes,
  * 		and/or renames entries.
  *
@@ -5860,7 +5860,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     if ( pass2 ) /* 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 
+	 * 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;
@@ -5870,9 +5870,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 2 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 2;
 	size_t expected_index_size	= 2 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[2] = 
+	struct fo_flush_cache_test_spec spec[2] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 0,
@@ -5900,7 +5900,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
 	  },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 1,
@@ -5968,8 +5968,8 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	 * 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.  
+	 * 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	= H5C2__FLUSH_INVALIDATE_FLAG;
@@ -5978,9 +5978,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 2 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[2] = 
+	struct fo_flush_cache_test_spec spec[2] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6008,7 +6008,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
 	  },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6083,9 +6083,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6162,9 +6162,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6229,16 +6229,16 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     if ( pass2 ) /* test #5 & #6 */
     {
 	/* Single entry test verifying that the cache can handle the case in
-	 * which the call back function first resizes and then renames the 
+	 * which the call back function first resizes and then renames 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 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 
+         * 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 
+         * be accompanied by a resize.  Note that as a result, this
          * test becomes redundant with later tests.
 	 */
         int test_num			= 5; /* and 6 */
@@ -6248,9 +6248,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6311,15 +6311,15 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 	if ( pass2 ) {
@@ -6343,20 +6343,20 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
     if ( pass2 ) /* test #7 & #8 */
     {
-	/* Run tests 5 & 6 again, using the flush invalidate flag on the 
+	/* 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 renames 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 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 
+         * 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 
+         * be accompanied by a resize.  Note that as a result, this
          * test becomes redundant with later tests.
 	 */
         int test_num			= 7; /* and 8 */
@@ -6366,9 +6366,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6429,15 +6429,15 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 
@@ -6467,11 +6467,11 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     if ( pass2 ) /* test #9 & #10 */
     {
 	/* Single entry test verifying that the cache can handle the case in
-	 * which the call back function both resizes and renames the entry 
+	 * which the call back function both resizes and renames 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.  
+	 * 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	= H5C2__NO_FLAGS_SET;
@@ -6480,9 +6480,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6543,15 +6543,15 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 	if ( pass2 ) {
@@ -6579,11 +6579,11 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	 * second test.
 	 *
 	 * Single entry test verifying that the cache can handle the case in
-	 * which the call back function both resizes and renames the entry 
+	 * which the call back function both resizes and renames 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.  
+	 * 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	= H5C2__NO_FLAGS_SET;
@@ -6592,9 +6592,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= VARIABLE_ENTRY_SIZE / 2;
 	int expected_index_len		= 1;
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE / 4;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -6655,15 +6655,15 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the rename to move the target entry back to its 
+	/* this change forces the rename 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 renamed entry is moved forward in the slist.  In the second 
+	 * the renamed 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 
+	 * matter in this case.  But we will do similar tests later with
 	 * other entries in the cache.
 	 */
 	if ( pass2 ) {
@@ -6692,9 +6692,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
     if ( pass2 ) /* 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 
+	/* 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
@@ -6707,9 +6707,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 1 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 3;
 	size_t expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 1,
@@ -6790,9 +6790,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     {
 	/* 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 
+	 * 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
@@ -6805,9 +6805,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 1 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ 0,
 	    /* entry_index        = */ 1,
@@ -6886,8 +6886,8 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
     if ( pass2 ) /* 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 
+	/* 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
@@ -6902,9 +6902,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -6985,8 +6985,8 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     {
 	/* 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 
+	 * 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
@@ -6999,9 +6999,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 1 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7080,8 +7080,8 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
     if ( pass2 ) /* 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 
+	/* 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 renames two entries that are not in cache.
 	 *
 	 * At present, I am assured that this case will never occur, but
@@ -7096,9 +7096,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7161,7 +7161,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_destroyed = */ FALSE
 	  }
 	};
-	
+
         check_flush_cache__flush_op_test(file_ptr,
                                          test_num,
                                          flush_flags,
@@ -7174,12 +7174,12 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the renames to move the target entries back to 
-	 * their main address.  The first test moved them to their alternate 
+	/* this change forces the renames 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 renamed entries are moved forward in the slist.  In the second 
+	 * the renamed entries are moved forward in the slist.  In the second
 	 * they are moved backwards.
 	 */
 	if ( pass2 ) {
@@ -7209,8 +7209,8 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	/* 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 
+	 * 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 renames two entries that are not in cache.
 	 *
 	 * At present, I am assured that this case will never occur, but
@@ -7225,9 +7225,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t expected_index_size	= VARIABLE_ENTRY_SIZE +
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2);
-	struct fo_flush_cache_test_spec spec[1] = 
+	struct fo_flush_cache_test_spec spec[1] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7303,12 +7303,12 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 					 check_size,
 					 checks);
 
-	/* this change forces the renames to move the target entries back to 
-	 * their main address.  The first test moved them to their alternate 
+	/* this change forces the renames 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 renamed entries are moved forward in the slist.  In the second 
+	 * the renamed entries are moved forward in the slist.  In the second
 	 * they are moved backwards.
 	 */
 	if ( pass2 ) {
@@ -7345,14 +7345,14 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     {
 	/* Now mix things up a bit.
 	 *
-	 * Load several entries, two of which have flush functions that 
-	 * resize, dirty, and rename two entries that are not in the 
-	 * cache.  Mark only one of these entries, and then flush the 
+	 * Load several entries, two of which have flush functions that
+	 * resize, dirty, and rename 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 
+	 * This is the only test in which we test the
 	 * H5C2__FLUSH_MARKED_ENTRIES_FLAG.  The hope is that since
-	 * we test the two features extensively by themselves, so 
+	 * we test the two features extensively by themselves, so
 	 * it should be sufficient to verify that they play together
 	 * as expected.
 	 */
@@ -7366,9 +7366,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 		                          (VARIABLE_ENTRY_SIZE / 4) +
 					  (VARIABLE_ENTRY_SIZE / 2) +
 					  (2 * PICO_ENTRY_SIZE);
-	struct fo_flush_cache_test_spec spec[4] = 
+	struct fo_flush_cache_test_spec spec[4] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7396,7 +7396,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 11,
@@ -7424,7 +7424,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ FALSE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -7452,7 +7452,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7564,9 +7564,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     {
 	/* Mix things up some more.
 	 *
-	 * Load lots of entries, some of which have flush functions that 
-	 * resize, dirty, and rename two entries that are not in the 
-	 * cache.  
+	 * Load lots of entries, some of which have flush functions that
+	 * resize, dirty, and rename two entries that are not in the
+	 * cache.
 	 *
 	 * Also load entries that have flush ops on entries that are in
 	 * cache.
@@ -7581,9 +7581,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 		                          (2 * (VARIABLE_ENTRY_SIZE / 4)) +
 					  (2 * (VARIABLE_ENTRY_SIZE / 2)) +
 					  (4 * PICO_ENTRY_SIZE);
-	struct fo_flush_cache_test_spec spec[6] = 
+	struct fo_flush_cache_test_spec spec[6] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7611,7 +7611,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 11,
@@ -7639,7 +7639,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -7667,7 +7667,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7695,7 +7695,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ FALSE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 4,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 10,
@@ -7723,7 +7723,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ FALSE
           },
-          { 
+          {
             /* entry_num          = */ 5,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 20,
@@ -7837,9 +7837,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	 *
 	 * Mix things up some more.
 	 *
-	 * Load lots of entries, some of which have flush functions that 
-	 * resize, dirty, and rename two entries that are not in the 
-	 * cache.  
+	 * Load lots of entries, some of which have flush functions that
+	 * resize, dirty, and rename two entries that are not in the
+	 * cache.
 	 *
 	 * Also load entries that have flush ops on entries that are in
 	 * cache.
@@ -7851,9 +7851,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= (2 * VARIABLE_ENTRY_SIZE) + (4 * PICO_ENTRY_SIZE);
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[6] = 
+	struct fo_flush_cache_test_spec spec[6] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7881,7 +7881,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 1,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 11,
@@ -7909,7 +7909,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 2,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 0,
@@ -7937,7 +7937,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 3,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 1,
@@ -7965,7 +7965,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ FALSE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 4,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 10,
@@ -7993,7 +7993,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	    /* expected_flushed   = */ TRUE,
 	    /* expected_destroyed = */ TRUE
           },
-          { 
+          {
             /* entry_num          = */ 5,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 20,
@@ -8117,9 +8117,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 3 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 3;
 	size_t expected_index_size	= 3 * PICO_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[3] = 
+	struct fo_flush_cache_test_spec spec[3] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -8251,9 +8251,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 3 * PICO_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[3] = 
+	struct fo_flush_cache_test_spec spec[3] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ PICO_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -8373,22 +8373,22 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 
     if ( pass2 ) /* test #26 */
     {
-	/* This one is complex.  
+	/* This one is complex.
 	 *
-	 * In the following overvies table, VET stands for 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * 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
@@ -8455,9 +8455,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 10 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 13;
 	size_t expected_index_size	= 9 * VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[10] = 
+	struct fo_flush_cache_test_spec spec[10] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 200,
@@ -8808,24 +8808,24 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     {
 	/* Repeat test #26 with the flush invalidate flag.
 	 *
-	 * In the following overview table, VET stands for 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * 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 
+	 * Thus this is a bit of a smoke check to * verify that we
 	 * get the expected results.
 	 *
 	 * (VET, 100)	initially not resident in cache
@@ -8892,9 +8892,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 10 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= (size_t)0;
-	struct fo_flush_cache_test_spec spec[10] = 
+	struct fo_flush_cache_test_spec spec[10] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 200,
@@ -9244,7 +9244,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
     if ( pass2 ) /* test #28 */
     {
 	/* Test the expected fheap case, in which an entry dirties
-	 * and resizes itself, and dirties an entry which it has 
+	 * and resizes itself, and dirties an entry which it has
 	 * pinned.
 	 */
         int test_num			= 28;
@@ -9254,9 +9254,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 3 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 5;
 	size_t expected_index_size	= 4 * VARIABLE_ENTRY_SIZE;
-	struct fo_flush_cache_test_spec spec[5] = 
+	struct fo_flush_cache_test_spec spec[5] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -9437,7 +9437,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	/* 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 
+	 * and resizes itself, and dirties an entry which it has
 	 * pinned.
 	 */
         int test_num			= 29;
@@ -9447,9 +9447,9 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 	size_t init_expected_index_size	= 3 * VARIABLE_ENTRY_SIZE;
 	int expected_index_len		= 0;
 	size_t expected_index_size	= 0;
-	struct fo_flush_cache_test_spec spec[5] = 
+	struct fo_flush_cache_test_spec spec[5] =
 	{
-          { 
+          {
             /* entry_num          = */ 0,
             /* entry_type         = */ VARIABLE_ENTRY_TYPE,
 	    /* entry_index        = */ 100,
@@ -9636,7 +9636,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
 /*-------------------------------------------------------------------------
  * Function:	check_flush_cache__flush_op_test()
  *
- * Purpose:	Run a flush op flush cache test.  Of the nature of 
+ * Purpose:	Run a flush op flush cache test.  Of the nature of
  * 		flush operations, this is a multi-entry test.
  *
  * Return:	void
@@ -9674,7 +9674,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);
-#endif 
+#endif
 
     if ( cache_ptr == NULL ) {
 
@@ -9734,23 +9734,23 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
              ( check[i].entry_index < 0 ) ||
              ( check[i].entry_index > max_indices2[check[i].entry_type] ) ||
              ( check[i].expected_size <= (size_t)0 ) ||
-	     ( ( check[i].in_cache != TRUE ) && 
+	     ( ( check[i].in_cache != TRUE ) &&
 	       ( check[i].in_cache != FALSE ) ) ||
-	     ( ( check[i].at_main_addr != TRUE ) && 
+	     ( ( check[i].at_main_addr != TRUE ) &&
 	       ( check[i].at_main_addr != FALSE ) ) ||
-	     ( ( check[i].is_dirty != TRUE ) && 
+	     ( ( check[i].is_dirty != TRUE ) &&
 	       ( check[i].is_dirty != FALSE ) ) ||
-	     ( ( check[i].is_protected != TRUE ) && 
+	     ( ( check[i].is_protected != TRUE ) &&
 	       ( check[i].is_protected != FALSE ) ) ||
-	     ( ( check[i].is_pinned != TRUE ) && 
+	     ( ( check[i].is_pinned != TRUE ) &&
 	       ( check[i].is_pinned != FALSE ) ) ||
-	     ( ( check[i].expected_deserialized != TRUE ) && 
+	     ( ( check[i].expected_deserialized != TRUE ) &&
 	       ( check[i].expected_deserialized != FALSE ) ) ||
-	     ( ( check[i].expected_cleared != TRUE ) && 
+	     ( ( check[i].expected_cleared != TRUE ) &&
 	       ( check[i].expected_cleared != FALSE ) ) ||
-	     ( ( check[i].expected_serialized != TRUE ) && 
+	     ( ( check[i].expected_serialized != TRUE ) &&
 	       ( check[i].expected_serialized != FALSE ) ) ||
-	     ( ( check[i].expected_destroyed != TRUE ) && 
+	     ( ( check[i].expected_destroyed != TRUE ) &&
 	       ( check[i].expected_destroyed != FALSE ) ) ) {
 
             pass2 = FALSE;
@@ -9790,7 +9790,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
 	for ( j = 0; j < spec[i].num_flush_ops; j++ )
 	{
-	    add_flush_op2(spec[i].entry_type, 
+	    add_flush_op2(spec[i].entry_type,
 			 spec[i].entry_index,
 			 spec[i].flush_ops[j].op_code,
 			 spec[i].flush_ops[j].type,
@@ -9818,7 +9818,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
     if ( pass2 ) {
 
-        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			          flush_flags);
 
         if ( result < 0 ) {
@@ -9888,7 +9888,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
         i = 0;
         while ( ( pass2 ) && ( i < check_size ) )
         {
-	    if ( check[i].in_cache != entry_in_cache2(cache_ptr, 
+	    if ( check[i].in_cache != entry_in_cache2(cache_ptr,
 				                      check[i].entry_type,
 						      check[i].entry_index) ) {
 
@@ -9918,7 +9918,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 		 ( 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 != 
+		 ( entry_ptr->deserialized !=
 		   check[i].expected_deserialized ) ||
 		 ( entry_ptr->cleared != check[i].expected_cleared ) ||
 		 ( entry_ptr->serialized != check[i].expected_serialized ) ||
@@ -9938,7 +9938,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 		 ( 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 != 
+		 ( entry_ptr->deserialized !=
 		   check[i].expected_deserialized ) ||
 		 ( entry_ptr->cleared ) ||
 		 ( entry_ptr->serialized != check[i].expected_serialized ) ||
@@ -9956,7 +9956,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 		if ( ( ! entry_ptr->header.destroy_in_progress ) &&
 		     ( check[i].in_cache ) &&
                      ( entry_ptr->header.size != check[i].expected_size ) ) {
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "(!destroy in progress and in cache and size (expected) = %d (%d).\n",
                               (int)(entry_ptr->header.size),
 			      (int)(check[i].expected_size));
@@ -9998,9 +9998,9 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 			      (int)(entry_ptr->header.is_pinned),
 			      (int)(check[i].is_pinned));
 		}
-		if ( entry_ptr->deserialized != 
+		if ( entry_ptr->deserialized !=
 				check[i].expected_deserialized ) {
-		    HDfprintf(stdout, 
+		    HDfprintf(stdout,
 		 	      "entry_ptr->deserialized (expected) = %d (%d).\n",
 			      (int)(entry_ptr->deserialized),
 			      (int)(check[i].expected_deserialized));
@@ -10011,7 +10011,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 			      (int)(check[i].expected_cleared));
 		}
 		if ( entry_ptr->serialized != check[i].expected_serialized ) {
-		    HDfprintf(stdout, 
+		    HDfprintf(stdout,
 			      "entry_ptr->serialized (expected) = %d (%d).\n",
 			      (int)(entry_ptr->serialized),
 			      (int)(check[i].expected_serialized));
@@ -10138,12 +10138,12 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
  * Modifications:
  *
  *              JRM -- 10/9/07
- *		Modified test to accomodate changes in the cache API.  
+ *		Modified test to accomodate changes in the cache API.
  *		In particular, since the cache is now reading and writing
  *		its own entries, the serialize callback is not called on
- *		entry eviction unless the entry is dirty.  
+ *		entry eviction unless the entry is dirty.
  *
- *		This fact broke some basic assumptions of the test, and 
+ *		This fact broke some basic assumptions of the test, and
  *		necessitated a substantial re-write.
  *
  *-------------------------------------------------------------------------
@@ -10163,9 +10163,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
     test_entry_t * base_addr;
     struct expected_entry_status expected[10 + 31 + 14] =
     {
-      /* the expected array is used to maintain a table of the expected status of every 
+      /* the expected array is used to maintain a table of the expected status of every
        * entry used in this test.  Note that since the function that processes this
-       * array only processes as much of it as it is told to, we don't have to 
+       * 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                                                       */
@@ -10256,9 +10256,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
     if ( pass2 ) {
 
         /* the basic idea in this test is to insert a bunch of entries
-         * with flush operations associated with them, and then load 
-         * other entries into the cache until the cache is full.  At 
-         * that point, load yet more entries into the cache, and see 
+         * with flush operations associated with them, and then load
+         * 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
@@ -10276,54 +10276,54 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 */
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 0);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 0, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 0,
 			           H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 4));
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 1);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 1, 
-			                 H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 1,
+			                 H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG,
 					 (VARIABLE_ENTRY_SIZE / 4));
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 2);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 2, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 2,
 			                 H5C2__NO_FLAGS_SET, (size_t)0);
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 3);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 3, 
-			                  H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 3,
+			                  H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG,
 					  (VARIABLE_ENTRY_SIZE / 4));
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 4);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 4, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 4,
 			                  H5C2__NO_FLAGS_SET, (size_t)0);
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 5);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 5, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 5,
 			           H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 4));
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 6);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 6, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 6,
 			           H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 2));
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 7);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 7, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 7,
 			           H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG,
 				   (VARIABLE_ENTRY_SIZE / 2));
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 8);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 8, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 8,
 			                 H5C2__NO_FLAGS_SET, (size_t)0);
 
 	protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 9);
-	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 9, 
+	unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 9,
 			                 H5C2__NO_FLAGS_SET, (size_t)0);
 
 	if ( ( cache_ptr->index_len != 10 ) ||
              ( cache_ptr->index_size != (4 * (VARIABLE_ENTRY_SIZE / 4)) +
-	                                (2 * (VARIABLE_ENTRY_SIZE / 2)) + 
+	                                (2 * (VARIABLE_ENTRY_SIZE / 2)) +
 	                                (4 * VARIABLE_ENTRY_SIZE) ) ) {
 
             pass2 = FALSE;
@@ -10333,7 +10333,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if ( pass2 ) {
 
-	/* Now set up the pinning relationships: 
+	/* 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)
@@ -10366,51 +10366,51 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 *          (VET, 9) dirties (VET, 8)
 	 */
 
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE, 
-                     VARIABLE_ENTRY_TYPE, 0, FALSE, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 1, FLUSH_OP__RESIZE,
+                     VARIABLE_ENTRY_TYPE, 0, FALSE,
 		     3 * VARIABLE_ENTRY_SIZE / 4);
 
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE);
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RENAME, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RENAME,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
 
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__DIRTY, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0);
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__RESIZE, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__RESIZE,
                      VARIABLE_ENTRY_TYPE, 5, FALSE, VARIABLE_ENTRY_SIZE / 2);
 
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 7, FLUSH_OP__DIRTY, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 7, FLUSH_OP__DIRTY,
                       VARIABLE_ENTRY_TYPE, 9, FALSE, (size_t)0);
 
-        add_flush_op2(VARIABLE_ENTRY_TYPE, 9, FLUSH_OP__DIRTY, 
+        add_flush_op2(VARIABLE_ENTRY_TYPE, 9, FLUSH_OP__DIRTY,
                      VARIABLE_ENTRY_TYPE, 8, FALSE, (size_t)0);
     }
 
     if ( pass2 ) {
 
-	/* to summarize, at present the following variable size entries 
+	/* 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), 
+	 * (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
 	 * 							rename (VET, 0) to its alternate address
-	 * 
+	 *
 	 * (VET, 4) 	Y	10 KB	N	N	-	-
 	 *
 	 *
@@ -10422,11 +10422,11 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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 
+	 * Recall that in this test bed, flush operations are excuted the
+	 * first time the associated entry is flushed, and are then
 	 * deleted.
 	 */
 
@@ -10434,14 +10434,14 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 0; i < 31; i++ )
 	{
 	    protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < 1; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10461,9 +10461,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
 	    /* verify the expected status of all entries we have loaded to date: */
             num_large_entries = 1;
-	    verify_entry_status2(cache_ptr, 
+	    verify_entry_status2(cache_ptr,
 			         0,
-			         (num_variable_entries + num_monster_entries + num_large_entries), 
+			         (num_variable_entries + num_monster_entries + num_large_entries),
 				 expected);
 	}
     }
@@ -10471,8 +10471,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if ( pass2 ) {
 
-	/* 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 
+	/* 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
@@ -10480,7 +10480,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 *
 	 * 		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	-	-
@@ -10501,7 +10501,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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:
@@ -10515,7 +10515,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         num_large_entries = 2;
 
 	protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 1);
-	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 1, 
+	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 1,
                                          H5C2__DIRTIED_FLAG, (size_t)0);
 
 	if ( ( cache_ptr->index_len != 42 ) ||
@@ -10534,25 +10534,25 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    1,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
-	/* Now load another large entry.  This should result in the eviction 
+	/* 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 
+	 * 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	-	-
@@ -10571,7 +10571,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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:
@@ -10586,7 +10586,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         num_large_entries = 3;
 
 	protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 2);
-	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 2, 
+	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 2,
                                          H5C2__DIRTIED_FLAG, (size_t)0);
 
 	if ( ( cache_ptr->index_len != 42 ) ||
@@ -10597,7 +10597,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	     ( cache_ptr->index_size != ((3 * VARIABLE_ENTRY_SIZE / 4) +
 					 (2 * VARIABLE_ENTRY_SIZE / 2) +
 				         (3 * VARIABLE_ENTRY_SIZE) +
-				         (31 * MONSTER_ENTRY_SIZE) + 
+				         (31 * MONSTER_ENTRY_SIZE) +
 				         (3 * LARGE_ENTRY_SIZE)) ) ) {
 
             pass2 = FALSE;
@@ -10605,9 +10605,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    2,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
@@ -10617,17 +10617,17 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * 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 
+	 * 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 
+	 * 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	-	-
@@ -10645,7 +10645,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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:
@@ -10665,11 +10665,11 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         num_large_entries = 5;
 
 	protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3);
-	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 3, 
+	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 3,
                                          H5C2__DIRTIED_FLAG, (size_t)0);
 
 	protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 4);
-	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 4, 
+	unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, 4,
                                          H5C2__DIRTIED_FLAG, (size_t)0);
 
         /* verify cache size */
@@ -10690,16 +10690,16 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    3,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
         /* now touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to bring all the VARIABLE_ENTRY_TYPE entries to 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)
@@ -10708,14 +10708,14 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 0; i < 31; i++ )
 	{
 	    protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < 5; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10737,24 +10737,24 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    4,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
 	/* Now load three more large entries.  This should result
-	 * in the evictions of (VET, 1), (VET, 3), and (VET, 5), and the 
+	 * 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 
+	 * 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	-	-
@@ -10772,7 +10772,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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:
@@ -10791,7 +10791,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 5; i < 8; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10812,9 +10812,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    5,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
@@ -10822,12 +10822,12 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
 	/* load another large entry.  (VET, 6) should be evicted.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	-	-
@@ -10845,7 +10845,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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:
@@ -10859,7 +10859,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 8; i < 9; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10879,24 +10879,24 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    6,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
-	/* Load another large entry.  
+	/* Load another large entry.
 	 *
-	 * (VET, 7) should be evicted, and (VET, 9) should be unpinned. 
+	 * (VET, 7) should be evicted, and (VET, 9) should be unpinned.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	-	-
@@ -10914,7 +10914,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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:
@@ -10929,7 +10929,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 9; i < 10; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10947,16 +10947,16 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    7,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
         /* Again, touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to bring all the VARIABLE_ENTRY_TYPE entries to 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
@@ -10965,14 +10965,14 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 0; i < 31; i++ )
 	{
 	    protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < 10; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -10990,62 +10990,62 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    8,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
-	/* load two more large entries.  Things get a bit complicated here, 
+	/* 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 H5C2_protect() H5C2_unprotect() 
+         * Initially, the cache has 4 KB of empty space, so the first entry
+	 * (LET, 10) is loaded via calls to H5C2_protect() H5C2_unprotect()
 	 * without causing any evictions.
          *
-         * However, this is not the case for the call of H5C2_protect() on 
+         * However, this is not the case for the call of H5C2_protect() on
 	 * (LET, 11).
          *
-         * Before inserting (LET, 11), H5C2_protect(LET, 11) must try to 
-	 * free up at least 4  KB of space.  To do this, it starts scanning 
+         * Before inserting (LET, 11), H5C2_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.
          *
-         * (VET, 0) is at the bottom of the LRU list, and thus is the first 
-	 * entry considered.  However, it is dirty, so it is moved to the 
+         * (VET, 0) is at the bottom of the LRU list, and thus is the first
+	 * entry considered.  However, it is dirty, so it is moved to the
 	 * top of the LRU list, flushed to disk, and marked clean.
          *
-         * (VET, 9) is the next entry on the bottom of the LRU list. It is 
-	 * dirty too, so the cache moves it to the top of the LRU list, 
-	 * and calls its serialize callback function to construct an on 
+         * (VET, 9) is the next entry on the bottom of the LRU list. It is
+	 * dirty too, so the cache moves it to the top of the LRU list,
+	 * and calls its serialize callback function to construct an on
 	 * disk image of the entry.
          *
-         * However, this serialize function needs to modify (VET, 8), which 
-	 * is currently not in cache.  Thus it calls H5C2_protect(VET, 8) 
-	 * to gain access to it.  H5C2_protect(VET, 8) loads (VET, 8), and 
-	 * then attempts to evict entries to make space for it.  (VET, 9) 
-	 * has already been moved to the head of the LRU list, so the next 
-	 * entries on the LRU are (MET, 0) thru (MET, 30) and (LET, 0) thru 
-	 * (LET, 10) -- all of which are dirty, and are therefore flushed 
+         * However, this serialize function needs to modify (VET, 8), which
+	 * is currently not in cache.  Thus it calls H5C2_protect(VET, 8)
+	 * to gain access to it.  H5C2_protect(VET, 8) loads (VET, 8), and
+	 * then attempts to evict entries to make space for it.  (VET, 9)
+	 * has already been moved to the head of the LRU list, so the next
+	 * entries on the LRU are (MET, 0) thru (MET, 30) and (LET, 0) thru
+	 * (LET, 10) -- 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 to make space for (VET, 8).  
-	 * This space is sufficient, so H5C2_protect(VET, 8) inserts 
-	 * (VET, 8) into the cache's index, marks it as protected, and 
+         * The next entry on the bottom of the LRU list is (VET, 0), which
+	 * is clean, and is therefore evicted to make space for (VET, 8).
+	 * This space is sufficient, so H5C2_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 H5C2_unprotect(VET, 8), which markes (VET, 8) as dirty and 
+         * When the serialize function for (VET, 9) is done with (VET, 8), it
+         * calls H5C2_unprotect(VET, 8), which markes (VET, 8) as dirty and
          * unprotected, and places it at the head of the LRU.
          *
-         * The serialize function for (VET, 9) then returns, and (VET, 9) is 
-         * is written to disk, and marked clean.  
-         * 
-         * At this point, the cache is still full (since (VET, 8) took the 
-	 * space created by the eviction of (VET, 0)). Thus 
-	 * H5C2_protect(LET, 11) continues to look for space.  While 
+         * The serialize function for (VET, 9) then returns, and (VET, 9) is
+         * is written to disk, and marked clean.
+         *
+         * At this point, the cache is still full (since (VET, 8) took the
+	 * space created by the eviction of (VET, 0)). Thus
+	 * H5C2_protect(LET, 11) continues to look for space.  While
 	 * (MET, 0) was the next item on the LRU list when it called the
 	 * serialize function for (VET, 9), the function notices that the
 	 * LRU has been modified, and restarts its search for candidates
@@ -11053,18 +11053,18 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 *
 	 * (VET, 0) is now at the bottom of the LRU, and is clean.  Thus
 	 * it is evicted.  This makes sufficient space for (LET, 11), so
-	 * H5C2_protect(LET, 11) inserts it into the cache, marks it as 
-	 * protected, and returns.  
+	 * H5C2_protect(LET, 11) inserts it into the cache, marks it as
+	 * protected, and returns.
 	 *
 	 * H5C2_unprotect(VET, 11) marks (VET, 11) as unprotected, and then
 	 * returns as well.
 	 *
-	 * The following table shows the expected states of the variable 
+	 * 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	-	-
@@ -11082,13 +11082,13 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (VET, 7)	N	 5 KB	N	N	-	-
 	 *
 	 * (VET, 8)	Y	10 KB	Y	N	-	-
-	 * 
+	 *
 	 * (VET, 9)	N	10 KB	N	N	-	-
 	 *
-	 * Start by updating the expected table for the expected changes in 
+	 * Start by updating the expected table for the expected changes in
 	 * entry status:
 	 *
-	 * Note that we reset the loaded, cleared, flushed, and destroyed 
+	 * Note that we reset the loaded, cleared, flushed, and destroyed
 	 * fields of (VET,8) so we can track what is happening.
 	 */
 	base_addr = entries2[VARIABLE_ENTRY_TYPE];
@@ -11114,10 +11114,10 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
         num_large_entries = 12;
 
-	/* a newly loaded entry is not inserted in the cache until after 
+	/* a newly loaded entry is not inserted in the cache until after
 	 * space has been made for it.  Thus (LET, 11) will not be flushed.
 	 */
-	for ( i = num_variable_entries; 
+	for ( i = num_variable_entries;
 	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
 	      i++ )
 	{
@@ -11128,7 +11128,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 10; i < 12; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -11146,34 +11146,34 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    9,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
 
         /* Again, touch all the non VARIABLE_ENTRY_TYPE entries in the
-	 * cache to bring the last remaining VARIABLE_ENTRY_TYPE entry to the 
-	 * end of the LRU list. 
+	 * cache to bring the last remaining VARIABLE_ENTRY_TYPE entry to the
+	 * end of the LRU list.
 	 */
 	for ( i = 0; i < num_monster_entries; i++ )
 	{
 	    protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, MONSTER_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
 	for ( i = 0; i < num_large_entries; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
 	/* update the expected array to mark all these entries dirty again. */
-	for ( i = num_variable_entries; 
+	for ( i = num_variable_entries;
 	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
 	      i++ )
 	{
@@ -11194,28 +11194,28 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    10,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
     if ( pass2 ) {
-	    
-        /* Load two more large entries.  
+
+        /* Load two more large entries.
 	 *
-	 * Since (VET, 8) is dirty, at first this will just cause (VET, 8) 
+	 * 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 
+	 * 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 
+	 * 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	-	-
@@ -11233,10 +11233,10 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	 * (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 
+	 * Start by updating the expected table for the expected changes in
 	 * entry status:
 	 */
 
@@ -11247,10 +11247,10 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
         num_large_entries = 14;
 
-	/* a newly loaded entry is not inserted in the cache until after 
+	/* 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; 
+	for ( i = num_variable_entries;
 	      i < num_variable_entries + num_monster_entries + num_large_entries - 1;
 	      i++ )
 	{
@@ -11261,7 +11261,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	for ( i = 12; i < 14; i++ )
 	{
 	    protect_entry2(file_ptr, LARGE_ENTRY_TYPE, i);
-	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i, 
+	    unprotect_entry_with_size_change2(file_ptr, LARGE_ENTRY_TYPE, i,
 			                     H5C2__DIRTIED_FLAG, (size_t)0);
 	}
 
@@ -11278,13 +11278,13 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 	}
 
 	/* verify entry status */
-	verify_entry_status2(cache_ptr, 
+	verify_entry_status2(cache_ptr,
 			    11,
-                            (num_variable_entries + num_monster_entries + num_large_entries), 
+                            (num_variable_entries + num_monster_entries + num_large_entries),
 			    expected);
     }
 
-    /* at this point we have cycled all the variable size entries through 
+    /* at this point we have cycled all the variable size entries through
      * the cache.
      *
      * flush the cache and end the test.
@@ -11309,12 +11309,12 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
         }
     }
 
-#if H5C2_COLLECT_CACHE_STATS 
+#if H5C2_COLLECT_CACHE_STATS
     /* If we are collecting stats, check to see if we get the expected
      * values.
      *
      * Testing the stats code is fairly new, but given the extent
-     * to which I find myself depending on the stats, I've decided 
+     * to which I find myself depending on the stats, I've decided
      * to start testing the stats whenever it is convenient to do
      * so.
      */
@@ -13158,7 +13158,7 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
 
     if ( pass2 ) {
 
-        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			          flush_flags);
 
         if ( result < 0 ) {
@@ -13199,7 +13199,7 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
              (int)expected_serialized,
              (int)(entry_ptr->destroyed),
              (int)expected_destroyed);
-#endif 
+#endif
             pass2 = FALSE;
             HDsnprintf(msg, (size_t)128,
                 "Unexpected entry status after flush in single entry test #%d.",
@@ -13376,7 +13376,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
 
     if ( pass2 ) {
 
-        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			          flush_flags);
 
         if ( result < 0 ) {
@@ -13416,7 +13416,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
              (int)expected_serialized,
              (int)(entry_ptr->destroyed),
              (int)expected_destroyed);
-#endif 
+#endif
             pass2 = FALSE;
             HDsnprintf(msg, (size_t)128,
                 "Unexpected entry status after flush in pinned single entry test #%d.",
@@ -13700,7 +13700,7 @@ check_get_entry_status(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -13767,7 +13767,7 @@ check_expunge_entry(void)
          */
 
         result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13834,12 +13834,12 @@ check_expunge_entry(void)
     }
 
     /* Expunge the entry and then verify that it is no longer in the cache.
-     * Also verify that the entry was loaded, cleared, and destroyed, but 
+     * Also verify that the entry was loaded, cleared, and destroyed, but
      * not flushed.
      *
      * JRM -- 10/15/07
      * With the advent of the new cache API, the old clear() callback has
-     * been replaced with the new clear_dirty_bits() callback.  This 
+     * been replaced with the new clear_dirty_bits() callback.  This
      * callback is only called if the entry is dirty to begin with.
      * Thus, the entry will no longer be marked as cleared.
      */
@@ -13847,7 +13847,7 @@ check_expunge_entry(void)
 
     if ( pass2 ) {
 
-        /* entry shouldn't be in cache -- only in_cache should be touched 
+        /* entry shouldn't be in cache -- only in_cache should be touched
 	 * by the status call.  Thus, only check that boolean.
          */
 
@@ -13882,7 +13882,7 @@ check_expunge_entry(void)
     /* now repeat the process with a different entry.  On unprotect
      * mark the entry as dirty.  Verify that it is not flushed.
      */
-    
+
     base_addr = entries2[0];
     entry_ptr = &(base_addr[1]);
 
@@ -13893,7 +13893,7 @@ check_expunge_entry(void)
          */
 
         result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13932,7 +13932,7 @@ check_expunge_entry(void)
     if ( pass2 ) {
 
         result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -13968,12 +13968,12 @@ check_expunge_entry(void)
 
     if ( pass2 ) {
 
-        /* entry shouldn't be in cache -- only in_cache should be touched 
+        /* entry shouldn't be in cache -- only in_cache should be touched
 	 * by the status call.  Thus, only check that boolean.
          */
 
         result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-                                       &in_cache, &is_dirty, &is_protected, 
+                                       &in_cache, &is_dirty, &is_protected,
 				       &is_pinned);
 
 	if ( result < 0 ) {
@@ -14031,7 +14031,7 @@ check_expunge_entry(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -14044,7 +14044,7 @@ check_expunge_entry(void)
 /*-------------------------------------------------------------------------
  * Function:	check_multiple_read_protect()
  *
- * Purpose:	Verify that multiple, simultaneous read protects of a 
+ * Purpose:	Verify that multiple, simultaneous read protects of a
  * 		single entry perform as expectd.
  *
  * Return:	void
@@ -14105,7 +14105,7 @@ check_multiple_read_protect(void)
 
         entry_ptr = &((entries2[0])[0]);
 
-        if ( ( entry_ptr->header.is_protected ) || 
+        if ( ( entry_ptr->header.is_protected ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -14128,7 +14128,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro2(file_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 1 ) ) {
 
@@ -14151,7 +14151,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro2(file_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 2 ) ) {
 
@@ -14174,7 +14174,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry2(file_ptr, 0, 0, FALSE, H5C2__NO_FLAGS_SET);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 1 ) ) {
 
@@ -14197,7 +14197,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro2(file_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 2 ) ) {
 
@@ -14220,7 +14220,7 @@ check_multiple_read_protect(void)
     {
         protect_entry_ro2(file_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 3 ) ) {
 
@@ -14243,7 +14243,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry2(file_ptr, 0, 0, FALSE, H5C2__NO_FLAGS_SET);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 2 ) ) {
 
@@ -14266,7 +14266,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry2(file_ptr, 0, 0, FALSE, H5C2__NO_FLAGS_SET);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( ! ( entry_ptr->header.is_read_only ) ) ||
 	     ( entry_ptr->header.ro_ref_count != 1 ) ) {
 
@@ -14289,7 +14289,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry2(file_ptr, 0, 0, FALSE, H5C2__NO_FLAGS_SET);
 
-        if ( ( entry_ptr->header.is_protected ) || 
+        if ( ( entry_ptr->header.is_protected ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -14309,7 +14309,7 @@ check_multiple_read_protect(void)
 #endif /* H5C2_COLLECT_CACHE_STATS */
 
 
-    /* If we get this far, do a write protect and unprotect to verify 
+    /* If we get this far, do a write protect and unprotect to verify
      * that the stats are getting collected properly here as well.
      */
 
@@ -14317,7 +14317,7 @@ check_multiple_read_protect(void)
     {
         protect_entry2(file_ptr, 0, 0);
 
-        if ( ( ! ( entry_ptr->header.is_protected ) ) || 
+        if ( ( ! ( entry_ptr->header.is_protected ) ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -14340,7 +14340,7 @@ check_multiple_read_protect(void)
     {
         unprotect_entry2(file_ptr, 0, 0, FALSE, H5C2__NO_FLAGS_SET);
 
-        if ( ( entry_ptr->header.is_protected ) || 
+        if ( ( entry_ptr->header.is_protected ) ||
  	     ( entry_ptr->header.is_read_only ) ||
 	     ( entry_ptr->header.ro_ref_count != 0 ) ) {
 
@@ -14360,7 +14360,7 @@ check_multiple_read_protect(void)
 #endif /* H5C2_COLLECT_CACHE_STATS */
 
 
-    /* Finally, mix things up a little, using a mix of reads and 
+    /* Finally, mix things up a little, using a mix of reads and
      * and writes on different entries.  Also include a pin to verify
      * that it works as well.
      *
@@ -14463,7 +14463,7 @@ check_multiple_read_protect(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -14585,7 +14585,7 @@ check_rename_entry(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -14713,7 +14713,7 @@ check_rename_entry__run_test(H5F_t * file_ptr,
                 }
             }
 
-            unpin_entry2(file_ptr, spec_ptr->entry_type, 
+            unpin_entry2(file_ptr, spec_ptr->entry_type,
 			 spec_ptr->entry_index);
 
         } else {
@@ -14836,7 +14836,7 @@ check_pin_protected_entry(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -14887,7 +14887,7 @@ check_resize_entry(void)
 
     /* Setup a cache and verify that it is empty.
      *
-     * Then force the load of an entry by protecting it, and verify that 
+     * Then force the load of an entry by protecting it, and verify that
      * the entry and cache have the expected sizes.
      *
      * Then unprotect the entry with the size changed flag and a reduced
@@ -14895,10 +14895,10 @@ check_resize_entry(void)
      * sizes.
      *
      * Use a second protect/unprotect cycle to restore the entry to
-     * its original size.  Verify that the entry and cache have the 
+     * its original size.  Verify that the entry and cache have the
      * expected sizes.
      *
-     * Protect and unprotect the entry again to pin it.  Use 
+     * Protect and unprotect the entry again to pin it.  Use
      * H5C2_resize_entry to reduce its size.  Verify that the entry
      * and cache have the expected sizes.
      *
@@ -14910,7 +14910,7 @@ check_resize_entry(void)
      *
      *
      * Obesrve that all the above tests have been done with only one
-     * entry in the cache.  Repeat the tests with several entries in 
+     * entry in the cache.  Repeat the tests with several entries in
      * the cache.
      */
 
@@ -14964,8 +14964,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -14997,7 +14997,7 @@ check_resize_entry(void)
 
         result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			       &(types2[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       H5C2__SIZE_CHANGED_FLAG | H5C2__DIRTIED_FLAG,
 			       (LARGE_ENTRY_SIZE / 2));
 
@@ -15034,8 +15034,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15070,7 +15070,7 @@ check_resize_entry(void)
 
         result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			       &(types2[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       (H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG),
 			       LARGE_ENTRY_SIZE);
 
@@ -15107,8 +15107,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15143,17 +15143,17 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_resize_pinned_entry((void *)entry_ptr, 
+        result = H5C2_resize_pinned_entry((void *)entry_ptr,
 			                 (LARGE_ENTRY_SIZE / 4));
 
 	if ( result < 0 ) {
 
             pass2 = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C2_resize_pinned_entry() reports failure 1.");
             failure_mssg2 = msg;
 
-	} 
+	}
     }
 
     if ( pass2 ) {
@@ -15172,8 +15172,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15204,17 +15204,17 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_resize_pinned_entry((void *)entry_ptr, 
+        result = H5C2_resize_pinned_entry((void *)entry_ptr,
 			                 LARGE_ENTRY_SIZE);
 
 	if ( result < 0 ) {
 
             pass2 = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C2_resize_pinned_entry() reports failure 2.");
             failure_mssg2 = msg;
 
-	} 
+	}
     }
 
     if ( pass2 ) {
@@ -15233,8 +15233,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15265,13 +15265,13 @@ check_resize_entry(void)
 
     protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0);
 
-    unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0, FALSE, 
+    unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0, FALSE,
 		    H5C2__UNPIN_ENTRY_FLAG | H5C2__DELETED_FLAG);
 
     if ( pass2 ) {
 
         result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -15391,8 +15391,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15424,7 +15424,7 @@ check_resize_entry(void)
 
         result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			       &(types2[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       H5C2__SIZE_CHANGED_FLAG | H5C2__DIRTIED_FLAG,
 			       (LARGE_ENTRY_SIZE / 2));
 
@@ -15448,10 +15448,10 @@ check_resize_entry(void)
     if ( pass2 ) {
 
 	if ( ( cache_ptr->index_len != 4 ) ||
-	     ( cache_ptr->index_size != 
+	     ( cache_ptr->index_size !=
 	       ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 2)) ) ||
 	     ( cache_ptr->slist_len != 2 ) ||
-	     ( cache_ptr->slist_size != 
+	     ( cache_ptr->slist_size !=
 	       (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 2)) ) ) {
 
             pass2 = FALSE;
@@ -15463,8 +15463,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15499,7 +15499,7 @@ check_resize_entry(void)
 
         result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			       &(types2[LARGE_ENTRY_TYPE]), entry_ptr->addr,
-			       (void *)entry_ptr, 
+			       (void *)entry_ptr,
 			       (H5C2__DIRTIED_FLAG | H5C2__SIZE_CHANGED_FLAG),
 			       LARGE_ENTRY_SIZE);
 
@@ -15536,8 +15536,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15572,26 +15572,26 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_resize_pinned_entry((void *)entry_ptr, 
+        result = H5C2_resize_pinned_entry((void *)entry_ptr,
 			                 (LARGE_ENTRY_SIZE / 4));
 
 	if ( result < 0 ) {
 
             pass2 = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C2_resize_pinned_entry() reports failure 3.");
             failure_mssg2 = msg;
 
-	} 
+	}
     }
 
     if ( pass2 ) {
 
 	if ( ( cache_ptr->index_len != 4 ) ||
-	     ( cache_ptr->index_size != 
+	     ( cache_ptr->index_size !=
 	       ((3 * LARGE_ENTRY_SIZE) + (LARGE_ENTRY_SIZE / 4)) ) ||
 	     ( cache_ptr->slist_len != 2 ) ||
-	     ( cache_ptr->slist_size != 
+	     ( cache_ptr->slist_size !=
 	       (LARGE_ENTRY_SIZE + (LARGE_ENTRY_SIZE / 4)) ) ) {
 
             pass2 = FALSE;
@@ -15603,8 +15603,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15635,17 +15635,17 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_resize_pinned_entry((void *)entry_ptr, 
+        result = H5C2_resize_pinned_entry((void *)entry_ptr,
 			                 LARGE_ENTRY_SIZE);
 
 	if ( result < 0 ) {
 
             pass2 = FALSE;
-            HDsnprintf(msg, (size_t)128, 
+            HDsnprintf(msg, (size_t)128,
 		       "H5C2_resize_pinned_entry() reports failure 4.");
             failure_mssg2 = msg;
 
-	} 
+	}
     }
 
     if ( pass2 ) {
@@ -15664,8 +15664,8 @@ check_resize_entry(void)
 
     if ( pass2 ) {
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
-			              &reported_entry_size, &in_cache, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
+			              &reported_entry_size, &in_cache,
 				      &is_dirty, &is_protected, &is_pinned);
 
 	if ( result < 0 ) {
@@ -15696,13 +15696,13 @@ check_resize_entry(void)
 
     protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3);
 
-    unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3, FALSE, 
+    unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3, FALSE,
 		    H5C2__UNPIN_ENTRY_FLAG | H5C2__DELETED_FLAG);
 
     if ( pass2 ) {
 
         result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
-                                      &in_cache, &is_dirty, &is_protected, 
+                                      &in_cache, &is_dirty, &is_protected,
 				      &is_pinned);
 
 	if ( result < 0 ) {
@@ -15797,7 +15797,7 @@ check_resize_entry(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -15810,7 +15810,7 @@ check_resize_entry(void)
 /*-------------------------------------------------------------------------
  * Function:	check_evictions_enabled()
  *
- * Purpose:	Verify that H5C2_get_evictions_enabled() and 
+ * Purpose:	Verify that H5C2_get_evictions_enabled() and
  * 		H5C2_set_evictions_enabled() functions perform as expected.
  *
  * Return:	void
@@ -15863,7 +15863,7 @@ check_evictions_enabled(void)
      * Load another entry -- verify that this does not cause an entry
      * to be evicted.
      *
-     * Insert an entry -- verify that this does not cause an entry to 
+     * Insert an entry -- verify that this does not cause an entry to
      * be evicted.
      *
      * Use H5C2_set_evictions_enabled() to re-enable evictions.  Verify
@@ -15876,7 +15876,7 @@ check_evictions_enabled(void)
      * Protect an entry not in the cache.  Verify that this causes
      * two evictions.
      *
-     * Used H5C2_set_evictions_enabled() to disable evictions again.  
+     * Used H5C2_set_evictions_enabled() to disable evictions again.
      * Verify with a call to H5C2_get_evictions_enabled().
      *
      * Now flush and discard the cache -- should succeed.
@@ -15946,7 +15946,7 @@ check_evictions_enabled(void)
     for ( i = 0; i < 16 ; i++ )
     {
         protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i);
-        unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i, 
+        unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, i,
 			FALSE, H5C2__NO_FLAGS_SET);
     }
 
@@ -15977,7 +15977,7 @@ check_evictions_enabled(void)
 
     /* protect and unprotect another entry */
     protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 16);
-    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 16, 
+    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 16,
 		    FALSE, H5C2__NO_FLAGS_SET);
 
     if ( show_progress ) /* 7 */
@@ -16008,7 +16008,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[0]);
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -16071,7 +16071,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[1]);
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -16142,7 +16142,7 @@ check_evictions_enabled(void)
 
     /* protect and unprotect another entry */
     protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 18);
-    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 18, 
+    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 18,
 		    FALSE, H5C2__NO_FLAGS_SET);
 
     if ( show_progress ) /* 15 */
@@ -16215,7 +16215,7 @@ check_evictions_enabled(void)
 
     /* protect and unprotect an entry that is in the cache */
     protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 19);
-    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 19, 
+    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 19,
 		    FALSE, H5C2__NO_FLAGS_SET);
 
     if ( show_progress ) /* 20 */
@@ -16244,14 +16244,14 @@ check_evictions_enabled(void)
 
     /* protect and unprotect an entry that isn't in the cache */
     protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 20);
-    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 20, 
+    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 20,
 		    FALSE, H5C2__NO_FLAGS_SET);
 
     if ( show_progress ) /* 22 */
         HDfprintf(stdout, "%s() - %0d -- pass2 = %d\n",
                   fcn_name, mile_stone++, (int)pass2);
 
-    /* verify that the entries have been evicted to bring the 
+    /* verify that the entries have been evicted to bring the
      * cache back down to its normal size.
      */
 
@@ -16278,7 +16278,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[2]);
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -16314,7 +16314,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[3]);
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -16363,11 +16363,11 @@ check_evictions_enabled(void)
         HDfprintf(stdout, "%s() - %0d -- pass2 = %d\n",
                   fcn_name, mile_stone++, (int)pass2);
 
-    /* protect and unprotect an entry that isn't in the cache, forcing 
+    /* protect and unprotect an entry that isn't in the cache, forcing
      * the cache to grow.
      */
     protect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 21);
-    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 21, 
+    unprotect_entry2(file_ptr, MONSTER_ENTRY_TYPE, 21,
 		    FALSE, H5C2__NO_FLAGS_SET);
 
 
@@ -16443,7 +16443,7 @@ check_evictions_enabled(void)
 
         entry_ptr = &(base_addr[4]);
 
-        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr, 
+        result = H5C2_get_entry_status(file_ptr, entry_ptr->addr,
 			              NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
@@ -16511,7 +16511,7 @@ check_evictions_enabled(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -16563,7 +16563,7 @@ check_flush_protected_err(void)
 
         protect_entry2(file_ptr, 0, 0);
 
-        if ( H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        if ( H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			      H5C2__NO_FLAGS_SET)
              >= 0 ) {
 
@@ -16574,7 +16574,7 @@ check_flush_protected_err(void)
 
             unprotect_entry2(file_ptr, 0, 0, TRUE, H5C2__NO_FLAGS_SET);
 
-            if ( H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+            if ( H5C2_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
 				  H5C2__NO_FLAGS_SET)
                  < 0 ) {
 
@@ -16598,7 +16598,7 @@ check_flush_protected_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -16675,7 +16675,7 @@ check_destroy_pinned_err(void)
                 file_ptr->shared->cache2 = NULL;
 	    }
         }
-            
+
         if ( saved_cache2 != NULL ) {
 
             file_ptr->shared->cache2 = saved_cache2;
@@ -16701,7 +16701,7 @@ check_destroy_pinned_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -16756,7 +16756,7 @@ check_destroy_protected_err(void)
         if ( H5C2_dest(file_ptr, H5P_DATASET_XFER_DEFAULT) >= 0 ) {
 
             pass2 = FALSE;
-            failure_mssg2 = 
+            failure_mssg2 =
 		    "destroy succeeded on cache with protected entry.\n";
 
         } else {
@@ -16772,7 +16772,7 @@ check_destroy_protected_err(void)
                 file_ptr->shared->cache2 = NULL;
 	    }
         }
-            
+
         if ( saved_cache2 != NULL ) {
 
             file_ptr->shared->cache2 = saved_cache2;
@@ -16797,7 +16797,7 @@ check_destroy_protected_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -16886,7 +16886,7 @@ check_duplicate_insert_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -16990,7 +16990,7 @@ check_rename_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17056,9 +17056,9 @@ check_double_pin_err(void)
 
     if ( pass2 ) {
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			        &(types2[0]), entry_ptr->addr, 
-				(void *)entry_ptr, H5C2__PIN_ENTRY_FLAG, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[0]), entry_ptr->addr,
+				(void *)entry_ptr, H5C2__PIN_ENTRY_FLAG,
 				(size_t)0);
 
         if ( result > 0 ) {
@@ -17088,7 +17088,7 @@ check_double_pin_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17152,9 +17152,9 @@ check_double_unpin_err(void)
 
     if ( pass2 ) {
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,  
-			        &(types2[0]), entry_ptr->addr, 
-				(void *)entry_ptr, H5C2__UNPIN_ENTRY_FLAG, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[0]), entry_ptr->addr,
+				(void *)entry_ptr, H5C2__UNPIN_ENTRY_FLAG,
 				(size_t)0);
 
         if ( result > 0 ) {
@@ -17197,7 +17197,7 @@ check_double_unpin_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17317,7 +17317,7 @@ check_pin_entry_errs(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17381,9 +17381,9 @@ check_double_protect_err(void)
 
     if ( pass2 ) {
 
-        cache_entry_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			               &(types2[0]), entry_ptr->addr, 
-				       entry_ptr->size, NULL, 
+        cache_entry_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			               &(types2[0]), entry_ptr->addr,
+				       entry_ptr->size, NULL,
 				       H5C2__NO_FLAGS_SET);
 
         if ( cache_entry_ptr != NULL ) {
@@ -17413,7 +17413,7 @@ check_double_protect_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17482,9 +17482,9 @@ check_double_unprotect_err(void)
 
     if ( pass2 ) {
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			        &(types2[0]), entry_ptr->addr, 
-				(void *)entry_ptr, H5C2__NO_FLAGS_SET, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[0]), entry_ptr->addr,
+				(void *)entry_ptr, H5C2__NO_FLAGS_SET,
 				(size_t)0);
 
         if ( result > 0 ) {
@@ -17510,7 +17510,7 @@ check_double_unprotect_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17648,7 +17648,7 @@ check_mark_entry_dirty_errs(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17781,7 +17781,7 @@ check_expunge_entry_errs(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17823,11 +17823,11 @@ check_resize_entry_errs(void)
 
     pass2 = TRUE;
 
-    /* Allocate a cache, protect an entry, and then call 
+    /* Allocate a cache, protect an entry, and then call
      * H5C2_resize_pinned_entry() to resize it -- this should fail.
      *
      * Unprotect the the entry with the pinned flag, and then call
-     * H5C2_resize_pinned_entry() again with new size of zero.  
+     * H5C2_resize_pinned_entry() again with new size of zero.
      * This should fail too.
      *
      * Finally, unpin the entry and destroy the cache.
@@ -17866,7 +17866,7 @@ check_resize_entry_errs(void)
 
     if ( pass2 ) {
 
-	result = H5C2_resize_pinned_entry((void *)entry_ptr, 
+	result = H5C2_resize_pinned_entry((void *)entry_ptr,
 			                  (size_t)0);
 
         if ( result > 0 ) {
@@ -17897,7 +17897,7 @@ check_resize_entry_errs(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -17939,7 +17939,7 @@ check_unprotect_ro_dirty_err(void)
 
     pass2 = TRUE;
 
-    /* allocate a cache, protect an entry read only, and then unprotect it 
+    /* allocate a cache, protect an entry read only, and then unprotect it
      * with the dirtied flag set.  This should fail.  Destroy the cache
      * -- should succeed.
      */
@@ -17958,9 +17958,9 @@ check_unprotect_ro_dirty_err(void)
 
     if ( pass2 ) {
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			        &(types2[0]), entry_ptr->addr, 
-				(void *)entry_ptr, H5C2__DIRTIED_FLAG, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[0]), entry_ptr->addr,
+				(void *)entry_ptr, H5C2__DIRTIED_FLAG,
 				(size_t)0);
 
         if ( result >= 0 ) {
@@ -17982,8 +17982,8 @@ check_unprotect_ro_dirty_err(void)
         takedown_cache2(file_ptr, FALSE, FALSE);
     }
 
-    /* allocate a another cache, protect an entry read only twice, and 
-     * then unprotect it with the dirtied flag set.  This should fail.  
+    /* allocate a another cache, protect an entry read only twice, and
+     * then unprotect it with the dirtied flag set.  This should fail.
      * Unprotect it with no flags set twice and then destroy the cache.
      * This should succeed.
      */
@@ -18003,9 +18003,9 @@ check_unprotect_ro_dirty_err(void)
 
     if ( pass2 ) {
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			        &(types2[0]), entry_ptr->addr, 
-				(void *)entry_ptr, H5C2__DIRTIED_FLAG, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[0]), entry_ptr->addr,
+				(void *)entry_ptr, H5C2__DIRTIED_FLAG,
 				(size_t)0);
 
         if ( result > 0 ) {
@@ -18038,7 +18038,7 @@ check_unprotect_ro_dirty_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -18080,9 +18080,9 @@ check_protect_ro_rw_err(void)
 
     pass2 = TRUE;
 
-    /* allocate a cache, protect an entry read only, and then try to protect 
+    /* allocate a cache, protect an entry read only, and then try to protect
      * it again rw.  This should fail.
-     * 
+     *
      * Unprotect the entry and destroy the cache -- should succeed.
      */
 
@@ -18100,8 +18100,8 @@ check_protect_ro_rw_err(void)
 
     if ( pass2 ) {
 
-        thing_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			         &(types2[0]), entry_ptr->addr, 
+        thing_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			         &(types2[0]), entry_ptr->addr,
 				 entry_ptr->size, NULL, H5C2__NO_FLAGS_SET);
 
         if ( thing_ptr != NULL ) {
@@ -18131,7 +18131,7 @@ check_protect_ro_rw_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -18144,7 +18144,7 @@ check_protect_ro_rw_err(void)
 /*-------------------------------------------------------------------------
  * Function:	check_evictions_enabled_err()
  *
- * Purpose:	Verify that H5C2_get_evictions_enabled() and 
+ * Purpose:	Verify that H5C2_get_evictions_enabled() and
  *              H5C2_set_evictions_enabled() generate errors as expected.
  *
  * Return:	void
@@ -18181,7 +18181,7 @@ check_check_evictions_enabled_err(void)
      *
      * Repeat with a NULL evictions_enabled_ptr, should fail as well.
      *
-     * Configure the cache to use auto cache resize.  Call 
+     * Configure the cache to use auto cache resize.  Call
      * H5C2_set_evictions_enabled() to disable evictions.  Should fail.
      *
      * Unprotect the entry and destroy the cache -- should succeed.
@@ -18279,7 +18279,7 @@ check_check_evictions_enabled_err(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -18307,7 +18307,7 @@ check_check_evictions_enabled_err(void)
  *              John Mainzer 1/8/08
  *              Added a basic set of tests for the flash cache size
  *              increment code.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 
@@ -21510,20 +21510,20 @@ check_auto_cache_resize(void)
 
 
     /* now test the flash cache size increment code.  At least at present,
-     * there should be no interaction between the regular auto-resize 
-     * code and the flash cache size increment code other than a reset 
+     * there should be no interaction between the regular auto-resize
+     * code and the flash cache size increment code other than a reset
      * of the counter and stats collection used by the regular auto-resize
-     * code.  Thus we do only limited tests of the two pieces of code 
+     * code.  Thus we do only limited tests of the two pieces of code
      * operating together.
      *
      * Start with simple test to verify that the flash cache increment
      * code increases the cache size when and as expected.
      */
 
-    /* Place the cache in a know state via a flush destroy on the cache 
-     * to clear out all entries, and then a reset on all the entries.  
-     * Then configure the cache for the flash cache size increase tests, 
-     * and force the flash size increase code through all its operational 
+    /* Place the cache in a know state via a flush destroy on the cache
+     * to clear out all entries, and then a reset on all the entries.
+     * Then configure the cache for the flash cache size increase tests,
+     * and force the flash size increase code through all its operational
      * modes.  Verify that all perform as expected.
      */
 
@@ -21630,7 +21630,7 @@ check_auto_cache_resize(void)
 
     /* Now load a monster entry.  Since a monster entry is larger than
      * half the size of the cache, and there is not sufficient space
-     * for a monster entry in the cache, we will add space to the 
+     * for a monster entry in the cache, we will add space to the
      * cache to make room for the entry.
      */
     if ( pass2 ) {
@@ -21646,7 +21646,7 @@ check_auto_cache_resize(void)
 	     ( ( ( 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 + 
+                 ( cache_ptr->index_size != (HUGE_ENTRY_SIZE +
 		                             MONSTER_ENTRY_SIZE) ) ||
 		 ( cache_ptr->cache_accesses != 1 ) ) ) ) {
 
@@ -21708,9 +21708,9 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* delete existing entries to prepare for next test, and reset 
+    /* delete existing entries to prepare for next test, and reset
      * the size of the cache.
-     */ 
+     */
     if ( pass2 ) {
 
 	expunge_entry2(file_ptr, MONSTER_ENTRY_TYPE, 1);
@@ -21718,13 +21718,13 @@ check_auto_cache_resize(void)
 
         if ( pass2 ) {
 
-            result = H5C2_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C2_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass2 = FALSE; 
-                failure_mssg2 = 
+                pass2 = FALSE;
+                failure_mssg2 =
 			"H5C2_set_cache_auto_resize_config failed 13.\n";
 	    }
         }
@@ -21741,7 +21741,7 @@ check_auto_cache_resize(void)
 	}
     }
 
-    /* repeat the above basic test, only this time, use inserts to add 
+    /* repeat the above basic test, only this time, use inserts to add
      * entries to the cache, not protects.
      */
 
@@ -21776,7 +21776,7 @@ check_auto_cache_resize(void)
 
     /* Now insert a monster entry.  Since a monster entry is larger than
      * half the size of the cache, and there is not sufficient space
-     * for a monster entry in the cache, we will add space to the 
+     * for a monster entry in the cache, we will add space to the
      * cache to make room for the entry.
      */
     if ( pass2 ) {
@@ -21788,7 +21788,7 @@ check_auto_cache_resize(void)
 	     ( ( ( cache_ptr->max_cache_size != (80 * 1024) ) ||
 		 ( cache_ptr->min_clean_size != (40 * 1024) ) ||
 		 ( cache_ptr->index_len != 2 ) ||
-                 ( cache_ptr->index_size != 
+                 ( cache_ptr->index_size !=
 		   HUGE_ENTRY_SIZE + MONSTER_ENTRY_SIZE ) ||
 		 ( cache_ptr->cache_accesses != 0 ) ) ) ) {
 
@@ -21803,14 +21803,14 @@ check_auto_cache_resize(void)
      */
     if ( pass2 ) {
 
-        insert_entry2(file_ptr, MONSTER_ENTRY_TYPE, 5, TRUE, 
+        insert_entry2(file_ptr, MONSTER_ENTRY_TYPE, 5, TRUE,
 		     H5C2__NO_FLAGS_SET);
 
 	if ( ( pass2 ) &&
 	     ( ( ( cache_ptr->max_cache_size != (144 * 1024) ) ||
 		 ( cache_ptr->min_clean_size != ( 72 * 1024) ) ||
 		 ( cache_ptr->index_len != 3 ) ||
-                 ( cache_ptr->index_size != 
+                 ( cache_ptr->index_size !=
 		   2 * MONSTER_ENTRY_SIZE + HUGE_ENTRY_SIZE ) ||
 		 ( cache_ptr->cache_accesses != 0 ) ) ) ) {
 
@@ -21845,11 +21845,11 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* delete existing entries to prepare for next test, and reset 
+    /* delete existing entries to prepare for next test, and reset
      * the size of the cache.  We must also change the size of the needed
-     * variable entries before we run the test, so will protect and 
+     * variable entries before we run the test, so will protect and
      * unprotect them now so as to get the correct initial size.
-     */ 
+     */
     if ( pass2 ) {
 
 	expunge_entry2(file_ptr, MONSTER_ENTRY_TYPE, 5);
@@ -21877,13 +21877,13 @@ check_auto_cache_resize(void)
         if ( pass2 ) {
 
             auto_size_ctl.initial_size           = 6 * 1024;
-            result = H5C2_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C2_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass2 = FALSE; 
-                failure_mssg2 = 
+                pass2 = FALSE;
+                failure_mssg2 =
 			"H5C2_set_cache_auto_resize_config failed 13.\n";
 	    }
         }
@@ -21906,11 +21906,11 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12);
@@ -22033,7 +22033,7 @@ check_auto_cache_resize(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* re-size the variable entries back down to their initial size, and
-     * restore the cache to its initial size as well, in preparation 
+     * restore the cache to its initial size as well, in preparation
      * for the next test.
      */
     if ( pass2 ) {
@@ -22051,13 +22051,13 @@ check_auto_cache_resize(void)
         if ( pass2 ) {
 
             auto_size_ctl.initial_size           = 6 * 1024;
-            result = H5C2_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C2_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass2 = FALSE; 
-                failure_mssg2 = 
+                pass2 = FALSE;
+                failure_mssg2 =
 			"H5C2_set_cache_auto_resize_config failed 14.\n";
 	    }
         }
@@ -22081,7 +22081,7 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C2__PIN_ENTRY_FLAG);
         resize_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024, TRUE);
 
@@ -22120,7 +22120,7 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C2__PIN_ENTRY_FLAG);
         resize_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024, TRUE);
 
@@ -22141,7 +22141,7 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C2__PIN_ENTRY_FLAG);
         resize_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024, TRUE);
 
@@ -22165,15 +22165,15 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C2__UNPIN_ENTRY_FLAG);
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C2__UNPIN_ENTRY_FLAG);
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C2__UNPIN_ENTRY_FLAG);
 
 	if ( ( pass2 ) &&
@@ -22191,7 +22191,7 @@ check_auto_cache_resize(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* re-size the variable entries back down to their initial size, and
-     * restore the cache to its initial size as well, in preparation 
+     * restore the cache to its initial size as well, in preparation
      * for the next test.
      */
     if ( pass2 ) {
@@ -22209,13 +22209,13 @@ check_auto_cache_resize(void)
         if ( pass2 ) {
 
             auto_size_ctl.initial_size           = 6 * 1024;
-            result = H5C2_set_cache_auto_resize_config(cache_ptr, 
+            result = H5C2_set_cache_auto_resize_config(cache_ptr,
 			                              &auto_size_ctl);
 
             if ( result != SUCCEED ) {
 
-                pass2 = FALSE; 
-                failure_mssg2 = 
+                pass2 = FALSE;
+                failure_mssg2 =
 			"H5C2_set_cache_auto_resize_config failed 15.\n";
 	    }
         }
@@ -22235,7 +22235,7 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C2__PIN_ENTRY_FLAG);
         resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, 2 * 1024);
 
@@ -22274,7 +22274,7 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C2__PIN_ENTRY_FLAG);
         resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, 10 * 1024);
 
@@ -22295,7 +22295,7 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C2__PIN_ENTRY_FLAG);
         resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, 10 * 1024);
 
@@ -22319,15 +22319,15 @@ check_auto_cache_resize(void)
     if ( pass2 ) {
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 10, NO_CHANGE,
 			H5C2__UNPIN_ENTRY_FLAG);
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 11, NO_CHANGE,
 			H5C2__UNPIN_ENTRY_FLAG);
 
         protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12);
-        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE, 
+        unprotect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 12, NO_CHANGE,
 			H5C2__UNPIN_ENTRY_FLAG);
 
 	if ( ( pass2 ) &&
@@ -22441,14 +22441,14 @@ check_auto_cache_resize(void)
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
     /* protect and unprotect a large entry -- no change in cache size since
-     * a large entry will just fill the available space in the cache.  
+     * a large entry will just fill the available space in the cache.
      */
     if ( pass2 ) {
 
         rpt_fcn_called = FALSE;
 
         protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0);
-        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE, 
+        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
 
 	if ( ( pass2 ) &&
@@ -22466,7 +22466,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* protect and unprotect another a large entry -- should trigger a 
+    /* protect and unprotect another a large entry -- should trigger a
      * flash cache size increase to 12 KB (remember that flash_multiple is
      * set to 2.0).
      */
@@ -22475,7 +22475,7 @@ check_auto_cache_resize(void)
         rpt_fcn_called = FALSE;
 
         protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 1);
-        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 1, NO_CHANGE, 
+        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 1, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
 
 	if ( ( pass2 ) &&
@@ -22493,7 +22493,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* protect and unprotect two more large entries -- shouldnt trigger a 
+    /* protect and unprotect two more large entries -- shouldnt trigger a
      * flash cache size increase.
      */
     if ( pass2 ) {
@@ -22501,10 +22501,10 @@ check_auto_cache_resize(void)
         rpt_fcn_called = FALSE;
 
         protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 2);
-        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 2, NO_CHANGE, 
+        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 2, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
         protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3);
-        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3, NO_CHANGE, 
+        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 3, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
 
 	if ( ( pass2 ) &&
@@ -22522,7 +22522,7 @@ check_auto_cache_resize(void)
 
     if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
 
-    /* do many accesses of a single entry to talk the cache into reducing 
+    /* do many accesses of a single entry to talk the cache into reducing
      * its size to the minimum.
      */
     if ( pass2 ) {
@@ -22558,17 +22558,17 @@ check_auto_cache_resize(void)
         rpt_fcn_called = FALSE;
 
         protect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0);
-        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE, 
+        unprotect_entry2(file_ptr, LARGE_ENTRY_TYPE, 0, NO_CHANGE,
 			H5C2__NO_FLAGS_SET);
 
 	if ( ( pass2 ) &&
 	     ( ( ( 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 != 
+                 ( cache_ptr->index_size !=
 		   LARGE_ENTRY_SIZE + TINY_ENTRY_SIZE ) ||
 		 ( cache_ptr->cache_accesses != 1 )  ||
-		 ( rpt_fcn_called == FALSE ) || 
+		 ( rpt_fcn_called == FALSE ) ||
                  ( rpt_status != flash_increase ) ) ) ) {
 
             pass2 = FALSE;
@@ -22596,7 +22596,7 @@ check_auto_cache_resize(void)
 
         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 ) ) {
 
             pass2 = FALSE;
@@ -22624,7 +22624,7 @@ check_auto_cache_resize(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -25204,27 +25204,27 @@ check_auto_cache_resize_disable(void)
 
 
     /* Now test the flash cache size increment code to verify that it
-     * is disabled when it should be.  
+     * is disabled when it should be.
      *
-     * Since the flash size increase code doesn't look at hit rate, or 
+     * Since the flash size increase code doesn't look at hit rate, or
      * use epochs (other than to start a new epoch if a flash cache size
      * increase is triggered), we go about these tests somewhat differently
      * than the rest of the tests in this function.
      *
-     * As of this writing, there is only one flash cache size increment 
+     * As of this writing, there is only one flash cache size increment
      * mode (add space), which is triggered whenever the size of a newly
      * loaded or inserted entry, or the delta between old and new entry
      * sizes exceeds some fraction of the current maximum cache size, and
      * the cache doesn't have enough free space to accomodate the new/
      * resize entry without performing evictions.  The range of permissible
      * values for the flash_threshold (0.1 to 1.0 as of this writing), and
-     * for the flash_multiple (0.1 to 10.0) do not permit the facility to 
+     * for the flash_multiple (0.1 to 10.0) do not permit the facility to
      * be turned off by configuration.  Thus, flash cache size increases
-     * can be disabled only via the flash_incr_mode, and by setting the 
+     * can be disabled only via the flash_incr_mode, and by setting the
      * current max_cache_size equal to max_size.
      *
      * We have already tested the latter in check_auto_cache_resize(), so
-     * we need only thest the former here.  Do this by disabling flash 
+     * we need only thest the former here.  Do this by disabling flash
      * cache size increments via the flash_incr_mode, and then creating
      * situations that would trigger flash cache size increases were that
      * code enabled.
@@ -25335,7 +25335,7 @@ check_auto_cache_resize_disable(void)
      * size increment code was active, this would trigger an increase.
      * Verify that it doesn't.
      *
-     * This finishes the additional tests needed for the flash cache 
+     * This finishes the additional tests needed for the flash cache
      * size increase code.
      */
     if ( pass2 ) {
@@ -25388,7 +25388,7 @@ check_auto_cache_resize_disable(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -26107,7 +26107,7 @@ check_auto_cache_resize_epoch_markers(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -27581,7 +27581,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
        			(enum H5C2_cache_flash_incr_mode) -1; /* INVALID */
 	invalid_auto_size_ctl.flash_multiple         = 2.0;
 	invalid_auto_size_ctl.flash_threshold        = 0.5;
@@ -27657,7 +27657,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C2_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 0.09; /* INVALID */
 	invalid_auto_size_ctl.flash_threshold        = 0.5;
@@ -27731,7 +27731,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C2_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 10.01; /* INVALID */
 	invalid_auto_size_ctl.flash_threshold        = 0.5;
@@ -27807,7 +27807,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C2_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 1.0;
 	invalid_auto_size_ctl.flash_threshold        = 0.09; /* INVALID */
@@ -27881,7 +27881,7 @@ check_auto_cache_resize_input_errs(void)
         invalid_auto_size_ctl.apply_max_increment    = TRUE;
         invalid_auto_size_ctl.max_increment          = (2 * 1024 * 1024);
 
-	invalid_auto_size_ctl.flash_incr_mode        = 
+	invalid_auto_size_ctl.flash_incr_mode        =
 						H5C2_flash_incr__add_space;
 	invalid_auto_size_ctl.flash_multiple         = 1.0;
 	invalid_auto_size_ctl.flash_threshold        = 1.001; /* INVALID */
@@ -28583,7 +28583,7 @@ check_auto_cache_resize_input_errs(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -28660,7 +28660,7 @@ check_auto_cache_resize_aux_fcns(void)
 	/* double      flash_multiple         = */ 2.0,
 	/* double      flash_threshold        = */ 0.5,
 
-	
+
         /* enum H5C2_cache_decr_mode decr_mode = */ H5C2_decr__off,
 
         /* double      upper_hr_threshold     = */ 0.995,
@@ -29176,7 +29176,7 @@ check_auto_cache_resize_aux_fcns(void)
 
     if ( core_file_driver_failed ) {
 
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
 		  "%s(): Unable to open test file with core file driver.\n",
 		  fcn_name);
     }
@@ -29234,7 +29234,7 @@ main(void)
     if ( envval != NULL ) {
 
         if ( HDstrcmp(envval, "core") == 0 ) {
-   
+
             core_file_forced = TRUE;
 	    try_core_file_driver = TRUE;
 
@@ -29252,7 +29252,7 @@ main(void)
     printf("        skip_long_tests = %d\n", (int)skip_long_tests2);
     printf("        regular_file_forced = %d\n", (int)regular_file_forced);
     printf("        core_file_forced = %d\n", (int)core_file_forced);
-    printf("        core_file_driver_recommended = %d\n", 
+    printf("        core_file_driver_recommended = %d\n",
 		    (int)core_file_driver_recommended);
     printf("        try_core_file_driver = %d\n", (int)try_core_file_driver);
     printf("=========================================\n");
@@ -29262,7 +29262,7 @@ main(void)
 	printf("\n");
         printf("All the longer cache tests will attempt to use the core file\n");
 	printf("driver in an attempt to avoid disk I/O and thereby run the\n");
-	printf("tests faster.  If a test is unable to to do so, it will\n"); 
+	printf("tests faster.  If a test is unable to to do so, it will\n");
 	printf("attempt to run the test using a regular file, and will note\n");
 	printf("this fact at test completion.\n");
 	printf("\n");
@@ -29271,7 +29271,7 @@ main(void)
 	printf("\n");
 	printf("In general, running the longer cache tests with the core\n");
 	printf("file driver should speed up the tests significantly.\n");
-	printf("However, if the available physical ram is less than 2 GB,\n"); 
+	printf("However, if the available physical ram is less than 2 GB,\n");
 	printf("it may slow the tests down instead.\n");
 	printf("\n");
     }
@@ -29292,7 +29292,7 @@ main(void)
     nerrs += write_permitted_check();
 #endif
     /* for shorter tests, the overhead of using the core file driver doesn't
-     * seem to allow us to realize any significant time saveings.  Thus 
+     * seem to allow us to realize any significant time saveings.  Thus
      * set try_core_file_driver to FALSE for the remaining tests.
      */
     try_core_file_driver = FALSE;
diff --git a/test/cache2_api.c b/test/cache2_api.c
index 450206d..90e497e 100644
--- a/test/cache2_api.c
+++ b/test/cache2_api.c
@@ -490,7 +490,7 @@ check_fapl_mdc_api_calls(void)
 
         scratch.version = H5C2__CURR_AUTO_SIZE_CTL_VER;
 
-        result = H5Pget_mdc_config(test_fapl_id, 
+        result = H5Pget_mdc_config(test_fapl_id,
                                    (H5AC_cache_config_t *)&scratch);
 
         if ( result < 0 ) {
@@ -763,7 +763,7 @@ check_file_mdc_api_calls(void)
     /* set alternate config 1 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_1) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_1)
              < 0 ) {
 
             pass2 = FALSE;
@@ -777,7 +777,7 @@ check_file_mdc_api_calls(void)
     /* set alternate config 2 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_2) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_2)
              < 0 ) {
 
             pass2 = FALSE;
@@ -791,7 +791,7 @@ check_file_mdc_api_calls(void)
     /* set alternate config 3 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_3) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_3)
              < 0 ) {
 
             pass2 = FALSE;
@@ -805,7 +805,7 @@ check_file_mdc_api_calls(void)
     /* set alternate config 4 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_4) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_4)
              < 0 ) {
 
             pass2 = FALSE;
@@ -1107,7 +1107,7 @@ mdc_api_call_smoke_check(void)
     /* set alternate config 1 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_1) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_1)
              < 0 ) {
 
             pass2 = FALSE;
@@ -1181,7 +1181,7 @@ mdc_api_call_smoke_check(void)
 
                 sprintf(dset_name, "/dset%03d", i);
                 dataset_ids[i] = H5Dcreate2(file_id, dset_name, H5T_STD_I32BE,
-				            dataspace_id, H5P_DEFAULT, 
+				            dataspace_id, H5P_DEFAULT,
 					    properties, H5P_DEFAULT);
 
                 if ( dataset_ids[i] < 0 ) {
@@ -1342,7 +1342,7 @@ mdc_api_call_smoke_check(void)
     /* set alternate config 2 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_2) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_2)
              < 0 ) {
 
             pass2 = FALSE;
@@ -1494,7 +1494,7 @@ mdc_api_call_smoke_check(void)
     /* set alternate config 3 */
     if ( pass2 ) {
 
-        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_3) 
+        if ( H5Fset_mdc_config(file_id, (H5AC_cache_config_t *)&mod_config_3)
              < 0 ) {
 
             pass2 = FALSE;
@@ -3098,8 +3098,8 @@ check_fapl_mdc_api_errs(void)
     scratch.version = H5C2__CURR_AUTO_SIZE_CTL_VER;
     if  ( pass2 ) {
 
-        H5E_BEGIN_TRY { 
-	    result = H5Pget_mdc_config(-1, (H5AC_cache_config_t *)&scratch); 
+        H5E_BEGIN_TRY {
+	    result = H5Pget_mdc_config(-1, (H5AC_cache_config_t *)&scratch);
 	} H5E_END_TRY;
 
         if ( result >= 0 ) {
@@ -3152,7 +3152,7 @@ check_fapl_mdc_api_errs(void)
     if  ( pass2 ) {
 
         H5E_BEGIN_TRY {
-            result = 
+            result =
 		H5Pget_mdc_config(fapl_id, (H5AC_cache_config_t *)&scratch);
         } H5E_END_TRY;
 
@@ -3171,7 +3171,7 @@ check_fapl_mdc_api_errs(void)
     if ( pass2 ) {
 
         H5E_BEGIN_TRY {
-            result = 
+            result =
 		H5Pset_mdc_config(-1, (H5AC_cache_config_t *)&default_config);
         } H5E_END_TRY;
 
@@ -3199,8 +3199,8 @@ check_fapl_mdc_api_errs(void)
     while ( ( pass2 ) && ( i < NUM_INVALID_CONFIGS ) )
     {
         H5E_BEGIN_TRY {
-            result = 
-		H5Pset_mdc_config(fapl_id, 
+            result =
+		H5Pset_mdc_config(fapl_id,
 				  (H5AC_cache_config_t *)&(invalid_configs[i]));
         } H5E_END_TRY;
 
@@ -3219,7 +3219,7 @@ check_fapl_mdc_api_errs(void)
      */
     scratch.version = H5C2__CURR_AUTO_SIZE_CTL_VER;
     if ( ( pass2 ) &&
-         ( ( H5Pget_mdc_config(fapl_id, (H5AC_cache_config_t *)&scratch) < 0 ) 
+         ( ( H5Pget_mdc_config(fapl_id, (H5AC_cache_config_t *)&scratch) < 0 )
            ||
            ( !CACHE_CONFIGS_EQUAL(default_config, scratch, TRUE, TRUE) ) ) ) {
 
@@ -3364,7 +3364,7 @@ check_file_mdc_api_errs(void)
 	}
 
         H5E_BEGIN_TRY {
-            result = H5Fget_mdc_config(file_id, 
+            result = H5Fget_mdc_config(file_id,
                                        (H5AC_cache_config_t *)&scratch);
         } H5E_END_TRY;
 
@@ -3387,7 +3387,7 @@ check_file_mdc_api_errs(void)
 	}
 
         H5E_BEGIN_TRY {
-            result = H5Fset_mdc_config(-1, 
+            result = H5Fset_mdc_config(-1,
                                        (H5AC_cache_config_t *)&default_config);
         } H5E_END_TRY;
 
@@ -3421,14 +3421,14 @@ check_file_mdc_api_errs(void)
     {
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		    "%s: testing H5Fset_mdc_config() with invalid config %d.\n",
 		    fcn_name, i);
 	}
 
         H5E_BEGIN_TRY {
-            result = 
-		H5Fset_mdc_config(file_id, 
+            result =
+		H5Fset_mdc_config(file_id,
 				  (H5AC_cache_config_t *)&(invalid_configs[i]));
         } H5E_END_TRY;
 
@@ -3453,7 +3453,7 @@ check_file_mdc_api_errs(void)
 
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", 
+	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n",
 		      fcn_name);
 	}
 
@@ -3472,7 +3472,7 @@ check_file_mdc_api_errs(void)
 
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", 
+	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n",
 		      fcn_name);
 	}
 
@@ -3493,7 +3493,7 @@ check_file_mdc_api_errs(void)
 
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", 
+	    HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n",
 		      fcn_name);
 	}
 
diff --git a/test/cache2_common.c b/test/cache2_common.c
index 57149a5..0dcebfc 100644
--- a/test/cache2_common.c
+++ b/test/cache2_common.c
@@ -38,20 +38,20 @@ const char *FILENAME[] = {
     NULL
 };
 
-hid_t saved_fapl_id = H5P_DEFAULT; /* store the fapl id here between 
-				    * cache setup and takedown.  Note 
+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 
+				    * we assume that there is no fapl to
 				    * close.
 				    */
 
-hid_t saved_fid = -1; /* store the file id here between cache setup 
+hid_t saved_fid = -1; /* store the file id here between cache setup
 		       * and takedown.
 		       */
 
-H5C2_t * saved_cache2 = NULL; /* store the pointer to the instance of 
- 			       * of H5C2_t created by H5Fcreate() 
-			       * here between test cache setup and 
+H5C2_t * saved_cache2 = NULL; /* store the pointer to the instance of
+ 			       * of H5C2_t created by H5Fcreate()
+			       * here between test cache setup and
 			       * shutdown.
 			       */
 
@@ -471,7 +471,7 @@ check_write_permitted2(const H5F_t UNUSED * f,
  * Function:	clear_dirty_bits & friends
  *
  * Purpose:	Clear the dirty bits.  The helper functions verify that the
- *		correct version of clear_dirty_gits is being called, and 
+ *		correct version of clear_dirty_gits is being called, and
  *		then call clear_dirty_bits() proper.
  *
  * Return:	SUCCEED
@@ -486,7 +486,7 @@ check_write_permitted2(const H5F_t UNUSED * f,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 clear_dirty_bits(haddr_t addr,
                  size_t len,
                  void * thing)
@@ -519,7 +519,7 @@ clear_dirty_bits(haddr_t addr,
 
 } /* clear_dirty_bits() */
 
-herr_t 
+herr_t
 pico_clear_dirty_bits(haddr_t addr,
                       size_t len,
                       void * thing)
@@ -528,7 +528,7 @@ pico_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 nano_clear_dirty_bits(haddr_t addr,
                       size_t len,
                       void * thing)
@@ -537,7 +537,7 @@ nano_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 micro_clear_dirty_bits(haddr_t addr,
                        size_t len,
                        void * thing)
@@ -546,7 +546,7 @@ micro_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 tiny_clear_dirty_bits(haddr_t addr,
                       size_t len,
                       void * thing)
@@ -555,7 +555,7 @@ tiny_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 small_clear_dirty_bits(haddr_t addr,
                        size_t len,
                        void * thing)
@@ -564,7 +564,7 @@ small_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 medium_clear_dirty_bits(haddr_t addr,
                         size_t len,
                         void * thing)
@@ -573,7 +573,7 @@ medium_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 large_clear_dirty_bits(haddr_t addr,
                        size_t len,
                        void * thing)
@@ -582,7 +582,7 @@ large_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 huge_clear_dirty_bits(haddr_t addr,
                       size_t len,
                       void * thing)
@@ -591,7 +591,7 @@ huge_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 monster_clear_dirty_bits(haddr_t addr,
                          size_t len,
                          void * thing)
@@ -600,7 +600,7 @@ monster_clear_dirty_bits(haddr_t addr,
     return(clear_dirty_bits(addr, len, thing));
 }
 
-herr_t 
+herr_t
 variable_clear_dirty_bits(haddr_t addr,
                           size_t len,
                           void * thing)
@@ -665,11 +665,11 @@ deserialize(haddr_t addr,
     /* verify that the image contains the expected data. */
     HDassert( image_ptr != NULL );
     if ( ( ( entry_ptr->at_main_addr )
-	   && 
-	   ( entry_ptr->written_to_main_addr ) 
+	   &&
+	   ( entry_ptr->written_to_main_addr )
 	 )
          ||
-	 ( ( ! ( entry_ptr->at_main_addr ) ) 
+	 ( ( ! ( entry_ptr->at_main_addr ) )
 	   &&
 	   ( entry_ptr->written_to_alt_addr )
 	 )
@@ -703,9 +703,9 @@ deserialize(haddr_t addr,
                           (int)((idx & 0xFF00)>>8));
             }
 	    HDassert( (*((const char *)image_ptr)) == (char)(type & 0xFF) );
-	    HDassert( (*(((const char *)image_ptr) + 1)) == 
+	    HDassert( (*(((const char *)image_ptr) + 1)) ==
                       (char)((idx & 0xFF00)>>8) );
-	    HDassert( (*(((const char *)image_ptr) + 2)) == 
+	    HDassert( (*(((const char *)image_ptr) + 2)) ==
 	              (char)(idx & 0xFF) );
 
         }
@@ -827,8 +827,8 @@ variable_deserialize(haddr_t addr,
  * 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 
+ * 		The helper functions verify that the correct version of
+ * 		deserialize is being called, and then call deserialize
  * 		proper.
  *
  * Return:	SUCCEED
@@ -843,7 +843,7 @@ variable_deserialize(haddr_t addr,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 image_len(void *thing,
           size_t *image_len_ptr)
 {
@@ -885,7 +885,7 @@ image_len(void *thing,
 } /* image_len() */
 
 
-herr_t 
+herr_t
 pico_image_len(void *thing,
                size_t *image_len_ptr)
 {
@@ -893,7 +893,7 @@ pico_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 nano_image_len(void *thing,
                size_t *image_len_ptr)
 {
@@ -901,7 +901,7 @@ nano_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 micro_image_len(void *thing,
                 size_t *image_len_ptr)
 {
@@ -909,7 +909,7 @@ micro_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 tiny_image_len(void *thing,
                size_t *image_len_ptr)
 {
@@ -918,7 +918,7 @@ tiny_image_len(void *thing,
 }
 
 
-herr_t 
+herr_t
 small_image_len(void *thing,
                 size_t *image_len_ptr)
 {
@@ -926,7 +926,7 @@ small_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 medium_image_len(void *thing,
                  size_t *image_len_ptr)
 {
@@ -934,7 +934,7 @@ medium_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 large_image_len(void *thing,
                 size_t *image_len_ptr)
 {
@@ -942,7 +942,7 @@ large_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 huge_image_len(void *thing,
                size_t *image_len_ptr)
 {
@@ -950,7 +950,7 @@ huge_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 monster_image_len(void *thing,
                   size_t *image_len_ptr)
 {
@@ -958,7 +958,7 @@ monster_image_len(void *thing,
     return(image_len(thing, image_len_ptr));
 }
 
-herr_t 
+herr_t
 variable_image_len(void *thing,
                    size_t *image_len_ptr)
 {
@@ -970,14 +970,14 @@ variable_image_len(void *thing,
 /*-------------------------------------------------------------------------
  * Function:	serialize & friends
  *
- * Purpose:	Serialize the supplied entry.  For now this consistes of 
- * 		loading the type and index of the entry into the first 
+ * 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 
+ * 		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 
+ * 		The helper functions verify that the correct version of
+ * 		serialize is being called, and then call serialize
  * 		proper.
  *
  * Return:	SUCCEED if successful, FAIL otherwise.
@@ -992,7 +992,7 @@ variable_image_len(void *thing,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 serialize(haddr_t addr,
           size_t len,
           void * image_ptr,
@@ -1029,11 +1029,11 @@ serialize(haddr_t addr,
     HDassert( new_image_ptr_ptr );
 
     entry_ptr = (test_entry_t *)thing;
-    
+
     HDassert( entry_ptr->self == entry_ptr );
     HDassert( entry_ptr->addr == addr );
     HDassert( entry_ptr->size == len );
-    
+
     /* shouldn't serialize the entry unless it is dirty */
     HDassert( entry_ptr->is_dirty );
 
@@ -1066,14 +1066,14 @@ serialize(haddr_t addr,
 
 	/* This looks wrong, but it isn't -- *flags_ptr will be modified
 	 * by execute_flush_op2() only if the target is this entry --
-	 * and the flags set will accumulate over the set of calls in 
+	 * and the flags set will accumulate over the set of calls in
 	 * the for loop.
 	 */
 
-	if ( ( pass2 ) && 
+	if ( ( pass2 ) &&
              ( ((*flags_ptr) & H5C2__SERIALIZE_RESIZED_FLAG) != 0 ) ) {
 
-	    /* re-allocate *image_ptr, and place the new pointer in 
+	    /* re-allocate *image_ptr, and place the new pointer in
 	     * *new_image_ptr_ptr.
 	     */
             image_ptr = H5MM_xfree(image_ptr);
@@ -1083,7 +1083,7 @@ serialize(haddr_t addr,
                 ret_val = FAIL;
                 pass2 = FALSE;
                 failure_mssg2 = "couldn't free image_ptr.";
-            }    
+            }
 
             if ( pass2 ) {
 
@@ -1094,7 +1094,7 @@ serialize(haddr_t addr,
                 image_ptr = H5MM_malloc((size_t)(entry_ptr->size));
 
                 if ( image_ptr == NULL ) {
- 
+
                     ret_val = FAIL;
                     pass2 = FALSE;
                     failure_mssg2 = "couldn't allocate new image.";
@@ -1136,13 +1136,13 @@ serialize(haddr_t addr,
 
 	HDassert(entry_ptr->size >= NANO_ENTRY_SIZE );
 	*((char *)image_ptr) = (char)((entry_ptr->type) & 0xFF);
-	*(((char *)image_ptr) + 1) = 
+	*(((char *)image_ptr) + 1) =
             (char)(((entry_ptr->index) & 0xFF00) >> 8);
 	*(((char *)image_ptr) + 2) = (char)((entry_ptr->index) & 0xFF);
 
     }
 
-    /* We no longer do the actual write through an callback -- this is 
+    /* We no longer do the actual write through an callback -- this is
      * as close to that callback as we will get.  Hence mark the entry
      * clean here.  If all goes well, it will be flushed shortly.
      */
@@ -1166,7 +1166,7 @@ serialize(haddr_t addr,
 
 } /* serialize() */
 
-herr_t 
+herr_t
 pico_serialize(const H5F_t UNUSED *f,
                hid_t UNUSED dxpl_id,
                haddr_t addr,
@@ -1179,11 +1179,11 @@ pico_serialize(const H5F_t UNUSED *f,
                void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == PICO_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 nano_serialize(const H5F_t UNUSED *f,
                hid_t UNUSED dxpl_id,
                haddr_t addr,
@@ -1196,11 +1196,11 @@ nano_serialize(const H5F_t UNUSED *f,
                void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == NANO_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 micro_serialize(const H5F_t UNUSED *f,
                 hid_t UNUSED dxpl_id,
                 haddr_t addr,
@@ -1213,11 +1213,11 @@ micro_serialize(const H5F_t UNUSED *f,
                 void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == MICRO_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 tiny_serialize(const H5F_t UNUSED *f,
                hid_t UNUSED dxpl_id,
                haddr_t addr,
@@ -1230,11 +1230,11 @@ tiny_serialize(const H5F_t UNUSED *f,
                void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == TINY_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 small_serialize(const H5F_t UNUSED *f,
                 hid_t UNUSED dxpl_id,
                 haddr_t addr,
@@ -1247,11 +1247,11 @@ small_serialize(const H5F_t UNUSED *f,
                 void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == SMALL_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 medium_serialize(const H5F_t UNUSED *f,
                  hid_t UNUSED dxpl_id,
                  haddr_t addr,
@@ -1264,11 +1264,11 @@ medium_serialize(const H5F_t UNUSED *f,
                  void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == MEDIUM_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 large_serialize(const H5F_t UNUSED *f,
                 hid_t UNUSED dxpl_id,
                 haddr_t addr,
@@ -1281,11 +1281,11 @@ large_serialize(const H5F_t UNUSED *f,
                 void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == LARGE_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 huge_serialize(const H5F_t UNUSED *f,
                hid_t UNUSED dxpl_id,
                haddr_t addr,
@@ -1298,11 +1298,11 @@ huge_serialize(const H5F_t UNUSED *f,
                void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == HUGE_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 monster_serialize(const H5F_t UNUSED *f,
                   hid_t UNUSED dxpl_id,
                   haddr_t addr,
@@ -1315,11 +1315,11 @@ monster_serialize(const H5F_t UNUSED *f,
                   void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == MONSTER_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
-herr_t 
+herr_t
 variable_serialize(const H5F_t UNUSED *f,
                    hid_t UNUSED dxpl_id,
                    haddr_t addr,
@@ -1332,7 +1332,7 @@ variable_serialize(const H5F_t UNUSED *f,
                    void ** new_image_ptr_ptr)
 {
     HDassert( ((test_entry_t *)thing)->type == VARIABLE_ENTRY_TYPE );
-    return(serialize(addr, len, image_ptr, thing, flags_ptr, 
+    return(serialize(addr, len, image_ptr, thing, flags_ptr,
                      new_addr_ptr, new_len_ptr, new_image_ptr_ptr));
 }
 
@@ -1340,15 +1340,15 @@ variable_serialize(const H5F_t UNUSED *f,
 /*-------------------------------------------------------------------------
  * 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 
+ * 		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 
+ *
+ * 		The helper functions verify that the correct version of
  * 		serialize is being called, and then call free_icr
  * 		proper.
  *
@@ -1364,7 +1364,7 @@ variable_serialize(const H5F_t UNUSED *f,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 free_icr(haddr_t addr,
          size_t len,
          void * thing)
@@ -1440,7 +1440,7 @@ free_icr(haddr_t addr,
 
 } /* free_icr() */
 
-herr_t 
+herr_t
 pico_free_icr(haddr_t addr,
               size_t len,
               void * thing)
@@ -1449,7 +1449,7 @@ pico_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 nano_free_icr(haddr_t addr,
               size_t len,
               void * thing)
@@ -1458,7 +1458,7 @@ nano_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 micro_free_icr(haddr_t addr,
                size_t len,
                void * thing)
@@ -1467,7 +1467,7 @@ micro_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 tiny_free_icr(haddr_t addr,
               size_t len,
               void * thing)
@@ -1476,7 +1476,7 @@ tiny_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 small_free_icr(haddr_t addr,
                size_t len,
                void * thing)
@@ -1485,7 +1485,7 @@ small_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 medium_free_icr(haddr_t addr,
                 size_t len,
                 void * thing)
@@ -1494,7 +1494,7 @@ medium_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 large_free_icr(haddr_t addr,
                size_t len,
                void * thing)
@@ -1503,7 +1503,7 @@ large_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 huge_free_icr(haddr_t addr,
               size_t len,
               void * thing)
@@ -1512,7 +1512,7 @@ huge_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 monster_free_icr(haddr_t addr,
                  size_t len,
                  void * thing)
@@ -1521,7 +1521,7 @@ monster_free_icr(haddr_t addr,
     return(free_icr(addr, len, thing));
 }
 
-herr_t 
+herr_t
 variable_free_icr(haddr_t addr,
                   size_t len,
                   void * thing)
@@ -1542,7 +1542,7 @@ variable_free_icr(haddr_t addr,
  *
  * Purpose:	Do noting if pass2 is FALSE on entry.
  *
- *              Otherwise, add the specified flush operation to the 
+ *              Otherwise, add the specified flush operation to the
  *              target instance of test_entry_t.
  *
  * Return:	void
@@ -1569,10 +1569,10 @@ add_flush_op2(int target_type,
     test_entry_t * target_entry_ptr;
 
     HDassert( ( 0 <= target_type ) && ( target_type < NUMBER_OF_ENTRY_TYPES ) );
-    HDassert( ( 0 <= target_idx ) && 
+    HDassert( ( 0 <= target_idx ) &&
 	      ( target_idx <= max_indices2[target_type] ) );
     HDassert( ( 0 <= op_code ) && ( op_code <= FLUSH_OP__MAX_OP ) );
-    HDassert( ( op_code != FLUSH_OP__RESIZE ) || 
+    HDassert( ( op_code != FLUSH_OP__RESIZE ) ||
 	      ( type == VARIABLE_ENTRY_TYPE ) );
     HDassert( ( 0 <= type ) && ( type < NUMBER_OF_ENTRY_TYPES ) );
     HDassert( ( 0 <= idx ) && ( idx <= max_indices2[type] ) );
@@ -1597,7 +1597,7 @@ add_flush_op2(int target_type,
 	(target_entry_ptr->flush_ops)[i].size = new_size;
 
     }
-        
+
     return;
 
 } /* add_flush_op2() */
@@ -1689,11 +1689,11 @@ create_pinned_entry_dependency2(H5F_t * file_ptr,
  * Function:	dirty_entry2
  *
  * Purpose:	Given a pointer to a cache, an entry type, and an index,
- *		dirty the target entry.  
+ *		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 
+ *		target entry is in the cache and is pinned.  If it
+ *		isn't, scream and die.  If it is, use the
  *		H5C2_mark_pinned_entry_dirty() call to dirty it.
  *
  *		Do nothing if pass2 is false on entry.
@@ -1748,16 +1748,16 @@ dirty_entry2(H5F_t * file_ptr,
 
                     pass2 = FALSE;
                     failure_mssg2 = "entry to be dirty pinned is not pinned.";
-		    
+
                 } else {
 
-		    mark_pinned_entry_dirty2(file_ptr, type, idx, 
+		    mark_pinned_entry_dirty2(file_ptr, type, idx,
 				             FALSE, (size_t)0);
 
 		}
 	    }
         } else {
-        
+
 	    protect_entry2(file_ptr, type, idx);
             unprotect_entry2(file_ptr, type, idx, TRUE, H5C2__NO_FLAGS_SET);
 	}
@@ -1808,13 +1808,13 @@ execute_flush_op2(H5F_t * file_ptr,
         HDassert( ( entry_ptr->flush_op_self_resize_in_progress ) ||
                   ( entry_ptr->header.size == entry_ptr->size ) );
         HDassert( op_ptr != NULL );
-        HDassert( ( 0 <= entry_ptr->type ) && 
+        HDassert( ( 0 <= entry_ptr->type ) &&
 	          ( entry_ptr->type < NUMBER_OF_ENTRY_TYPES ) );
-        HDassert( ( 0 <= entry_ptr->index ) && 
+        HDassert( ( 0 <= entry_ptr->index ) &&
                   ( entry_ptr->index <= max_indices2[entry_ptr->type] ) );
-        HDassert( ( 0 <= op_ptr->type ) && 
+        HDassert( ( 0 <= op_ptr->type ) &&
                   ( op_ptr->type < NUMBER_OF_ENTRY_TYPES ) );
-        HDassert( ( 0 <= op_ptr->idx ) && 
+        HDassert( ( 0 <= op_ptr->idx ) &&
                   ( op_ptr->idx <= max_indices2[op_ptr->type] ) );
         HDassert( ( op_ptr->flag == FALSE ) || ( op_ptr->flag == TRUE ) );
         HDassert( flags_ptr != NULL );
@@ -1825,18 +1825,18 @@ execute_flush_op2(H5F_t * file_ptr,
 		break;
 
 	    case FLUSH_OP__DIRTY:
-		HDassert( ( entry_ptr->type != op_ptr->type ) || 
+		HDassert( ( entry_ptr->type != op_ptr->type ) ||
 			  ( entry_ptr->index != op_ptr->idx ) );
 
-		dirty_entry2(file_ptr, op_ptr->type, op_ptr->idx, 
+		dirty_entry2(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 
+                    /* the flush operation is acting on the entry to
 		     * which it is attached.  Handle this here:
 		     */
                     HDassert( entry_ptr->type == VARIABLE_ENTRY_TYPE );
@@ -1853,20 +1853,20 @@ execute_flush_op2(H5F_t * file_ptr,
 
 		    /* change the size of some other entry */
 
-		    resize_entry2(file_ptr, op_ptr->type, op_ptr->idx, 
+		    resize_entry2(file_ptr, op_ptr->type, op_ptr->idx,
                                   op_ptr->size, op_ptr->flag);
 		}
 		break;
 
 	    case FLUSH_OP__RENAME:
-		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 
+                    /* the flush operation is acting on the entry to
 		     * which it is attached.  Handle this here:
 		     */
 
-		    HDassert( ((*flags_ptr) & H5C2__SERIALIZE_RESIZED_FLAG) 
+		    HDassert( ((*flags_ptr) & H5C2__SERIALIZE_RESIZED_FLAG)
                               != 0 );
 
                     (*flags_ptr) |= H5C2__SERIALIZE_RENAMED_FLAG;
@@ -1887,7 +1887,7 @@ execute_flush_op2(H5F_t * file_ptr,
 
 		} else {
 
-		    rename_entry2(cache_ptr, op_ptr->type, op_ptr->idx, 
+		    rename_entry2(cache_ptr, op_ptr->type, op_ptr->idx,
 			          op_ptr->flag);
                 }
 		break;
@@ -1963,26 +1963,26 @@ entry_in_cache2(H5C2_t * cache_ptr,
  * Function:	recommend_core_file_driver
  *
  * Purpose:	Using the core file driver for test files allows us to avoid
- * 		disk I/O, and thust offers the potential of speeding up 
- * 		tests.  However, if the target system has insufficient 
- * 		physical memory to accomodate the test file, using the 
- * 		core file driver will actually slow the test down, as the 
+ * 		disk I/O, and thust offers the potential of speeding up
+ * 		tests.  However, if the target system has insufficient
+ * 		physical memory to accomodate the test file, using the
+ * 		core file driver will actually slow the test down, as the
  * 		target system will page fault continuously.
  *
- * 		The purpose of this function is to determine whether it 
+ * 		The purpose of this function is to determine whether it
  * 		makes sense to use the core file driver on this particular
  * 		system.
  *
  * 		To do this, we need to determine a number of facts about
- * 		the host system -- most particularly how much physical 
+ * 		the host system -- most particularly how much physical
  * 		RAM it has.  This information is not always available.
  * 		If it is not, we assume the worst and report that using
  * 		the core file driver would be ill advised.
  *
  * Return:	TRUE 	If use of the core file driver seems a good idea.
  *
- *              FALSE   If available data on the host system suggests that 
- *              	user of the core file driver is ill advised, or 
+ *              FALSE   If available data on the host system suggests that
+ *              	user of the core file driver is ill advised, or
  *              	if no information is available upon which to base
  *              	a suggestion.
  *
@@ -2018,15 +2018,15 @@ recommend_core_file_driver(void)
 
     if ( verbose ) {
 
-        HDfprintf(stdout, "%s: physical_ram = %lld\n", 
+        HDfprintf(stdout, "%s: physical_ram = %lld\n",
                   fcn_name, (long long)physical_ram);
-        HDfprintf(stdout, "%s: free_ram = %lld\n", 
+        HDfprintf(stdout, "%s: free_ram = %lld\n",
                   fcn_name, (long long)free_ram);
-        HDfprintf(stdout, "%s: free_swap = %lld\n", 
+        HDfprintf(stdout, "%s: free_swap = %lld\n",
                   fcn_name, (long long)free_swap);
-        HDfprintf(stdout, "%s: MAX_ADDR = %lld\n", 
+        HDfprintf(stdout, "%s: MAX_ADDR = %lld\n",
                   fcn_name, (long long)MAX_ADDR);
-	HDfprintf(stdout, "%s: core_file_driver_recomended = %d\n", 
+	HDfprintf(stdout, "%s: core_file_driver_recomended = %d\n",
 		  fcn_name, (int)core_file_driver_recomended);
     }
 
@@ -2052,11 +2052,11 @@ recommend_core_file_driver(void)
  * 		fields.
  *
  * 		JRM -- 4/1/07
- * 		Added initialization for the new is_read_only, and 
+ * 		Added initialization for the new is_read_only, and
  * 		ro_ref_count fields.
  *
  * 		JRM -- 9/20/07
- * 		Re-worked function for the cache api mods needed to 
+ * 		Re-worked function for the cache api mods needed to
  * 		support journaling.
  *
  *-------------------------------------------------------------------------
@@ -2161,12 +2161,12 @@ reset_entries2(void)
  *
  * Purpose:	Given a pointer to a cache, an entry type, an index, and
  * 		a size, set the size of the target entry to the size.  Note
- * 		that at present, the type of the entry must be 
+ * 		that at present, the type of the entry must be
  * 		VARIABLE_ENTRY_TYPE.
  *
  *		If the resize_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 
+ *		target entry is in the cache and is pinned.  If it
+ *		isn't, scream and die.  If it is, use the
  *		H5C2_mark_pinned_entry_dirty() call to resize it.
  *
  *		Do nothing if pass2 is false on entry.
@@ -2224,18 +2224,18 @@ resize_entry2(H5F_t * file_ptr,
 
                     pass2 = FALSE;
                     failure_mssg2 = "entry to be resized pinned is not pinned.";
-		    
+
                 } else {
 
-		    mark_pinned_entry_dirty2(file_ptr, type, idx, 
+		    mark_pinned_entry_dirty2(file_ptr, type, idx,
 				             TRUE, new_size);
 		}
 	    }
         } else {
-        
+
 	    protect_entry2(file_ptr, type, idx);
 	    unprotect_entry_with_size_change2(file_ptr, type, idx,
-                                              H5C2__SIZE_CHANGED_FLAG, 
+                                              H5C2__SIZE_CHANGED_FLAG,
 					      new_size);
 	}
     }
@@ -2372,7 +2372,7 @@ verify_clean2(void)
 
             for ( j = 0; j <= max_index; j++ )
             {
-                if ( ( base_addr[j].header.is_dirty ) || 
+                if ( ( base_addr[j].header.is_dirty ) ||
 		     ( base_addr[j].is_dirty ) ) {
 
                     dirty_count++;
@@ -2442,7 +2442,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 
         if ( pass2 ) {
 
-	    in_cache = entry_in_cache2(cache_ptr, expected[i].entry_type, 
+	    in_cache = entry_in_cache2(cache_ptr, expected[i].entry_type,
 		                       expected[i].entry_index);
 
 	    if ( in_cache != expected[i].in_cache ) {
@@ -2464,7 +2464,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->size != expected[i].size ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                         "%d entry (%d, %d) size actualexpected = %ld/%ld.\n",
 			tag,
 	                (int)expected[i].entry_type,
@@ -2480,7 +2480,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->header.size != expected[i].size ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                         "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n",
 			tag,
 		        (int)expected[i].entry_type,
@@ -2496,7 +2496,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->at_main_addr != expected[i].at_main_addr ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2512,7 +2512,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->is_dirty != expected[i].is_dirty ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2528,7 +2528,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->header.is_dirty != expected[i].is_dirty ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2544,7 +2544,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->is_protected != expected[i].is_protected ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2560,7 +2560,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->header.is_protected != expected[i].is_protected ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2576,7 +2576,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->is_pinned != expected[i].is_pinned ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2592,7 +2592,7 @@ verify_entry_status2(H5C2_t * cache_ptr,
 	    if ( entry_ptr->header.is_pinned != expected[i].is_pinned ) {
 
 	        pass2 = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                   "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n",
 		  tag,
 		  (int)expected[i].entry_type,
@@ -2701,9 +2701,9 @@ verify_unprotected2(void)
  *
  * Function:    setup_cache2()
  *
- * Purpose:     Open an HDF file.  This will allocate an instance and 
- * 		initialize an associated instance of H5C2_t.  However, 
- * 		we want to test an instance of H5C2_t, so allocate and 
+ * Purpose:     Open an HDF file.  This will allocate an instance and
+ * 		initialize an associated instance of H5C2_t.  However,
+ * 		we want to test an instance of H5C2_t, so allocate and
  * 		initialize one with the file ID returned by the call to
  * 		H5Fcreate().  Return a pointer to this instance of H5C2_t.
  *
@@ -2713,10 +2713,10 @@ verify_unprotected2(void)
  *
  *		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 
+ *		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 
+ *		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.
@@ -2756,26 +2756,26 @@ setup_cache2(size_t max_cache_size,
               (long)PICO_BASE_ADDR, (long)PICO_ALT_BASE_ADDR);
     HDfprintf(stdout, "NANO_BASE_ADDR = 0x%lx, NANO_ALT_BASE_ADDR = 0x%lx.\n",
               (long)NANO_BASE_ADDR, (long)NANO_ALT_BASE_ADDR);
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
               "MICRO_BASE_ADDR = 0x%lx, MICRO_ALT_BASE_ADDR = 0x%lx.\n",
               (long)MICRO_BASE_ADDR, (long)MICRO_ALT_BASE_ADDR);
     HDfprintf(stdout, "TINY_BASE_ADDR = 0x%lx, TINY_ALT_BASE_ADDR = 0x%lx.\n",
               (long)TINY_BASE_ADDR, (long)TINY_ALT_BASE_ADDR);
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "SMALL_BASE_ADDR = 0x%lx, SMALL_ALT_BASE_ADDR = 0x%lx.\n",
               (long)SMALL_BASE_ADDR, (long)SMALL_ALT_BASE_ADDR);
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "MEDIUM_BASE_ADDR = 0x%lx, MEDIUM_ALT_BASE_ADDR = 0x%lx.\n",
               (long)MEDIUM_BASE_ADDR, (long)MEDIUM_ALT_BASE_ADDR);
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "LARGE_BASE_ADDR = 0x%lx, LARGE_ALT_BASE_ADDR = 0x%lx.\n",
               (long)LARGE_BASE_ADDR, (long)LARGE_ALT_BASE_ADDR);
     HDfprintf(stdout, "HUGE_BASE_ADDR = 0x%lx, HUGE_ALT_BASE_ADDR = 0x%lx.\n",
               (long)HUGE_BASE_ADDR, (long)HUGE_ALT_BASE_ADDR);
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "MONSTER_BASE_ADDR = 0x%lx, MONSTER_ALT_BASE_ADDR = 0x%lx.\n",
               (long)MONSTER_BASE_ADDR, (long)MONSTER_ALT_BASE_ADDR);
-    HDfprintf(stdout, 
+    HDfprintf(stdout,
 	      "VARIABLE_BASE_ADDR = 0x%lx, VARIABLE_ALT_BASE_ADDR = 0x%lx.\n",
               (long)VARIABLE_BASE_ADDR, (long)VARIABLE_ALT_BASE_ADDR);
 #endif /* JRM */
@@ -2813,13 +2813,13 @@ setup_cache2(size_t max_cache_size,
 	          < 0 ) {
 
 	    core_file_driver_failed = TRUE;
-        
+
             if ( verbose ) {
                 HDfprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", fcn_name);
             }
 
         } else {
-	
+
 	    saved_fapl_id = fapl_id;
 	}
     }
@@ -2828,12 +2828,12 @@ setup_cache2(size_t max_cache_size,
         HDfprintf(stdout, "%s() - %0d -- pass2 = %d\n",
                   fcn_name, mile_stone++, (int)pass2);
 
-    /* if we either aren't using the core file driver, or a create 
+    /* if we either aren't using the core file driver, or a create
      * with the core file driver failed, try again with a regular file.
      * If this fails, we are cooked.
      */
     if ( ( pass2 ) && ( fid < 0 ) ) {
-    
+
         fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id);
 
 	saved_fid = fid;
@@ -2842,7 +2842,7 @@ setup_cache2(size_t max_cache_size,
 
             pass2 = FALSE;
             failure_mssg2 = "H5Fcreate() failed.";
-        
+
             if ( verbose ) {
                 HDfprintf(stdout, "%s: H5Fcreate() failed.\n", fcn_name);
             }
@@ -2863,7 +2863,7 @@ setup_cache2(size_t max_cache_size,
 
             pass2 = FALSE;
             failure_mssg2 = "H5Fflush() failed.";
-        
+
             if ( verbose ) {
                 HDfprintf(stdout, "%s: H5Fflush() failed.\n", fcn_name);
             }
@@ -2876,7 +2876,7 @@ setup_cache2(size_t max_cache_size,
 
                 pass2 = FALSE;
                 failure_mssg2 = "Can't get file_ptr.";
-        
+
                 if ( verbose ) {
                     HDfprintf(stdout, "%s: H5Fflush() failed.\n", fcn_name);
                 }
@@ -2906,15 +2906,15 @@ setup_cache2(size_t max_cache_size,
 	 * and we have modified many cache2 routines to use a file
 	 * pointer to look up the target cache.
 	 *
-	 * Thus we now make note of the address of the instance of 
-	 * H5C2_t created by the call to H5Fcreate(), set 
+	 * Thus we now make note of the address of the instance of
+	 * H5C2_t created by the call to H5Fcreate(), set
 	 * file_ptr->shared->cache2 to NULL, call H5C2_create()
 	 * to allocate a new instance of H5C2_t for test purposes,
-	 * and store than new instance's address in 
+	 * and store than new instance's address in
 	 * file_ptr->shared->cache2.
 	 *
 	 * On shut down, we call H5C2_dest on our instance of H5C2_t,
-	 * set file_ptr->shared->cache2 to point to the original 
+	 * set file_ptr->shared->cache2 to point to the original
 	 * instance, and then close the file normally.
 	 */
 
@@ -2941,7 +2941,7 @@ setup_cache2(size_t max_cache_size,
                   fcn_name, mile_stone++, (int)pass2);
 
     if ( pass2 ) {
-	    
+
 	if ( cache_ptr == NULL ) {
 
             pass2 = FALSE;
@@ -2968,14 +2968,14 @@ setup_cache2(size_t max_cache_size,
 
     if ( pass2 ) { /* allocate space for test entries */
 
-        actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, H5P_DEFAULT, 
+        actual_base_addr = H5MF_alloc(file_ptr, H5FD_MEM_DEFAULT, H5P_DEFAULT,
 			              (hsize_t)(ADDR_SPACE_SIZE + BASE_ADDR));
 
 	if ( actual_base_addr == HADDR_UNDEF ) {
 
             pass2 = FALSE;
 	    failure_mssg2 = "H5MF_alloc() failed.";
-	    
+
 	    if ( verbose ) {
                 HDfprintf(stdout, "%s: H5MF_alloc() failed.\n", fcn_name);
             }
@@ -2990,7 +2990,7 @@ setup_cache2(size_t max_cache_size,
 	    failure_mssg2 = "actual_base_addr > BASE_ADDR";
 
 	    if ( verbose ) {
-                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", 
+                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n",
 			  fcn_name);
             }
         }
@@ -3050,7 +3050,7 @@ takedown_cache2(H5F_t * file_ptr,
 
             H5C2_stats(cache_ptr, "test cache", dump_detailed_stats);
         }
-	
+
         flush_cache2(file_ptr, TRUE, FALSE, FALSE);
 
         H5C2_dest(file_ptr, H5P_DATASET_XFER_DEFAULT);
@@ -3161,7 +3161,7 @@ expunge_entry2(H5F_t * file_ptr,
         HDassert( ! ( entry_ptr->header.is_pinned ) );
 	HDassert( ! ( entry_ptr->is_pinned ) );
 
-        result = H5C2_expunge_entry(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        result = H5C2_expunge_entry(file_ptr, H5P_DATASET_XFER_DEFAULT,
 			            &(types2[type]),
                                     entry_ptr->addr);
 
@@ -3207,14 +3207,14 @@ flush_cache2(H5F_t * file_ptr,
     int mile_post = 0;
 
     if ( show_progress ) {
-	HDfprintf(stdout, "%s: mile_post = %d.\n", 
+	HDfprintf(stdout, "%s: mile_post = %d.\n",
 		  fcn_name, mile_post++); /* 0 */
     }
 
     verify_unprotected2();
 
     if ( show_progress ) {
-	HDfprintf(stdout, "%s: mile_post = %d - %d.\n", 
+	HDfprintf(stdout, "%s: mile_post = %d - %d.\n",
 		  fcn_name, mile_post++, (int)pass2); /* 1 */
     }
 
@@ -3237,7 +3237,7 @@ flush_cache2(H5F_t * file_ptr,
     }
 
     if ( show_progress ) {
-	HDfprintf(stdout, "%s: mile_post = %d - %d.\n", 
+	HDfprintf(stdout, "%s: mile_post = %d - %d.\n",
 		  fcn_name, mile_post++, (int)pass2); /* 2 */
     }
 
@@ -3247,7 +3247,7 @@ flush_cache2(H5F_t * file_ptr,
     }
 
     if ( show_progress ) {
-	HDfprintf(stdout, "%s: *mile_post = %d - %d.\n", 
+	HDfprintf(stdout, "%s: *mile_post = %d - %d.\n",
 		  fcn_name, mile_post++, (int)pass2); /* 3 */
     }
 
@@ -3258,7 +3258,7 @@ flush_cache2(H5F_t * file_ptr,
     }
 
     if ( show_progress ) {
-	HDfprintf(stdout, "%s: mile_post = %d - %d.\n", 
+	HDfprintf(stdout, "%s: mile_post = %d - %d.\n",
 		  fcn_name, mile_post++, (int)pass2); /* 4 */
     }
 
@@ -3338,8 +3338,8 @@ insert_entry2(H5F_t * file_ptr,
 
 	entry_ptr->is_dirty = TRUE;
 
-        result = H5C2_insert_entry(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			           &(types2[type]), entry_ptr->addr, 
+        result = H5C2_insert_entry(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			           &(types2[type]), entry_ptr->addr,
 				   entry_ptr->size, (void *)entry_ptr, flags);
 
         if ( ( result < 0 ) ||
@@ -3676,7 +3676,7 @@ rename_entry2(H5C2_t * cache_ptr,
 
         if ( ! done ) {
 
-            if ( ( result < 0 ) || 
+            if ( ( result < 0 ) ||
 	         ( ( ! ( entry_ptr->header.destroy_in_progress ) ) &&
 	           ( entry_ptr->header.addr != new_addr ) ) ) {
 
@@ -3793,8 +3793,8 @@ pin_protected_entry2(H5F_t * file_ptr,
  *              6/11/04
  *
  * Modifications:
- *	
- *    - Modified call to H5C2_protect to pass H5C2__NO_FLAGS_SET in the 
+ *
+ *    - Modified call to H5C2_protect to pass H5C2__NO_FLAGS_SET in the
  *      new flags parameter.
  *    						JRM -- 3/28/07
  *
@@ -3835,21 +3835,21 @@ protect_entry2(H5F_t * file_ptr,
         HDassert( !(entry_ptr->is_protected) );
 
 	if ( verbose ) {
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		      "%s: calling H5C2_protect(). addr = 0x%lx, len = %ld.\n",
-		      fcn_name, (long)(entry_ptr->addr), 
+		      fcn_name, (long)(entry_ptr->addr),
 		      (long)(entry_ptr->size));
 	}
 
-        cache_entry_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			               &(types2[type]), entry_ptr->addr, 
-				       entry_ptr->size, NULL, 
+        cache_entry_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			               &(types2[type]), entry_ptr->addr,
+				       entry_ptr->size, NULL,
 				       H5C2__NO_FLAGS_SET);
 
 	if ( verbose ) {
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		      "%s: H5C2_protect() returns. addr = 0x%lx, len = %ld.\n",
-		      fcn_name, (long)(entry_ptr->addr), 
+		      fcn_name, (long)(entry_ptr->addr),
 		      (long)(entry_ptr->size));
 	}
 
@@ -3910,7 +3910,7 @@ protect_entry2(H5F_t * file_ptr,
 /*-------------------------------------------------------------------------
  * Function:	protect_entry_ro2()
  *
- * Purpose:	Do a read only protect the entry indicated by the type 
+ * Purpose:	Do a read only protect the entry indicated by the type
  * 		and index.
  *
  *		Do nothing if pass2 is FALSE on entry.
@@ -3921,7 +3921,7 @@ protect_entry2(H5F_t * file_ptr,
  *              4/1/07
  *
  * Modifications:
- *	
+ *
  *    - None.
  *
  *-------------------------------------------------------------------------
@@ -3952,12 +3952,12 @@ protect_entry_ro2(H5F_t * file_ptr,
         HDassert( entry_ptr->index == idx );
         HDassert( entry_ptr->type == type );
         HDassert( entry_ptr == entry_ptr->self );
-        HDassert( ( ! ( entry_ptr->is_protected ) ) || 
-		  ( ( entry_ptr->is_read_only ) && 
+        HDassert( ( ! ( entry_ptr->is_protected ) ) ||
+		  ( ( entry_ptr->is_read_only ) &&
 		    ( entry_ptr->ro_ref_count > 0 ) ) );
 
-        cache_entry_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			               &(types2[type]), entry_ptr->addr, 
+        cache_entry_ptr = H5C2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			               &(types2[type]), entry_ptr->addr,
 				       entry_ptr->size, NULL,
 				       H5C2__READ_ONLY_FLAG);
 
@@ -4098,7 +4098,7 @@ unpin_entry2(H5F_t * file_ptr,
  *		JRM -- 3/31/06
  *		Update for pinned entries.
  *
- *		JRM -- 4/1/07 
+ *		JRM -- 4/1/07
  *		Updated for new multiple read protects.
  *
  *-------------------------------------------------------------------------
@@ -4123,7 +4123,7 @@ unprotect_entry2(H5F_t * file_ptr,
     test_entry_t * entry_ptr;
 
     if ( verbose ) {
-	HDfprintf(stdout, 
+	HDfprintf(stdout,
             "\n%s: entering. type = %d, idx = %d, dirty = %d, flags = %0x.\n",
 	    fcn_name, type, idx, (int)dirty, (int)flags);
     }
@@ -4166,8 +4166,8 @@ unprotect_entry2(H5F_t * file_ptr,
 	              fcn_name, (long)(entry_ptr->addr));
         }
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			        &(types2[type]), entry_ptr->addr, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[type]), entry_ptr->addr,
 				(void *)entry_ptr, flags, (size_t)0);
 
 	if ( verbose ) {
@@ -4214,7 +4214,7 @@ unprotect_entry2(H5F_t * file_ptr,
 
 		entry_ptr->ro_ref_count--;
 
-		if ( verbose ) 
+		if ( verbose )
                     HDfprintf(stdout, "%s: decremented ro ref count to %d.\n",
 			      fcn_name, entry_ptr->ro_ref_count);
 
@@ -4224,14 +4224,14 @@ unprotect_entry2(H5F_t * file_ptr,
 		entry_ptr->is_read_only = FALSE;
 		entry_ptr->ro_ref_count = 0;
 
-		if ( verbose ) 
+		if ( verbose )
                     HDfprintf(stdout, "%s: r/o unprotected.\n", fcn_name);
 
 	    } else {
-            
+
 		entry_ptr->is_protected = FALSE;
 
-		if ( verbose ) 
+		if ( verbose )
                     HDfprintf(stdout, "%s: r/w unprotected.\n", fcn_name);
 
 	    }
@@ -4346,19 +4346,19 @@ unprotect_entry_with_size_change2(H5F_t * file_ptr,
 	HDassert ( ( ! pin_flag_set ) || ( ! (entry_ptr->is_pinned) ) );
 	HDassert ( ( ! unpin_flag_set ) || ( entry_ptr->is_pinned ) );
 	HDassert ( ( ! size_changed_flag_set ) || ( new_size > 0 ) );
-	HDassert ( ( ! size_changed_flag_set ) || 
+	HDassert ( ( ! size_changed_flag_set ) ||
 		   ( type == VARIABLE_ENTRY_TYPE ) );
 
         entry_ptr->is_dirty = (entry_ptr->is_dirty || dirty_flag_set);
 
 	if ( size_changed_flag_set ) {
 
-            entry_ptr->is_dirty = TRUE;  
+            entry_ptr->is_dirty = TRUE;
 	    entry_ptr->size = new_size;
         }
 
-        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
-			        &(types2[type]), entry_ptr->addr, 
+        result = H5C2_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT,
+			        &(types2[type]), entry_ptr->addr,
 				(void *)entry_ptr, flags, new_size);
 
         if ( ( result < 0 ) ||
@@ -4521,7 +4521,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
                  ( ( (idx + lag - 2) % 3 ) == 0 ) ) {
 
                 if ( verbose )
-                    HDfprintf(stdout, "4(r, %d, %d, %d) ", 
+                    HDfprintf(stdout, "4(r, %d, %d, %d) ",
 			      type, (idx + lag - 2), (int)rename_to_main_addr);
 
                 rename_entry2(cache_ptr, type, (idx + lag - 2),
@@ -4557,7 +4557,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
 		     ( (idx + lag - 5) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "7(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "7(p-ro, %d, %d) ", type,
 				  (idx + lag - 5));
 
 		    protect_entry_ro2(file_ptr, type, (idx + lag - 5));
@@ -4568,7 +4568,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
 		     ( (idx + lag - 6) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "8(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "8(p-ro, %d, %d) ", type,
 				  (idx + lag - 6));
 
 		    protect_entry_ro2(file_ptr, type, (idx + lag - 6));
@@ -4579,7 +4579,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
 		     ( (idx + lag - 7) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "9(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "9(p-ro, %d, %d) ", type,
 				  (idx + lag - 7));
 
 		    protect_entry_ro2(file_ptr, type, (idx + lag - 7));
@@ -4590,7 +4590,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
 		     ( (idx + lag - 7) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "10(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "10(u-ro, %d, %d) ", type,
 				  (idx + lag - 7));
 
 		    unprotect_entry2(file_ptr, type, (idx + lag - 7),
@@ -4602,7 +4602,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
 		     ( (idx + lag - 8) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "11(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "11(u-ro, %d, %d) ", type,
 				  (idx + lag - 8));
 
 		    unprotect_entry2(file_ptr, type, (idx + lag - 8),
@@ -4614,7 +4614,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
 		     ( (idx + lag - 9) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "12(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "12(u-ro, %d, %d) ", type,
 				  (idx + lag - 9));
 
 		    unprotect_entry2(file_ptr, type, (idx + lag - 9),
@@ -4662,7 +4662,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
                         case 0: /* we just did an insert */
 
                             if ( verbose )
-                                HDfprintf(stdout, 
+                                HDfprintf(stdout,
 					 "16(u, %d, %d) ", type, (idx - lag));
 
                             unprotect_entry2(file_ptr, type, idx - lag,
@@ -4673,7 +4673,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
                             if ( (entries2[type])[idx-lag].is_dirty ) {
 
                             if ( verbose )
-                                HDfprintf(stdout, 
+                                HDfprintf(stdout,
 					 "17(u, %d, %d) ", type, (idx - lag));
 
                                 unprotect_entry2(file_ptr, type, idx - lag,
@@ -4681,7 +4681,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
                             } else {
 
                             if ( verbose )
-                                HDfprintf(stdout, 
+                                HDfprintf(stdout,
 					 "18(u, %d, %d) ", type, (idx - lag));
 
                                 unprotect_entry2(file_ptr, type, idx - lag,
@@ -4693,7 +4693,7 @@ row_major_scan_forward2(H5F_t * file_ptr,
                         case 2: /* we just did an insrt */
 
                             if ( verbose )
-                                HDfprintf(stdout, 
+                                HDfprintf(stdout,
 					 "19(u-del, %d, %d) ", type, (idx - lag));
 
                             unprotect_entry2(file_ptr, type, idx - lag,
@@ -4704,8 +4704,8 @@ row_major_scan_forward2(H5F_t * file_ptr,
                             if ( (entries2[type])[idx-lag].is_dirty ) {
 
                                 if ( verbose )
-                                    HDfprintf(stdout, 
-					      "20(u-del, %d, %d) ", 
+                                    HDfprintf(stdout,
+					      "20(u-del, %d, %d) ",
 					      type, (idx - lag));
 
                                 unprotect_entry2(file_ptr, type, idx - lag,
@@ -4713,8 +4713,8 @@ row_major_scan_forward2(H5F_t * file_ptr,
                             } else {
 
                                 if ( verbose )
-                                    HDfprintf(stdout, 
-					      "21(u-del, %d, %d) ", 
+                                    HDfprintf(stdout,
+					      "21(u-del, %d, %d) ",
 					      type, (idx - lag));
 
                                 unprotect_entry2(file_ptr, type, idx - lag,
@@ -4930,7 +4930,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
     if ( pass2 ) {
 
         cache_ptr = file_ptr->shared->cache2;
-        
+
         HDassert( cache_ptr != NULL );
         HDassert( lag >= 10 );
 
@@ -4993,7 +4993,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
                  ( ( (idx - lag + 2) % 3 ) == 0 ) ) {
 
                 if ( verbose )
-                    HDfprintf(stdout, "(r, %d, %d, %d) ", 
+                    HDfprintf(stdout, "(r, %d, %d, %d) ",
 			      type, (idx + lag + 2), (int)rename_to_main_addr);
 
                 rename_entry2(cache_ptr, type, (idx - lag + 2),
@@ -5032,7 +5032,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
 		     ( (idx - lag + 5) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx - lag + 5));
 
 		    protect_entry_ro2(file_ptr, type, (idx - lag + 5));
@@ -5044,7 +5044,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
 		     ( (idx - lag + 6) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx - lag + 6));
 
 		    protect_entry_ro2(file_ptr, type, (idx - lag + 6));
@@ -5056,7 +5056,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
 		     ( (idx - lag + 7) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx - lag + 7));
 
 		    protect_entry_ro2(file_ptr, type, (idx - lag + 7));
@@ -5068,7 +5068,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
 		     ( (idx - lag + 7) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx - lag + 7));
 
 		    unprotect_entry2(file_ptr, type, (idx - lag + 7),
@@ -5081,7 +5081,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
 		     ( (idx - lag + 8) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx - lag + 8));
 
 		    unprotect_entry2(file_ptr, type, (idx - lag + 8),
@@ -5094,7 +5094,7 @@ row_major_scan_backward2(H5F_t * file_ptr,
 		     ( (idx - lag + 9) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx - lag + 9));
 
 		    unprotect_entry2(file_ptr, type, (idx - lag + 9),
@@ -5415,8 +5415,8 @@ col_major_scan_forward2(H5F_t * file_ptr,
             }
 
             /*if ( ( pass2 ) && ( idx >= 0 ) && ( idx <= max_indices2[type] ) ) { */
-            if ( ( pass2 ) && 
-                 ( idx >= 0 ) && 
+            if ( ( pass2 ) &&
+                 ( idx >= 0 ) &&
                  ( idx <= local_max_index[type] ) ) {
 
                 if ( verbose )
@@ -5673,7 +5673,7 @@ col_major_scan_backward2(H5F_t * file_ptr,
 
             /*if ( ( pass2 ) && ( idx >= 0 ) && ( idx <= max_indices2[type] ) ) { */
             if ( ( pass2 ) &&
-		 ( idx >= 0 ) && 
+		 ( idx >= 0 ) &&
 		 ( idx <= local_max_index[type] ) ) {
 
                 if ( verbose )
@@ -5765,7 +5765,7 @@ hl_col_major_scan_backward2(H5F_t * file_ptr,
     if ( pass2 ) {
 
         cache_ptr = file_ptr->shared->cache2;
-     
+
         HDassert( cache_ptr != NULL );
         HDassert( lag > 5 );
         HDassert( max_index >= 500 );
diff --git a/test/cache2_common.h b/test/cache2_common.h
index c6f9c55..4a15226 100644
--- a/test/cache2_common.h
+++ b/test/cache2_common.h
@@ -48,7 +48,7 @@
 #define MONSTER_ENTRY_TYPE	8
 #define VARIABLE_ENTRY_TYPE	9
 
-#define NUMBER_OF_ENTRY_TYPES   10	
+#define NUMBER_OF_ENTRY_TYPES   10
 
 #define PICO_ENTRY_SIZE		(size_t)1
 #define NANO_ENTRY_SIZE		(size_t)4
@@ -75,10 +75,10 @@
 #define MAX_ENTRIES		(10 * 1024)
 
 
-/* The choice of the BASE_ADDR below is arbitrary -- it just has to be 
+/* The choice of the BASE_ADDR below is arbitrary -- it just has to be
  * larger than the superblock.
  */
-#define BASE_ADDR		(haddr_t)1024 
+#define BASE_ADDR		(haddr_t)1024
 #define PICO_BASE_ADDR		BASE_ADDR
 #define NANO_BASE_ADDR		(haddr_t)(PICO_BASE_ADDR + \
                                       (PICO_ENTRY_SIZE * NUM_PICO_ENTRIES))
@@ -134,7 +134,7 @@
 #define FLUSH_OP__MAX_OP	3
 
 #define MAX_FLUSH_OPS		10	/* Maximum number of flush operations
-					 * that can be associated with a 
+					 * that can be associated with a
 					 * cache entry.
 					 */
 
@@ -161,29 +161,29 @@ typedef struct flush_op
                                          * function implementing the flush
                                          * operation.
 					 */
-    hbool_t		flag;		/* boolean flag passed into the 
+    hbool_t		flag;		/* boolean flag passed into the
 					 * function implementing the flush
 					 * operation.  The meaning of the
 					 * flag is dependant upon the flush
 					 * operation:
 					 *
-					 * FLUSH_OP__DIRTY: TRUE iff the 
-					 *   target is pinned, and is to 
-					 *   be dirtied via the 
+					 * FLUSH_OP__DIRTY: TRUE iff the
+					 *   target is pinned, and is to
+					 *   be dirtied via the
 					 *   H5C_mark_pinned_entry_dirty()
 					 *   call.
 					 *
 					 * FLUSH_OP__RESIZE: TRUE iff the
-					 *   target is pinned, and is to 
-					 *   be resized via the 
+					 *   target is pinned, and is to
+					 *   be resized via the
 					 *   H5C_mark_pinned_entry_dirty()
 					 *   call.
 					 *
 					 * FLUSH_OP__RENAME: TRUE iff the
-					 *    target is to be renamed to 
+					 *    target is to be renamed to
 					 *    its main address.
 					 */
-    size_t		size;		/* New target size in the 
+    size_t		size;		/* New target size in the
 					 * FLUSH_OP__RENAME operation.
 					 * Unused elsewhere.
 					 */
@@ -208,17 +208,17 @@ typedef struct test_entry_t
     hbool_t		  written_to_main_addr;
     					/* Flag indicating whether an image
 					 * of the entry has been written to
-					 * its main address.  Since we no 
+					 * its main address.  Since we no
 					 * longer have a flush callback, we
 					 * set this field to true whenever the
-					 * entry is serialized while at its 
+					 * entry is serialized while at its
 					 * main address.
 					 */
     hbool_t		  written_to_alt_addr;
-                                        /* Flag indicating whether an image 
-					 * of the entry has been written to 
+                                        /* Flag indicating whether an image
+					 * of the entry has been written to
 					 * its alternate address.  Since we no
-					 * longer have a flush callback, we 
+					 * longer have a flush callback, we
 					 * set this field to true whenever the
 					 * entry is serialized while at its
 					 * alternate address.
@@ -256,7 +256,7 @@ typedef struct test_entry_t
     hbool_t		  is_protected;	/* entry should currently be on
 					 * the cache's protected list.
                                          */
-    hbool_t		  is_read_only; /* TRUE iff the entry should be 
+    hbool_t		  is_read_only; /* TRUE iff the entry should be
 					 * protected read only.
 					 */
     int			  ro_ref_count; /* Number of outstanding read only
@@ -282,14 +282,14 @@ typedef struct test_entry_t
 					 * entries pinned by this entry.
 					 */
     int			  num_flush_ops; /* integer field containing the
-					 * number of flush operations to 
-					 * be executed when the entry is 
+					 * number of flush operations to
+					 * be executed when the entry is
 					 * flushed.  This value must lie in
-					 * the closed interval 
+					 * the closed interval
 					 * [0, MAX_FLUSH_OPS].
 					 */
     struct flush_op	  flush_ops[MAX_FLUSH_OPS]; /* Array of instances
-					 * of struct flush_op detailing the 
+					 * of struct flush_op detailing the
 					 * flush operations (if any) that
 					 * are to be executed when the entry
 					 * is flushed from the cache.
@@ -297,17 +297,17 @@ typedef struct test_entry_t
 					 * num_flush_ops contains the number
 					 * of valid entries in this array.
 					 */
-    hbool_t		  flush_op_self_resize_in_progress; /* Boolean flag 
-					 * that is set to TRUE iff this 
+    hbool_t		  flush_op_self_resize_in_progress; /* Boolean flag
+					 * that is set to TRUE iff this
 					 * entry is being flushed, it has
 					 * been resized by a resize flush
 					 * op, and the flush function has
 					 * not yet returned,  This field is
-					 * used to turn off overactive santity 
-					 * checking code that would otherwise 
+					 * used to turn off overactive santity
+					 * checking code that would otherwise
 					 * cause a false test failure.
 					 */
-    hbool_t		  deserialized; /* entry has been deserialized since 
+    hbool_t		  deserialized; /* entry has been deserialized since
 					 * the last time it was reset.
                                          */
     hbool_t		  cleared;      /* entry has been cleared since the
@@ -634,25 +634,25 @@ herr_t monster_clear_dirty_bits(haddr_t addr, size_t len, void * thing);
 herr_t variable_clear_dirty_bits(haddr_t addr, size_t len, void * thing);
 
 
-void * pico_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * pico_deserialize(haddr_t addr, size_t len, const void * image_ptr,
   		        const void * udata_ptr, hbool_t * dirty_ptr);
-void * nano_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * nano_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		        const void * udata_ptr, hbool_t * dirty_ptr);
-void * micro_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * micro_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		         const void * udata_ptr, hbool_t * dirty_ptr);
-void * tiny_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * tiny_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		        const void * udata_ptr, hbool_t * dirty_ptr);
-void * small_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * small_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		         const void * udata_ptr, hbool_t * dirty_ptr);
-void * medium_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * medium_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		          const void * udata_ptr, hbool_t * dirty_ptr);
-void * large_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * large_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		         const void * udata_ptr, hbool_t * dirty_ptr);
-void * huge_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * huge_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		        const void * udata_ptr, hbool_t * dirty_ptr);
-void * monster_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * monster_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		           const void * udata_ptr, hbool_t * dirty_ptr);
-void * variable_deserialize(haddr_t addr, size_t len, const void * image_ptr, 
+void * variable_deserialize(haddr_t addr, size_t len, const void * image_ptr,
 		            const void * udata_ptr, hbool_t * dirty_ptr);
 
 herr_t pico_image_len(void *thing, size_t *image_len_ptr);
@@ -666,55 +666,55 @@ herr_t huge_image_len(void *thing, size_t *image_len_ptr);
 herr_t monster_image_len(void *thing, size_t *image_len_ptr);
 herr_t variable_image_len(void *thing, size_t *image_len_ptr);
 
-herr_t pico_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		      size_t len, void * image_ptr, 
-		      void * thing, unsigned * flags_ptr, 
-		      haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t pico_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		      size_t len, void * image_ptr,
+		      void * thing, unsigned * flags_ptr,
+		      haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		      void ** new_image_ptr_ptr);
-herr_t nano_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		      size_t len, void * image_ptr, 
-		      void * thing, unsigned * flags_ptr, 
-		      haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t nano_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		      size_t len, void * image_ptr,
+		      void * thing, unsigned * flags_ptr,
+		      haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		      void ** new_image_ptr_ptr);
-herr_t micro_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		       size_t len, void * image_ptr, 
-		       void * thing, unsigned * flags_ptr, 
-		       haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t micro_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		       size_t len, void * image_ptr,
+		       void * thing, unsigned * flags_ptr,
+		       haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		       void ** new_image_ptr_ptr);
-herr_t tiny_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		      size_t len, void * image_ptr, 
-		      void * thing, unsigned * flags_ptr, 
-		      haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t tiny_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		      size_t len, void * image_ptr,
+		      void * thing, unsigned * flags_ptr,
+		      haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		      void ** new_image_ptr_ptr);
-herr_t small_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		       size_t len, void * image_ptr, 
-		       void * thing, unsigned * flags_ptr, 
-		       haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t small_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		       size_t len, void * image_ptr,
+		       void * thing, unsigned * flags_ptr,
+		       haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		       void ** new_image_ptr_ptr);
-herr_t medium_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		        size_t len, void * image_ptr, 
-	  	        void * thing, unsigned * flags_ptr, 
-		        haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t medium_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		        size_t len, void * image_ptr,
+	  	        void * thing, unsigned * flags_ptr,
+		        haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		        void ** new_image_ptr_ptr);
-herr_t large_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		       size_t len, void * image_ptr, 
-		       void * thing, unsigned * flags_ptr, 
-		       haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t large_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		       size_t len, void * image_ptr,
+		       void * thing, unsigned * flags_ptr,
+		       haddr_t * new_addr_ptr, size_t * new_len_ptr,
 		       void ** new_image_ptr_ptr);
-herr_t huge_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		      size_t len, void * image_ptr, 
-	              void * thing, unsigned * flags_ptr, 
-	              haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t huge_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		      size_t len, void * image_ptr,
+	              void * thing, unsigned * flags_ptr,
+	              haddr_t * new_addr_ptr, size_t * new_len_ptr,
 	              void ** new_image_ptr_ptr);
-herr_t monster_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		         size_t len, void * image_ptr, 
-	                 void * thing, unsigned * flags_ptr, 
-	                 haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t monster_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		         size_t len, void * image_ptr,
+	                 void * thing, unsigned * flags_ptr,
+	                 haddr_t * new_addr_ptr, size_t * new_len_ptr,
 	                 void ** new_image_ptr_ptr);
-herr_t variable_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, 
-		          size_t len, void * image_ptr, 
-	                  void * thing, unsigned * flags_ptr, 
-	                  haddr_t * new_addr_ptr, size_t * new_len_ptr, 
+herr_t variable_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
+		          size_t len, void * image_ptr,
+	                  void * thing, unsigned * flags_ptr,
+	                  haddr_t * new_addr_ptr, size_t * new_len_ptr,
 	                  void ** new_image_ptr_ptr);
 
 herr_t pico_free_icr(haddr_t addr, size_t len, void * thing);
diff --git a/test/cache2_jnl_file_marking.c b/test/cache2_jnl_file_marking.c
index 3c1b86b..d93695a 100644
--- a/test/cache2_jnl_file_marking.c
+++ b/test/cache2_jnl_file_marking.c
@@ -96,11 +96,11 @@ static void check_mdj_file_unmarking_on_recovery_test(hbool_t verbose);
 /*-------------------------------------------------------------------------
  * Function:    check_test_in_progress()
  *
- * Purpose:     If pass2 is true on entry, test to see if the test in 
+ * Purpose:     If pass2 is true on entry, test to see if the test in
  *		progress file exists.  If it does not, set pass2 to FALSE
  *		and set a failure message.
  *
- *		If the test in progress file does exist, check to see if 
+ *		If the test in progress file does exist, check to see if
  *		its contents matches the supplied string.  It it does not,
  *		set pass2 to FALSE and set the appropriate failure message.
  *
@@ -157,7 +157,7 @@ check_test_in_progress(const char * str)
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[4], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[4], H5P_DEFAULT, filename,
                         sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -176,8 +176,8 @@ check_test_in_progress(const char * str)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
@@ -214,16 +214,16 @@ check_test_in_progress(const char * str)
 	        pass2 = FALSE;
 
 	    } else {
-                
+
 	        input_len = (size_t)(buf.st_size);
 
 		if ( verbose ) {
 
-		    HDfprintf(stdout, "%s: input_len = %d.\n", 
+		    HDfprintf(stdout, "%s: input_len = %d.\n",
 		              fcn_name, (int)input_len);
 		}
             }
-	} 
+	}
     }
 
     /* open the test in progress file */
@@ -250,7 +250,7 @@ check_test_in_progress(const char * str)
 
             if ( verbose ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                           "%s: HDread() failed. result = %d, errno = %d.\n",
                           fcn_name, (int)result, errno);
             }
@@ -287,7 +287,7 @@ check_test_in_progress(const char * str)
 
 	    if ( verbose ) {
 
-	        HDfprintf(stdout, 
+	        HDfprintf(stdout,
                           "%s: expected/actual test in progress = %s/%s\n",
                           fcn_name, str, buffer);
 	    }
@@ -305,11 +305,11 @@ check_test_in_progress(const char * str)
 /*-------------------------------------------------------------------------
  * Function:    file_exists()
  *
- * Purpose:     If pass2 is true on entry, stat the target file, and 
+ * Purpose:     If pass2 is true on entry, stat the target file, and
  * 		return TRUE if it exists, and FALSE if it does not.
  *
- * 		If any errors are detected in this process, set pass2 
- * 		to FALSE and set failure_mssg2 to point to an appropriate 
+ * 		If any errors are detected in this process, set pass2
+ * 		to FALSE and set failure_mssg2 to point to an appropriate
  * 		error message.
  *
  *              Do nothing and return FALSE if pass2 is FALSE on entry.
@@ -357,15 +357,15 @@ file_exists(const char * file_path_ptr)
 
 	    if ( verbose ) {
 
-	        HDfprintf(stdout, "%s: HDstat(%s) failed with ENOENT\n", 
+	        HDfprintf(stdout, "%s: HDstat(%s) failed with ENOENT\n",
 			  fcn_name, file_path_ptr);
 	    }
-	    
+
 	} else {
 
 	    if ( verbose ) {
 
-	        HDfprintf(stdout, 
+	        HDfprintf(stdout,
 			  "%s: HDstat() failed with unexpected errno = %d.\n",
                           fcn_name, errno);
 	    }
@@ -373,7 +373,7 @@ file_exists(const char * file_path_ptr)
 	    failure_mssg2 = "HDstat() returned unexpected value.";
 	    pass2 = FALSE;
 
-	} 
+	}
     }
 
     return(ret_val);
@@ -384,7 +384,7 @@ file_exists(const char * file_path_ptr)
 /*-------------------------------------------------------------------------
  * Function:    mark_test_in_progress()
  *
- * Purpose:     If pass2 is true on entry, test to see if the test in 
+ * Purpose:     If pass2 is true on entry, test to see if the test in
  *		progress file exists.  If it does, set pass2 to FALSE
  *		and set a failure message.
  *
@@ -442,7 +442,7 @@ mark_test_in_progress(const char * str)
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[4], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[4], H5P_DEFAULT, filename,
                         sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -461,8 +461,8 @@ mark_test_in_progress(const char * str)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
@@ -489,14 +489,14 @@ mark_test_in_progress(const char * str)
     }
 
     if ( pass2 ) {
-        
+
         result = HDwrite(fd, str, strlen(str));
 
         if ( result != (int)strlen(str) ) {
 
             if ( verbose ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                           "%s: HDwrite() failed. result = %d, errno = %d.\n",
                           fcn_name, (int)result, errno);
             }
@@ -531,12 +531,12 @@ mark_test_in_progress(const char * str)
 /*-------------------------------------------------------------------------
  * Function:    setup_cache_for_journaling()
  *
- * Purpose:     If pass2 is true on entry, create a HDF5 file with 
- * 		journaling enabled and journal file with the specified name.  
- * 		Return pointers to the cache data structure and file data 
+ * Purpose:     If pass2 is true on entry, create a HDF5 file with
+ * 		journaling enabled and journal file with the specified name.
+ * 		Return pointers to the cache data structure and file data
  * 		structures.  and verify that it contains the expected data.
  *
- *              On failure, set pass2 to FALSE, and set failure_mssg2 
+ *              On failure, set pass2 to FALSE, and set failure_mssg2
  *              to point to an appropriate failure message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -626,7 +626,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
 	     ( file_ptr_ptr == NULL ) ||
 	     ( cache_ptr_ptr == NULL ) ) {
 
-            failure_mssg2 = 
+            failure_mssg2 =
                 "Bad param(s) on entry to setup_cache_for_journaling().\n";
 	    pass2 = FALSE;
         }
@@ -641,9 +641,9 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
             if ( verbose ) {
 
-                HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", 
+                HDfprintf(stdout, "%s: HDF file name = \"%s\".\n",
 			  fcn_name, hdf_file_name);
-                HDfprintf(stdout, "%s: journal file name = \"%s\".\n", 
+                HDfprintf(stdout, "%s: journal file name = \"%s\".\n",
 			  fcn_name, journal_file_name);
 	    }
 	}
@@ -668,7 +668,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				  H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
@@ -717,7 +717,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
- 
+
     /**************************************/
     /* Create a file with the fapl above. */
     /**************************************/
@@ -774,7 +774,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
             failure_mssg2 = "actual_base_addr > BASE_ADDR";
 
             if ( verbose ) {
-                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", 
+                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n",
 			  fcn_name);
             }
         }
@@ -782,13 +782,13 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * to the cache structure
      */
     if ( pass2 ) {
 
         if ( file_ptr->shared->cache2 == NULL ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "can't get cache2 pointer(1).\n";
 
@@ -823,7 +823,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
 	*cache_ptr_ptr = cache_ptr;
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++);
 
     return;
@@ -834,21 +834,21 @@ setup_cache_for_journaling(const char * hdf_file_name,
 /***************************************************************************
  * Function: 	setup_mdj_file_marking_on_create_test
  *
- * Purpose:  	Setup test to verify that HDF5 file is marked as having 
- *              journaling in progress when journaling is enabled at file 
+ * Purpose:  	Setup test to verify that HDF5 file is marked as having
+ *              journaling in progress when journaling is enabled at file
  *              creation time.
  *
- *              Do this by creating a test file with metadata journaling 
+ *              Do this by creating a test file with metadata journaling
  *              enabled, and then exiting without closing the file.
  *
  * Return:      void
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 setup_mdj_file_marking_on_create_test(hbool_t verbose)
 {
     const char * fcn_name = "setup_mdj_file_marking_on_create_test():";
@@ -864,7 +864,7 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -878,21 +878,21 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -902,14 +902,14 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
 
     if ( show_progress ) {
 
-        HDfprintf(stdout, "%s%d cp = %d.\n", 
+        HDfprintf(stdout, "%s%d cp = %d.\n",
 		  fcn_name, (int)pass2, cp++);
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -930,7 +930,7 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
          * initialization.
          */
         H5C2_begin_transaction(cache_ptr, &trans_num, "dummy");
-        H5C2_end_transaction(file_ptr, H5AC2_dxpl_id, cache_ptr, 
+        H5C2_end_transaction(file_ptr, H5AC2_dxpl_id, cache_ptr,
 			     trans_num, "dummy");
 
         if ( show_progress ) {
@@ -940,14 +940,14 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
         }
 
         if ( ( verbose ) && ( ! pass2 ) ) {
-            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n", 
+            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n",
 		      fcn_name, pass2, failure_mssg2);
 	    HDfflush(stdout);
-        } 
+        }
 
         if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s%d cp = %d child exiting.\n", 
+	    HDfprintf(stdout, "%s%d cp = %d child exiting.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
 	}
@@ -956,7 +956,7 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
 
 	abort();
 
-    } 
+    }
 
     return;
 
@@ -966,12 +966,12 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	check_mdj_file_marking_on_create_test
  *
- * Purpose:  	Check to see if a test to verify that a HDF5 file is marked 
- *              as having journaling in progress when journaling is enabled 
+ * Purpose:  	Check to see if a test to verify that a HDF5 file is marked
+ *              as having journaling in progress when journaling is enabled
  *              at file creation time passes.
  *
- *              Do this by trying to open the test file created by the 
- *              associated setup function.  Open should fail, as the file 
+ *              Do this by trying to open the test file created by the
+ *              associated setup function.  Open should fail, as the file
  *              should be marked as journaling in progress.
  *
  *              On either success or failure, clean up the test file and
@@ -981,10 +981,10 @@ setup_mdj_file_marking_on_create_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdj_file_marking_on_create_test(hbool_t verbose)
 {
     const char * fcn_name = "check_mdj_file_marking_on_create_test():";
@@ -1000,7 +1000,7 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -1014,21 +1014,21 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -1042,9 +1042,9 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -1052,7 +1052,7 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
 
 	if ( show_progress ) {
 
-            HDfprintf(stdout, "%s:%d: cp = %d  child exited as expected.\n", 
+            HDfprintf(stdout, "%s:%d: cp = %d  child exited as expected.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
@@ -1077,7 +1077,7 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -1091,12 +1091,12 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
         }
 
 	/* attempt to open the file -- should fail as the child
-	 * exited without closing the file properly, and thus 
+	 * exited without closing the file properly, and thus
 	 * the file should still be marked as having journaling
 	 * in progress.
 	 */
 
-	if ( pass2 ) { 
+	if ( pass2 ) {
 
 	    H5E_BEGIN_TRY {
 
@@ -1124,11 +1124,11 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
 #endif
 	if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d parent done.\n", 
+            HDfprintf(stdout, "%s%d cp = %d parent done.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
-    } 
+    }
 
     return;
 
@@ -1138,15 +1138,15 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	setup_mdj_file_marking_after_open_test
  *
- * Purpose:  	Setup a test to verify that a HDF5 file is marked as having 
- *              journaling in progress when journaling is enabled on an 
+ * Purpose:  	Setup a test to verify that a HDF5 file is marked as having
+ *              journaling in progress when journaling is enabled on an
  *              open file.
  *
  *              Do this by:
  *
- *              1) creating a test file, 
+ *              1) creating a test file,
  *
- *              2) writing some data to it, 
+ *              2) writing some data to it,
  *
  *              3) enable journaling on the open file via a call to
  *                 H5Fset_mdc_config()
@@ -1160,10 +1160,10 @@ check_mdj_file_marking_on_create_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 setup_mdj_file_marking_after_open_test(hbool_t verbose)
 {
     const char * fcn_name = "setup_mdj_file_marking_after_open_test():";
@@ -1182,7 +1182,7 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -1196,7 +1196,7 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
+    if ( verbose ) {
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, pass2, cp++);
 	HDfflush(stdout);
     }
@@ -1204,13 +1204,13 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -1224,9 +1224,9 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-		  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+		  fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -1253,7 +1253,7 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -1261,7 +1261,7 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
             }
         }
 
-	/* open the file with a fapl indicating latest version of 
+	/* open the file with a fapl indicating latest version of
 	 * the file format.
 	 */
         if ( pass2 ) {
@@ -1303,8 +1303,8 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
         if ( pass2 ) {
 
             /* Create the dataset. */
-            dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE, 
-	                            dataspace_id, H5P_DEFAULT, 
+            dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE,
+	                            dataspace_id, H5P_DEFAULT,
 				    H5P_DEFAULT, H5P_DEFAULT);
 
             if ( dataspace_id < 0 ) {
@@ -1369,14 +1369,14 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
         }
 
         if ( ( verbose ) && ( ! pass2 ) ) {
-            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n", 
+            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n",
 		      fcn_name, pass2, failure_mssg2);
 	    HDfflush(stdout);
-        } 
+        }
 
         if ( show_progress ) {
 
-           HDfprintf(stdout, "%s%d cp = %d exiting.\n", 
+           HDfprintf(stdout, "%s%d cp = %d exiting.\n",
 	             fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
@@ -1385,7 +1385,7 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
 
         abort();
 
-    } 
+    }
 
     return;
 
@@ -1395,12 +1395,12 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	check_mdj_file_marking_after_open_test
  *
- * Purpose:  	Check to see if the test to rvVerify that a HDF5 file is 
- *              marked as having journaling in progress when journaling is 
+ * Purpose:  	Check to see if the test to rvVerify that a HDF5 file is
+ *              marked as having journaling in progress when journaling is
  *              enabled on an open file passed.
  *
  *              Try to open the test file created by the associated setup
- *              function.  Open should fail, as the file should be marked 
+ *              function.  Open should fail, as the file should be marked
  *              as journaling in progress.
  *
  *              On either success or failure, clean up the test file and
@@ -1410,10 +1410,10 @@ setup_mdj_file_marking_after_open_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdj_file_marking_after_open_test(hbool_t verbose)
 {
     const char * fcn_name = "check_mdj_file_marking_after_open_test():";
@@ -1429,7 +1429,7 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -1443,21 +1443,21 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -1467,14 +1467,14 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
 
     if ( show_progress ) {
 
-        HDfprintf(stdout, "%s%d cp = %d.\n", 
+        HDfprintf(stdout, "%s%d cp = %d.\n",
 		  fcn_name, (int)pass2, cp++);
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -1493,7 +1493,7 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
         }
 
         if ( show_progress ) {
-	    HDfprintf(stdout, "%s:%d cp = %d.\n", 
+	    HDfprintf(stdout, "%s:%d cp = %d.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
@@ -1501,7 +1501,7 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -1510,19 +1510,19 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
         }
 
         if ( show_progress ) {
-	    HDfprintf(stdout, "%s%d cp = %d.\n", 
+	    HDfprintf(stdout, "%s%d cp = %d.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
 
 	/* attempt to open the file -- should fail as the setup program
-	 * exited without closing the file properly, and thus 
+	 * exited without closing the file properly, and thus
 	 * the file should still be marked as having journaling
 	 * in progress.
 	 */
 
 	if ( pass2 ) {
-  
+
 	    H5E_BEGIN_TRY {
 
 	        file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
@@ -1538,7 +1538,7 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
 
         if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d: cp = %d.\n", 
+            HDfprintf(stdout, "%s%d: cp = %d.\n",
                       fcn_name, (int)pass2, cp++);
             HDfflush(stdout);
         }
@@ -1550,11 +1550,11 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
 #endif
 	if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d parent done.\n", 
+            HDfprintf(stdout, "%s%d cp = %d parent done.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
 	}
-    } 
+    }
 
     return;
 
@@ -1564,19 +1564,19 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
 /***************************************************************************
  * Function: setup_mdj_file_marking_on_open_test
  *
- * Purpose:  	Setup test to verify that a HDF5 file is marked as having 
- *		journaling in progress when journaling is enabled at file 
+ * Purpose:  	Setup test to verify that a HDF5 file is marked as having
+ *		journaling in progress when journaling is enabled at file
  *		open time.
  *
- *              Do this by: 
+ *              Do this by:
  *
- *              1) creating a test file in the child, 
+ *              1) creating a test file in the child,
  *
- *              2) writing some data to it, 
+ *              2) writing some data to it,
  *
  *              3) closing the test file.
  *
- *              4) re-openting the test file with metadata journaling 
+ *              4) re-openting the test file with metadata journaling
  *                 enabled, and then
  *
  *              5) exiting from the child without closing the file.
@@ -1585,10 +1585,10 @@ check_mdj_file_marking_after_open_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 setup_mdj_file_marking_on_open_test(hbool_t verbose)
 {
     const char * fcn_name = "setup_mdj_file_marking_on_open_test():";
@@ -1608,7 +1608,7 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -1622,21 +1622,21 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -1646,14 +1646,14 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
 
     if ( show_progress ) {
 
-        HDfprintf(stdout, "%s%d cp = %d.\n", 
+        HDfprintf(stdout, "%s%d cp = %d.\n",
 		  fcn_name, (int)pass2, cp++);
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -1662,22 +1662,22 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
 #if 0 /* JRM */
         /* Quincey:
 	 *
-	 * It looks like we may have a bug here -- 
+	 * It looks like we may have a bug here --
 	 *
 	 * In the original version of this test, I:
 	 *
-	 * 	1) created a file using the default FAPL, 
+	 * 	1) created a file using the default FAPL,
 	 *
 	 * 	2) added a data set to the file
 	 *
 	 * 	3) closed it,
 	 *
-	 * 	4) tried to re-open it using a FAPL that set the 
+	 * 	4) tried to re-open it using a FAPL that set the
 	 * 	   latest format, and enabled journaling.
 	 *
-	 * I hit an assertion failure on step 4.  
+	 * I hit an assertion failure on step 4.
 	 *
-	 * I then modified the above to select the latest file 
+	 * I then modified the above to select the latest file
 	 * format on file create, and the problem went away.
 	 *
 	 * Is this as it should be, or do we have a bug here?
@@ -1687,7 +1687,7 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
 
         if ( pass2 ) {
 
-            file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, 
+            file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT,
 		                H5P_DEFAULT);
 
             if ( file_id < 0 ) {
@@ -1719,7 +1719,7 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -1727,7 +1727,7 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
             }
         }
 
-        /* open the file with a fapl indicating latest version of 
+        /* open the file with a fapl indicating latest version of
          * the file format.
          */
         if ( pass2 ) {
@@ -1769,8 +1769,8 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
         if ( pass2 ) {
 
             /* Create the dataset. */
-            dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE, 
-		                    dataspace_id, H5P_DEFAULT, 
+            dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE,
+		                    dataspace_id, H5P_DEFAULT,
 				    H5P_DEFAULT, H5P_DEFAULT);
 
 	    if ( dataspace_id < 0 ) {
@@ -1826,7 +1826,7 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -1922,14 +1922,14 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
 
         if ( ( verbose ) && ( ! pass2 ) ) {
 
-            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n", 
+            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n",
 		      fcn_name, pass2, failure_mssg2);
 	    HDfflush(stdout);
-        } 
+        }
 
         if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d exiting.\n", 
+            HDfprintf(stdout, "%s%d cp = %d exiting.\n",
                       fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
@@ -1937,7 +1937,7 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
         mark_test_in_progress("mdj_file_marking_on_open_test");
 
         abort();
-    } 
+    }
 
     return;
 
@@ -1947,8 +1947,8 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	check_mdj_file_marking_on_open_test
  *
- * Purpose:  	Check to verify that a HDF5 file is marked as having 
- *              journaling in progress when journaling is enabled at 
+ * Purpose:  	Check to verify that a HDF5 file is marked as having
+ *              journaling in progress when journaling is enabled at
  *		file open time.
  *
  *              Do this by trying to open the test file created by the
@@ -1964,10 +1964,10 @@ setup_mdj_file_marking_on_open_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdj_file_marking_on_open_test(hbool_t verbose)
 {
     const char * fcn_name = "check_mdj_file_marking_on_open_test():";
@@ -1983,7 +1983,7 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -1997,21 +1997,21 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -2025,9 +2025,9 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -2053,7 +2053,7 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -2067,7 +2067,7 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
         }
 
 	/* attempt to open the file -- should fail as the child
-	 * exited without closing the file properly, and thus 
+	 * exited without closing the file properly, and thus
 	 * the file should still be marked as having journaling
 	 * in progress.
 	 */
@@ -2100,11 +2100,11 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
 #endif
 	if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d done.\n", 
+            HDfprintf(stdout, "%s%d cp = %d done.\n",
                       fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
-    } 
+    }
 
     return;
 
@@ -2114,14 +2114,14 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	setup_mdj_file_unmarking_on_file_close_test
  *
- * Purpose:  	Setup test to verify that a HDF5 file on which journaling 
- *		is enabled is marked as having not having journaling in 
+ * Purpose:  	Setup test to verify that a HDF5 file on which journaling
+ *		is enabled is marked as having not having journaling in
  *		progress when the file is closed.
  *
  *              Do this as follows:
  *
- *                  1) create a test file with metadata journaling 
- *                     enabled, 
+ *                  1) create a test file with metadata journaling
+ *                     enabled,
  *
  *                  2) perform some operation(s) that dirty metadata
  *                     and result in journal activity.
@@ -2132,10 +2132,10 @@ check_mdj_file_marking_on_open_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 {
     const char * fcn_name = "setup_mdj_file_unmarking_on_file_close_test():";
@@ -2159,7 +2159,7 @@ setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -2173,21 +2173,21 @@ setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -2201,9 +2201,9 @@ setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-		  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+		  fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -2243,8 +2243,8 @@ setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
     if ( pass2 ) {
 
         /* Create the dataset. */
-        dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE, 
-			        dataspace_id, H5P_DEFAULT, 
+        dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE,
+			        dataspace_id, H5P_DEFAULT,
 				H5P_DEFAULT, H5P_DEFAULT);
 
         if ( dataspace_id < 0 ) {
@@ -2289,8 +2289,8 @@ setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	check_mdj_file_unmarking_on_file_close_test
  *
- * Purpose:  	Check to verify that a HDF5 file on which journaling is 
- *		enabled is marked as having not having journaling in 
+ * Purpose:  	Check to verify that a HDF5 file on which journaling is
+ *		enabled is marked as having not having journaling in
  *		progress when the file is closed.
  *
  *              To do this, attempt to re-open the file created by the
@@ -2303,10 +2303,10 @@ setup_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 {
     const char * fcn_name = "check_mdj_file_unmarking_on_file_close_test():";
@@ -2328,7 +2328,7 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -2342,21 +2342,21 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -2370,9 +2370,9 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-		  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+		  fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -2399,7 +2399,7 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-        if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+        if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
                                   H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
@@ -2413,7 +2413,7 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
         HDfflush(stdout);
     }
 
-    /* attempt to open the file -- should succeed as the close should 
+    /* attempt to open the file -- should succeed as the close should
      * shutdown journaling.
      */
 
@@ -2472,15 +2472,15 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	setup_mdj_file_unmarking_on_journaling_shutdown_test
  *
- * Purpose:  	Setup test to verify that a HDF5 file on which journaling 
- *		is enabled is marked as having not having journaling in 
- *		progress when journaling is disabled via the 
+ * Purpose:  	Setup test to verify that a HDF5 file on which journaling
+ *		is enabled is marked as having not having journaling in
+ *		progress when journaling is disabled via the
  *		H5Fset_mdc_config() API call.
  *
  *              Do this by:
  *
- *                  1) creating a test file in the child with metadata 
- *                     journaling enabled, 
+ *                  1) creating a test file in the child with metadata
+ *                     journaling enabled,
  *
  *                  2) performing some operation(s) that dirty metadata
  *                     and result in journal activity.
@@ -2493,13 +2493,13 @@ check_mdj_file_unmarking_on_file_close_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              7/9/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 {
-    const char * fcn_name = 
+    const char * fcn_name =
 	    "setup_mdj_file_unmarking_on_journaling_shutdown_test():";
     char filename[512];
     char journal_filename[H5AC2__MAX_JOURNAL_FILE_NAME_LEN + 1];
@@ -2517,7 +2517,7 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -2531,21 +2531,21 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -2559,9 +2559,9 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -2600,8 +2600,8 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
         if ( pass2 ) {
 
             /* Create the dataset. */
-            dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE, 
-                                    dataspace_id, H5P_DEFAULT, 
+            dataset_id = H5Dcreate2(file_id, "/dset", H5T_STD_I32BE,
+                                    dataspace_id, H5P_DEFAULT,
 				    H5P_DEFAULT, H5P_DEFAULT);
 
             if ( dataspace_id < 0 ) {
@@ -2657,14 +2657,14 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
         }
 
         if ( ( verbose ) && ( ! pass2 ) ) {
-            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n", 
+            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n",
                      fcn_name, pass2, failure_mssg2);
             HDfflush(stdout);
-        } 
+        }
 
         if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d exiting.\n", 
+            HDfprintf(stdout, "%s%d cp = %d exiting.\n",
                       fcn_name, (int)pass2, cp++);
             HDfflush(stdout);
         }
@@ -2672,7 +2672,7 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
         mark_test_in_progress("mdj_file_unmarking_on_journaling_shutdown_test");
 
         abort();
-    } 
+    }
 
     return;
 
@@ -2682,23 +2682,23 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	check_mdj_file_unmarking_on_journaling_shutdown_test
  *
- * Purpose:  	Check to verify that a HDF5 file on which journaling is 
- *		enabled is marked as having not having journaling in 
- *		progress when journaling is disabled via the 
+ * Purpose:  	Check to verify that a HDF5 file on which journaling is
+ *		enabled is marked as having not having journaling in
+ *		progress when journaling is disabled via the
  *		H5Fset_mdc_config() API	call.
  *
- *              Do this by trying to open the test file created by the 
+ *              Do this by trying to open the test file created by the
  *		associated setup function.
  *
- *              Open should succeed, as the file should be marked as 
+ *              Open should succeed, as the file should be marked as
  *              journaling not in progress.
  *
- *              Note that the file will be synced out as part of the 
- *              journaling shutdown process, so the metadata should be 
+ *              Note that the file will be synced out as part of the
+ *              journaling shutdown process, so the metadata should be
  *              in a consistant state.  Strictly speaking, this is not
  *              necessary for this test, for as long as the the file is
  *              not marked as having journaling in progress, we should
- *              pass.  However, testing this without using the HDF5 
+ *              pass.  However, testing this without using the HDF5
  *              library to open the file would be inconvenient -- hence
  *              we make use of the sync on journal shutdown to make the
  *              test easier to implement.
@@ -2710,13 +2710,13 @@ setup_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 {
-    const char * fcn_name = 
+    const char * fcn_name =
 	    "check_mdj_file_unmarking_on_journaling_shutdown_test():";
     char filename[512];
     char journal_filename[H5AC2__MAX_JOURNAL_FILE_NAME_LEN + 1];
@@ -2730,7 +2730,7 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -2744,21 +2744,21 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -2772,9 +2772,9 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-                  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+                  fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -2800,7 +2800,7 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -2858,11 +2858,11 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 #endif
 	if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d done.\n", 
+            HDfprintf(stdout, "%s%d cp = %d done.\n",
 		      fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
 	}
-    } 
+    }
 
     return;
 
@@ -2872,13 +2872,13 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	setup_mdj_file_unmarking_on_recovery_test
  *
- * Purpose:  	Setup test to verify that HDF5 file that is marked as as 
- *		having journaling in progress is unmarked when the file 
- *		is opened with the journal_recovered flag set in the 
- *		cache configuration structure in the file access 
+ * Purpose:  	Setup test to verify that HDF5 file that is marked as as
+ *		having journaling in progress is unmarked when the file
+ *		is opened with the journal_recovered flag set in the
+ *		cache configuration structure in the file access
  *		property list.
  *
- *              Do this by creating a test file metadata journaling enabled, 
+ *              Do this by creating a test file metadata journaling enabled,
  *		and then exiting without closing the file.  Note that
  *              we must flush the file before exiting, as we want the file
  *              to be readable, but be marked as journaling in progress.
@@ -2887,10 +2887,10 @@ check_mdj_file_unmarking_on_journaling_shutdown_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              7/14/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 {
     const char * fcn_name = "setup_mdj_file_unmarking_on_recovery_test():";
@@ -2906,7 +2906,7 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -2920,21 +2920,21 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -2948,9 +2948,9 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -2971,7 +2971,7 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
          * initialization.
          */
         H5C2_begin_transaction(cache_ptr, &trans_num, "dummy");
-        H5C2_end_transaction(file_ptr, H5AC2_dxpl_id, cache_ptr, 
+        H5C2_end_transaction(file_ptr, H5AC2_dxpl_id, cache_ptr,
                              trans_num, "dummy");
 
         if ( show_progress ) {
@@ -2996,14 +2996,14 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
         }
 
         if ( ( verbose ) && ( ! pass2 ) ) {
-            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n", 
+            HDfprintf(stdout, "%s%d failure_mssg = \"%s\".\n",
                      fcn_name, pass2, failure_mssg2);
 	    HDfflush(stdout);
-        } 
+        }
 
         if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d exiting.\n", 
+            HDfprintf(stdout, "%s%d cp = %d exiting.\n",
                       fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
@@ -3011,7 +3011,7 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
         mark_test_in_progress("mdj_file_unmarking_on_recovery_test");
 
         abort();
-    } 
+    }
 
     return;
 
@@ -3021,10 +3021,10 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 /***************************************************************************
  * Function: 	check_mdj_file_unmarking_on_recovery_test
  *
- * Purpose:  	Check to verify that a HDF5 file that is marked as as 
- *		having journaling in progress is unmarked when the file 
- *		is opened with the journal_recovered flag set in the 
- *		cache configuration structure in the file access property 
+ * Purpose:  	Check to verify that a HDF5 file that is marked as as
+ *		having journaling in progress is unmarked when the file
+ *		is opened with the journal_recovered flag set in the
+ *		cache configuration structure in the file access property
  *		list.
  *
  *              Do this by trying to open the test file created by the
@@ -3034,10 +3034,10 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
  *              in progress.
  *
  *              Try to open again with the journal_recovered flag set.  This
- *              should succeed.  
+ *              should succeed.
  *
- *		Close and open again without the journal recovered flag 
- *		set to verify that the file is no longer marked as 
+ *		Close and open again without the journal recovered flag
+ *		set to verify that the file is no longer marked as
  *		having journaling in progress.
  *
  *              On either success or failure, clean up the test file and
@@ -3047,10 +3047,10 @@ setup_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
  *
  * Programmer: 	John Mainzer
  *              10/8/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 {
     const char * fcn_name = "check_mdj_file_unmarking_on_recovery_test():";
@@ -3068,7 +3068,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
     /* setup the file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename, 
+        if ( h5_fixname(FILENAMES[1], H5P_DEFAULT, filename,
 	                sizeof(filename)) == NULL ) {
 
             pass2 = FALSE;
@@ -3082,21 +3082,21 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s filename = \"%s\".\n", fcn_name, filename);
 	HDfflush(stdout);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-        else if ( strlen(journal_filename) >= 
+        else if ( strlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -3110,9 +3110,9 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	HDfflush(stdout);
     }
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s journal filename = \"%s\".\n", 
-	          fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s journal filename = \"%s\".\n",
+	          fcn_name, journal_filename);
 	HDfflush(stdout);
     }
 
@@ -3138,7 +3138,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
         /* call H5Pset_libver_bounds() on the fapl_id */
         if ( pass2 ) {
 
-            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+            if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				      H5F_LIBVER_LATEST) < 0 ) {
 
                 pass2 = FALSE;
@@ -3152,12 +3152,12 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
         }
 
 	/* attempt to open the file -- should fail as the setup fcn
-	 * exited without closing the file properly, and thus 
+	 * exited without closing the file properly, and thus
 	 * the file should still be marked as having journaling
 	 * in progress.
 	 */
 
-	if ( pass2 ) { 
+	if ( pass2 ) {
 
 	    H5E_BEGIN_TRY {
 
@@ -3179,7 +3179,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
         }
 
 
-	/* now set the file recovered flag in the journal config 
+	/* now set the file recovered flag in the journal config
 	 * structure in the fapl, and try to open again.  Should
 	 * succeed, and the file should not be marked as having
 	 * journaling in progress.
@@ -3222,7 +3222,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	    HDfflush(stdout);
         }
 
-	if ( pass2 ) { 
+	if ( pass2 ) {
 
 	    file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
 
@@ -3254,7 +3254,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	    HDfflush(stdout);
         }
 
-	/* now, turn off the journal recovered flag, and try to 
+	/* now, turn off the journal recovered flag, and try to
 	 * open the file again.  Should succeed.
 	 */
 
@@ -3277,7 +3277,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 	    HDfflush(stdout);
         }
 
-	if ( pass2 ) { 
+	if ( pass2 ) {
 
 	    file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl_id);
 
@@ -3296,7 +3296,7 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 
 	if ( pass2 ) {
 
-	    if ( ( H5Fclose(file_id) < 0 ) || 
+	    if ( ( H5Fclose(file_id) < 0 ) ||
 		 ( H5Pclose(fapl_id) < 0 ) ) {
 
                 pass2 = FALSE;
@@ -3317,11 +3317,11 @@ check_mdj_file_unmarking_on_recovery_test(hbool_t verbose)
 #endif
 	if ( show_progress ) {
 
-            HDfprintf(stdout, "%s%d cp = %d done.\n", 
+            HDfprintf(stdout, "%s%d cp = %d done.\n",
                       fcn_name, (int)pass2, cp++);
 	    HDfflush(stdout);
         }
-    } 
+    }
 
     return;
 
@@ -3348,7 +3348,7 @@ void
 usage(void)
 
 {
-    const char * s[] = 
+    const char * s[] =
     {
 	"\n",
         "cache2_jnl_file_marking:\n",
@@ -3388,7 +3388,7 @@ usage(void)
 /*-------------------------------------------------------------------------
  * Function:	main
  *
- * Purpose:	Run the specified setup or check of metadata journaling 
+ * Purpose:	Run the specified setup or check of metadata journaling
  * 		HDF5 file marking or unmarking.
  *
  * Return:	Success: 0
@@ -3473,7 +3473,7 @@ main(int argc,
                 check_mdj_file_marking_after_open_test(verbose);
 
 	    } else {
-	
+
 		pass2 = FALSE;
 		failure_mssg2 = "setup and check both FALSE?";
 	    }
@@ -3489,7 +3489,7 @@ main(int argc,
                 check_mdj_file_marking_on_create_test(verbose);
 
 	    } else {
-	
+
 		pass2 = FALSE;
 		failure_mssg2 = "setup and check both FALSE?";
 	    }
@@ -3505,7 +3505,7 @@ main(int argc,
                 check_mdj_file_marking_on_open_test(verbose);
 
 	    } else {
-	
+
 		pass2 = FALSE;
 		failure_mssg2 = "setup and check both FALSE?";
 	    }
@@ -3521,12 +3521,12 @@ main(int argc,
                 check_mdj_file_unmarking_on_file_close_test(verbose);
 
 	    } else {
-	
+
 		pass2 = FALSE;
 		failure_mssg2 = "setup and check both FALSE?";
 	    }
 
-	} else if ( strcmp("file_unmarking_on_journaling_shutdown", argv[1]) 
+	} else if ( strcmp("file_unmarking_on_journaling_shutdown", argv[1])
 		    == 0 ) {
 
             if ( setup ) {
@@ -3538,7 +3538,7 @@ main(int argc,
                 check_mdj_file_unmarking_on_journaling_shutdown_test(verbose);
 
 	    } else {
-	
+
 		pass2 = FALSE;
 		failure_mssg2 = "setup and check both FALSE?";
 	    }
@@ -3554,7 +3554,7 @@ main(int argc,
                 check_mdj_file_unmarking_on_recovery_test(verbose);
 
 	    } else {
-	
+
 		pass2 = FALSE;
 		failure_mssg2 = "setup and check both FALSE?";
 	    }
@@ -3582,7 +3582,7 @@ main(int argc,
             }
 	} else {
 
-	    HDfprintf(stdout, "FAILED.  Failure mssg = \"%s\"\n", 
+	    HDfprintf(stdout, "FAILED.  Failure mssg = \"%s\"\n",
 		      failure_mssg2);
         }
     }
@@ -3592,7 +3592,7 @@ main(int argc,
         result = 1;
     }
 
-    if ( result != 0 ) { 
+    if ( result != 0 ) {
 
         HDfprintf(stderr, "fail\n");
     }
diff --git a/test/cache2_journal.c b/test/cache2_journal.c
index dfa51bf..915e4dd 100644
--- a/test/cache2_journal.c
+++ b/test/cache2_journal.c
@@ -68,7 +68,7 @@ static void flush_journal(H5C2_t * cache_ptr);
 
 static void jrnl_col_major_scan_backward2(H5F_t * file_ptr,
 		                          int32_t max_index,
-                                          int32_t lag, 
+                                          int32_t lag,
 					  hbool_t verbose,
                                           hbool_t reset_stats,
                                           hbool_t display_stats,
@@ -129,7 +129,7 @@ static void open_existing_file_for_journaling(const char * hdf_file_name,
                                               hid_t * file_id_ptr,
                                               H5F_t ** file_ptr_ptr,
                                               H5C2_t ** cache_ptr_ptr,
-                                              hbool_t human_readable); 
+                                              hbool_t human_readable);
 
 static void open_existing_file_without_journaling(const char * hdf_file_name,
                                                   hid_t * file_id_ptr,
@@ -161,15 +161,15 @@ static void verify_journal_empty(const char * journal_file_path_ptr);
 
 static void check_buffer_writes(void);
 
-static void write_flush_verify(H5C2_jbrb_t * struct_ptr, 
-                               int size, 
-                               char * data, 
+static void write_flush_verify(H5C2_jbrb_t * struct_ptr,
+                               int size,
+                               char * data,
                                FILE * readback);
 
-static void write_noflush_verify(H5C2_jbrb_t * struct_ptr, 
-                                 int size, 
-                                 char * data, 
-                                 FILE * readback, 
+static void write_noflush_verify(H5C2_jbrb_t * struct_ptr,
+                                 int size,
+                                 char * data,
+                                 FILE * readback,
                                  int repeats);
 
 static void check_superblock_extensions(void);
@@ -235,8 +235,8 @@ static void mdj_smoke_check_01(hbool_t human_readable);
 
 static void mdj_smoke_check_02(hbool_t human_readable);
 
-static void write_verify_trans_num(H5C2_jbrb_t * struct_ptr, 
-                                   uint64_t trans_num, 
+static void write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
+                                   uint64_t trans_num,
                                    uint64_t verify_val);
 
 
@@ -253,7 +253,7 @@ static void write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
  *
  * Purpose:     If pass2 is true on entry, attempt to begin a transaction.
  * 		If the operation fails, or if it returns an unexpected
- * 		transaction number, set passw2 to FALSE, and set failure_mssg2 
+ * 		transaction number, set passw2 to FALSE, and set failure_mssg2
  *              to point to an appropriate failure message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -276,7 +276,7 @@ begin_trans(H5C2_t * cache_ptr,
 {
     const char * fcn_name = "begin_trans()";
     herr_t result;
-    uint64_t trans_num = 0; 
+    uint64_t trans_num = 0;
 
     if ( pass2 ) {
 
@@ -314,7 +314,7 @@ begin_trans(H5C2_t * cache_ptr,
  * Function:    copy_file()
  *
  * Purpose:     If pass2 is true, copy the input file to the output file.
- *              Set pass2 to FALSE and set failure_mssg2 to point to an 
+ *              Set pass2 to FALSE and set failure_mssg2 to point to an
  *              appropriate error message on failure.
  *
  *              Do nothing if pass2 is false on entry.
@@ -381,17 +381,17 @@ copy_file(const char * input_file,
 	        pass2 = FALSE;
 
 	    } else {
-                
+
 	        input_len = (size_t)(buf.st_size);
 		input_remainder = input_len;
 
 		if ( verbose ) {
 
-		    HDfprintf(stdout, "%s: input_len = %d.\n", 
+		    HDfprintf(stdout, "%s: input_len = %d.\n",
 		              fcn_name, (int)input_len);
 		}
             }
-	} 
+	}
     }
 
     /* open the input file */
@@ -426,7 +426,7 @@ copy_file(const char * input_file,
     }
 
     while ( ( pass2 ) &&
-	    ( input_remainder > 0 ) ) 
+	    ( input_remainder > 0 ) )
     {
         if ( input_remainder > max_buf_len ) {
 
@@ -445,7 +445,7 @@ copy_file(const char * input_file,
 
             if ( verbose ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                           "%s: HDread() failed. result = %d, errno = %d.\n",
                           fcn_name, (int)result, errno);
             }
@@ -463,7 +463,7 @@ copy_file(const char * input_file,
 
 	        if ( verbose ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "%s: HDwrite() failed. result = %d, errno = %d.\n",
                               fcn_name, (int)result, errno);
                 }
@@ -517,9 +517,9 @@ copy_file(const char * input_file,
 /*-------------------------------------------------------------------------
  * Function:    end_trans()
  *
- * Purpose:     If pass2 is true on entry, attempt to end the current 
- * 		transaction.  If the operation fails, set pass2 to FALSE, 
- * 		and set failure_mssg2 to point to an appropriate failure 
+ * Purpose:     If pass2 is true on entry, attempt to end the current
+ * 		transaction.  If the operation fails, set pass2 to FALSE,
+ * 		and set failure_mssg2 to point to an appropriate failure
  * 		message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -546,13 +546,13 @@ end_trans(H5F_t * file_ptr,
 
     if ( pass2 ) {
 
-        result = H5C2_end_transaction(file_ptr, H5AC2_dxpl_id, cache_ptr, 
+        result = H5C2_end_transaction(file_ptr, H5AC2_dxpl_id, cache_ptr,
 			              trans_num, trans_name);
 
         if ( result < 0 ) {
 
             if ( verbose ) {
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
 			  "%s: H5C2_end_transaction(%lld, \"%s\") failed.\n",
 			  fcn_name, (long long)trans_num, trans_name);
             }
@@ -569,11 +569,11 @@ end_trans(H5F_t * file_ptr,
 /*-------------------------------------------------------------------------
  * Function:    file_exists()
  *
- * Purpose:     If pass2 is true on entry, stat the target file, and 
+ * Purpose:     If pass2 is true on entry, stat the target file, and
  * 		return TRUE if it exists, and FALSE if it does not.
  *
- * 		If any errors are detected in this process, set pass2 
- * 		to FALSE and set failure_mssg2 to point to an appropriate 
+ * 		If any errors are detected in this process, set pass2
+ * 		to FALSE and set failure_mssg2 to point to an appropriate
  * 		error message.
  *
  *              Do nothing and return FALSE if pass2 is FALSE on entry.
@@ -621,15 +621,15 @@ file_exists(const char * file_path_ptr)
 
 	    if ( verbose ) {
 
-	        HDfprintf(stdout, "%s: HDstat(%s) failed with ENOENT\n", 
+	        HDfprintf(stdout, "%s: HDstat(%s) failed with ENOENT\n",
 			  fcn_name, file_path_ptr);
 	    }
-	    
+
 	} else {
 
 	    if ( verbose ) {
 
-	        HDfprintf(stdout, 
+	        HDfprintf(stdout,
 			  "%s: HDstat() failed with unexpected errno = %d.\n",
                           fcn_name, errno);
 	    }
@@ -637,7 +637,7 @@ file_exists(const char * file_path_ptr)
 	    failure_mssg2 = "HDstat() returned unexpected value.";
 	    pass2 = FALSE;
 
-	} 
+	}
     }
 
     return(ret_val);
@@ -649,7 +649,7 @@ file_exists(const char * file_path_ptr)
  * Function:    flush_journal()
  *
  * Purpose:     If pass2 is true on entry, attempt to flush the journal.
- * 		If the operation fails, set pass2 to FALSE,  and set 
+ * 		If the operation fails, set pass2 to FALSE,  and set
  * 		failure_mssg2 to point to an appropriate failure message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -670,7 +670,7 @@ flush_journal(H5C2_t * cache_ptr)
     if ( pass2 ) {
 
         if ( H5C2_jb__flush(&(cache_ptr->mdj_jbrb)) < 0 ) {
-		
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "H5C2_jb__flush() reports failure.";
 	}
@@ -685,12 +685,12 @@ flush_journal(H5C2_t * cache_ptr)
  * Function:	jrnl_col_major_scan_backward2()
  *
  * Purpose:	Do a sequence of inserts, protects, and unprotects
- *		broken into a sequence of transactions while scanning 
- *		backwards through the set of entries.  
+ *		broken into a sequence of transactions while scanning
+ *		backwards through the set of entries.
  *
  *		If pass2 is false on entry, do nothing.
  *
- *		Note tht this function is an adaption of 
+ *		Note tht this function is an adaption of
  *		col_major_scan_backward2()
  *
  * Return:	void
@@ -760,9 +760,9 @@ jrnl_col_major_scan_backward2(H5F_t * file_ptr,
 
 	trans_num++;
 
-        begin_trans(cache_ptr, verbose, trans_num, 
+        begin_trans(cache_ptr, verbose, trans_num,
 	            "jrnl_col_major_scan_backward outer loop");
-	    
+
         if ( verbose ) {
 
             HDfprintf(stdout, "begin trans %lld, idx = %d.\n", trans_num, idx);
@@ -774,7 +774,7 @@ jrnl_col_major_scan_backward2(H5F_t * file_ptr,
 
                 HDfprintf(stdout, "%d:%d: ", type, idx);
 	    }
-	    
+
             if ( ( pass2 ) && ( do_inserts) && ( (idx - lag) >= 0 ) &&
                  ( (idx - lag) <= local_max_index[type] ) &&
                  ( ((idx - lag) % 3) == 0 ) &&
@@ -788,7 +788,7 @@ jrnl_col_major_scan_backward2(H5F_t * file_ptr,
             }
 
             if ( ( pass2 ) &&
-		 ( idx >= 0 ) && 
+		 ( idx >= 0 ) &&
 		 ( idx <= local_max_index[type] ) ) {
 
                 if ( verbose )
@@ -813,7 +813,7 @@ jrnl_col_major_scan_backward2(H5F_t * file_ptr,
             type--;
         }
 
-        end_trans(file_ptr, cache_ptr, verbose, trans_num, 
+        end_trans(file_ptr, cache_ptr, verbose, trans_num,
 	          "jrnl_col_major_scan_backward outer loop");
 
 	if ( verbose ) {
@@ -850,10 +850,10 @@ jrnl_col_major_scan_backward2(H5F_t * file_ptr,
  * Function:	jrnl_col_major_scan_forward2()
  *
  * Purpose:	Do a sequence of inserts, protects, and unprotects
- *		broken into a sequence of transactions while scanning 
- *		through the set of entries.  
+ *		broken into a sequence of transactions while scanning
+ *		through the set of entries.
  *
- *		Note that this function is an adaption of 
+ *		Note that this function is an adaption of
  *		col_major_scan_forward2().
  *
  *		If pass2 is false on entry, do nothing.
@@ -922,9 +922,9 @@ jrnl_col_major_scan_forward2(H5F_t * file_ptr,
 
 	trans_num++;
 
-        begin_trans(cache_ptr, verbose, trans_num, 
+        begin_trans(cache_ptr, verbose, trans_num,
 	            "jrnl_col_major_scan_forward outer loop");
-	    
+
         if ( verbose ) {
 
             HDfprintf(stdout, "begin trans %lld, idx = %d.\n", trans_num, idx);
@@ -936,7 +936,7 @@ jrnl_col_major_scan_forward2(H5F_t * file_ptr,
 
                 HDfprintf(stdout, "%d:%d: ", type, idx);
 	    }
-	    
+
             if ( ( pass2 ) && ( do_inserts ) && ( (idx + lag) >= 0 ) &&
                  ( (idx + lag) <= local_max_index[type] ) &&
                  ( ((idx + lag) % 3) == 0 ) &&
@@ -949,8 +949,8 @@ jrnl_col_major_scan_forward2(H5F_t * file_ptr,
                               H5C2__NO_FLAGS_SET);
             }
 
-            if ( ( pass2 ) && 
-                 ( idx >= 0 ) && 
+            if ( ( pass2 ) &&
+                 ( idx >= 0 ) &&
                  ( idx <= local_max_index[type] ) ) {
 
                 if ( verbose )
@@ -975,7 +975,7 @@ jrnl_col_major_scan_forward2(H5F_t * file_ptr,
             type++;
         }
 
-        end_trans(file_ptr, cache_ptr, verbose, trans_num, 
+        end_trans(file_ptr, cache_ptr, verbose, trans_num,
 	          "jrnl_col_major_scan_forward outer loop");
 
 	if ( verbose ) {
@@ -1006,12 +1006,12 @@ jrnl_col_major_scan_forward2(H5F_t * file_ptr,
  * Function:	jrnl_row_major_scan_backward2()
  *
  * Purpose:	Do a sequence of inserts, protects, unprotects, renames,
- *		destroys broken into transactions while scanning backwards 
- *		through the set of entries.  
+ *		destroys broken into transactions while scanning backwards
+ *		through the set of entries.
  *
  *		If pass2 is false on entry, do nothing.
  *
- *		Note that this function is an adaption of 
+ *		Note that this function is an adaption of
  *		row_major_scan_backward2()
  *
  * Return:	void
@@ -1085,25 +1085,25 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 
 	        trans_num++;
 
-                begin_trans(cache_ptr, verbose, trans_num, 
+                begin_trans(cache_ptr, verbose, trans_num,
 			    "jrnl_row_major_scan_backward inner loop");
 
 		if ( verbose )
-		    HDfprintf(stdout, "begin trans %lld.\n", 
+		    HDfprintf(stdout, "begin trans %lld.\n",
 			      (long long)trans_num);
 
 	        if ( verbose )
 	            HDfprintf(stdout, "(%d, %d)\n", lower_bound, upper_bound);
 	    }
 
-	    while ( ( pass2 ) && ( idx >= lower_bound - lag ) ) 
+	    while ( ( pass2 ) && ( idx >= lower_bound - lag ) )
             {
 	        if ( verbose ) {
 
                     HDfprintf(stdout, "%lld:%d:%d: ", trans_num, type, idx);
 	        }
-	    
-                if ( ( pass2 ) && ( do_inserts ) && 
+
+                if ( ( pass2 ) && ( do_inserts ) &&
 		     ( (idx - lag) >= 0 ) &&
 		     ( (idx - lag) >= lower_bound ) &&
                      ( (idx - lag) <= local_max_index ) &&
@@ -1119,7 +1119,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx - lag + 1) >= 0 ) &&
 		     ( (idx - lag + 1) >= lower_bound ) &&
                      ( (idx - lag + 1) <= local_max_index ) &&
@@ -1127,13 +1127,13 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 1) % 3 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p, %d, %d) ", 
+                        HDfprintf(stdout, "(p, %d, %d) ",
 				  type, (idx - lag + 1));
 
                     protect_entry2(file_ptr, type, (idx - lag + 1));
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx - lag + 2) >= 0 ) &&
 		     ( (idx - lag + 2) >= lower_bound ) &&
                      ( (idx - lag + 2) <= local_max_index ) &&
@@ -1141,7 +1141,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 2) % 3 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u, %d, %d) ", 
+                        HDfprintf(stdout, "(u, %d, %d) ",
 				  type, (idx - lag + 2));
 
                     unprotect_entry2(file_ptr, type, idx-lag+2, NO_CHANGE,
@@ -1149,7 +1149,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && ( do_renames ) && 
+                if ( ( pass2 ) && ( do_renames ) &&
 		     ( (idx - lag + 2) >= 0 ) &&
 		     ( (idx - lag + 2) >= lower_bound ) &&
                      ( (idx - lag + 2) <= local_max_index ) &&
@@ -1157,8 +1157,8 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 2) % 3 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(r, %d, %d, %d) ", 
-			          type, (idx - lag + 2), 
+                        HDfprintf(stdout, "(r, %d, %d, %d) ",
+			          type, (idx - lag + 2),
 				  (int)rename_to_main_addr);
 
                     rename_entry2(cache_ptr, type, (idx - lag + 2),
@@ -1166,7 +1166,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx - lag + 3) >= 0 ) &&
 		     ( (idx - lag + 3) >= lower_bound ) &&
                      ( (idx - lag + 3) <= local_max_index ) &&
@@ -1174,13 +1174,13 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 3) % 5 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p, %d, %d) ", 
+                        HDfprintf(stdout, "(p, %d, %d) ",
 				  type, (idx - lag + 3));
 
                     protect_entry2(file_ptr, type, (idx - lag + 3));
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx - lag + 5) >= 0 ) &&
 		     ( (idx - lag + 5) >= lower_bound ) &&
                      ( (idx - lag + 5) <= local_max_index ) &&
@@ -1188,7 +1188,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 5) % 5 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u, %d, %d) ", 
+                        HDfprintf(stdout, "(u, %d, %d) ",
 				  type, (idx - lag + 5));
 
                     unprotect_entry2(file_ptr, type, idx-lag+5, NO_CHANGE,
@@ -1197,7 +1197,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 
 	        if ( do_mult_ro_protects )
 	        {
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx - lag + 5) >= 0 ) &&
 		         ( (idx - lag + 5) >= lower_bound ) &&
 		         ( (idx - lag + 5) < local_max_index ) &&
@@ -1205,13 +1205,13 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		         ( (idx - lag + 5) % 9 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				      (idx - lag + 5));
 
 		        protect_entry_ro2(file_ptr, type, (idx - lag + 5));
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx - lag + 6) >= 0 ) &&
 		         ( (idx - lag + 6) >= lower_bound ) &&
 		         ( (idx - lag + 6) < local_max_index ) &&
@@ -1219,13 +1219,13 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		         ( (idx - lag + 6) % 11 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				      (idx - lag + 6));
 
 		        protect_entry_ro2(file_ptr, type, (idx - lag + 6));
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx - lag + 7) >= 0 ) &&
 		         ( (idx - lag + 7) >= lower_bound ) &&
 		         ( (idx - lag + 7) < local_max_index ) &&
@@ -1233,13 +1233,13 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		         ( (idx - lag + 7) % 13 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				      (idx - lag + 7));
 
 		        protect_entry_ro2(file_ptr, type, (idx - lag + 7));
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx - lag + 7) >= 0 ) &&
 		         ( (idx - lag + 7) >= lower_bound ) &&
 		         ( (idx - lag + 7) < local_max_index ) &&
@@ -1247,14 +1247,14 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		         ( (idx - lag + 7) % 9 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				      (idx - lag + 7));
 
 		        unprotect_entry2(file_ptr, type, (idx - lag + 7),
 				         FALSE, H5C2__NO_FLAGS_SET);
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx - lag + 8) >= 0 ) &&
 		         ( (idx - lag + 8) >= lower_bound ) &&
 		         ( (idx - lag + 8) < local_max_index ) &&
@@ -1262,14 +1262,14 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		         ( (idx - lag + 8) % 11 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				      (idx - lag + 8));
 
 		        unprotect_entry2(file_ptr, type, (idx - lag + 8),
 				         FALSE, H5C2__NO_FLAGS_SET);
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx - lag + 9) >= 0 ) &&
 		         ( (idx - lag + 9) >= lower_bound ) &&
 		         ( (idx - lag + 9) < local_max_index ) &&
@@ -1277,7 +1277,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		         ( (idx - lag + 9) % 13 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				      (idx - lag + 9));
 
 		        unprotect_entry2(file_ptr, type, (idx - lag + 9),
@@ -1285,9 +1285,9 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 		    }
 	        } /* if ( do_mult_ro_protects ) */
 
-                if ( ( pass2 ) && 
-		     ( idx >= 0 ) && 
-		     ( idx >= lower_bound ) && 
+                if ( ( pass2 ) &&
+		     ( idx >= 0 ) &&
+		     ( idx >= lower_bound ) &&
 		     ( idx <= local_max_index ) &&
 		     ( idx <= upper_bound ) ) {
 
@@ -1298,7 +1298,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx + lag - 2) >= 0 ) &&
 		     ( (idx + lag - 2) >= lower_bound ) &&
                      ( (idx + lag - 2) <= local_max_index ) &&
@@ -1306,14 +1306,14 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 2) % 7 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u, %d, %d) ", 
+                        HDfprintf(stdout, "(u, %d, %d) ",
 				  type, (idx + lag - 2));
 
                     unprotect_entry2(file_ptr, type, idx+lag-2, NO_CHANGE,
                                      H5C2__NO_FLAGS_SET);
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx + lag - 1) >= 0 ) &&
 		     ( (idx + lag - 1) >= lower_bound ) &&
                      ( (idx + lag - 1) <= local_max_index ) &&
@@ -1321,7 +1321,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 1) % 7 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p, %d, %d) ", 
+                        HDfprintf(stdout, "(p, %d, %d) ",
 				  type, (idx + lag - 1));
 
                     protect_entry2(file_ptr, type, (idx + lag - 1));
@@ -1330,7 +1330,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 
                 if ( do_destroys ) {
 
-                    if ( ( pass2 ) && 
+                    if ( ( pass2 ) &&
 	                 ( (idx + lag) >= 0 ) &&
 	                 ( (idx + lag) >= lower_bound ) &&
                          ( ( idx + lag) <= local_max_index ) &&
@@ -1342,7 +1342,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                                 if ( (entries2[type])[idx+lag].is_dirty ) {
 
                                     unprotect_entry2(file_ptr, type, idx + lag,
-                                                     NO_CHANGE, 
+                                                     NO_CHANGE,
 						     H5C2__NO_FLAGS_SET);
                                 } else {
 
@@ -1354,7 +1354,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 
                             case 1: /* we just did an insert */
                                 unprotect_entry2(file_ptr, type, idx + lag,
-                                                 NO_CHANGE, 
+                                                 NO_CHANGE,
 						 H5C2__NO_FLAGS_SET);
                                 break;
 
@@ -1362,7 +1362,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                                 if ( (entries2[type])[idx + lag].is_dirty ) {
 
                                     unprotect_entry2(file_ptr, type, idx + lag,
-                                                     NO_CHANGE, 
+                                                     NO_CHANGE,
 						     H5C2__DELETED_FLAG);
                                 } else {
 
@@ -1374,7 +1374,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 
                             case 3: /* we just did an insrt */
                                 unprotect_entry2(file_ptr, type, idx + lag,
-                                                 NO_CHANGE, 
+                                                 NO_CHANGE,
 						 H5C2__DELETED_FLAG);
                                 break;
 
@@ -1385,18 +1385,18 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
                     }
                 } else {
 
-                    if ( ( pass2 ) && 
+                    if ( ( pass2 ) &&
 		         ( (idx + lag) >= 0 ) &&
 		         ( (idx + lag) >= lower_bound ) &&
                          ( ( idx + lag) <= local_max_index ) &&
                          ( ( idx + lag) <= upper_bound ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, 
+                            HDfprintf(stdout,
 				      "(u, %d, %d) ", type, (idx + lag));
 
                         unprotect_entry2(file_ptr, type, idx + lag,
-                                         dirty_unprotects, 
+                                         dirty_unprotects,
 					 H5C2__NO_FLAGS_SET);
                     }
                 }
@@ -1408,7 +1408,7 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
 
             } /* while ( ( pass2 ) && ( idx >= lower_bound - lag ) ) */
 
-	    end_trans(file_ptr, cache_ptr, verbose, trans_num, 
+	    end_trans(file_ptr, cache_ptr, verbose, trans_num,
                       "jrnl_row_major_scan_backward inner loop");
 
 	    if ( verbose )
@@ -1439,12 +1439,12 @@ jrnl_row_major_scan_backward2(H5F_t * file_ptr,
  * Function:	jrnl_row_major_scan_forward2()
  *
  * Purpose:	Do a sequence of inserts, protects, unprotects, renames,
- *		and destroys broken into transactions while scanning 
- *		through the set of entries. 
+ *		and destroys broken into transactions while scanning
+ *		through the set of entries.
  *
  *		If pass2 is false on entry, do nothing.
  *
- *		Note that this function is an adaption of 
+ *		Note that this function is an adaption of
  *		row_major_scan_forward2().
  *
  * Return:	void
@@ -1518,26 +1518,26 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 
 	        trans_num++;
 
-                begin_trans(cache_ptr, verbose, trans_num, 
+                begin_trans(cache_ptr, verbose, trans_num,
 			    "jrnl_row_major_scan_forward inner loop");
 
 		if ( verbose )
-		    HDfprintf(stdout, "begin trans %lld.\n", 
+		    HDfprintf(stdout, "begin trans %lld.\n",
 			      (long long)trans_num);
 
 	        if ( verbose )
 	            HDfprintf(stdout, "(%d, %d)\n", lower_bound, upper_bound);
 	    }
 
-	    while ( ( pass2 ) && ( idx <= upper_bound + lag ) ) 
+	    while ( ( pass2 ) && ( idx <= upper_bound + lag ) )
             {
-	    
+
 	        if ( verbose ) {
 
                     HDfprintf(stdout, "%lld:%d:%d: ", trans_num, type, idx);
 	        }
 
-                if ( ( pass2 ) && ( do_inserts ) && 
+                if ( ( pass2 ) && ( do_inserts ) &&
 		     ( (idx + lag) >= 0 ) &&
 		     ( (idx + lag) >= lower_bound ) &&
                      ( (idx + lag) <= local_max_index ) &&
@@ -1554,7 +1554,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx + lag - 1) >= 0 ) &&
 		     ( (idx + lag - 1) >= lower_bound ) &&
                      ( (idx + lag - 1) <= local_max_index ) &&
@@ -1562,14 +1562,14 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 1) % 3 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
 				  "2(p, %d, %d) ", type, (idx + lag - 1));
 
 		    /*** protect entry idx + lag - 1 ***/
                     protect_entry2(file_ptr, type, (idx + lag - 1));
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx + lag - 2) >= 0 ) &&
 		     ( (idx + lag - 2) >= lower_bound ) &&
                      ( (idx + lag - 2) <= local_max_index ) &&
@@ -1577,7 +1577,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 2) % 3 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "3(u, %d, %d) ", 
+                        HDfprintf(stdout, "3(u, %d, %d) ",
 				  type, (idx + lag - 2));
 
 		    /*** unprotect entry idx + lag - 2 ***/
@@ -1586,7 +1586,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && ( do_renames ) && 
+                if ( ( pass2 ) && ( do_renames ) &&
 		     ( (idx + lag - 2) >= 0 ) &&
 		     ( (idx + lag - 2) >= lower_bound ) &&
                      ( (idx + lag - 2) <= local_max_index ) &&
@@ -1594,8 +1594,8 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 2) % 3 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "4(r, %d, %d, %d) ", 
-			          type, (idx + lag - 2), 
+                        HDfprintf(stdout, "4(r, %d, %d, %d) ",
+			          type, (idx + lag - 2),
 				  (int)rename_to_main_addr);
 
 		    /*** rename entry idx + lag -2 ***/
@@ -1604,7 +1604,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                 }
 
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx + lag - 3) >= 0 ) &&
 		     ( (idx + lag - 3) >= lower_bound ) &&
                      ( (idx + lag - 3) <= local_max_index ) &&
@@ -1612,14 +1612,14 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 3) % 5 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "5(p, %d, %d) ", 
+                        HDfprintf(stdout, "5(p, %d, %d) ",
 				  type, (idx + lag - 3));
 
 		    /*** protect entry idx + lag - 3 ***/
                     protect_entry2(file_ptr, type, (idx + lag - 3));
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx + lag - 5) >= 0 ) &&
 		     ( (idx + lag - 5) >= lower_bound ) &&
                      ( (idx + lag - 5) <= local_max_index ) &&
@@ -1627,7 +1627,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx + lag - 5) % 5 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "6(u, %d, %d) ", 
+                        HDfprintf(stdout, "6(u, %d, %d) ",
 				  type, (idx + lag - 5));
 
 
@@ -1638,7 +1638,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 
 	        if ( do_mult_ro_protects )
 	        {
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx + lag - 5) >= 0 ) &&
 		         ( (idx + lag - 5) >= lower_bound ) &&
 		         ( (idx + lag - 5) < local_max_index ) &&
@@ -1646,14 +1646,14 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		         ( (idx + lag - 5) % 9 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "7(p-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "7(p-ro, %d, %d) ", type,
 				      (idx + lag - 5));
 
 		        /*** protect ro entry idx + lag - 5 ***/
 		        protect_entry_ro2(file_ptr, type, (idx + lag - 5));
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx + lag - 6) >= 0 ) &&
 		         ( (idx + lag - 6) >= lower_bound ) &&
 		         ( (idx + lag - 6) < local_max_index ) &&
@@ -1661,14 +1661,14 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		         ( (idx + lag - 6) % 11 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "8(p-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "8(p-ro, %d, %d) ", type,
 				      (idx + lag - 6));
 
 		        /*** protect ro entry idx + lag - 6 ***/
 		        protect_entry_ro2(file_ptr, type, (idx + lag - 6));
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx + lag - 7) >= 0 ) &&
 		         ( (idx + lag - 7) >= lower_bound ) &&
 		         ( (idx + lag - 7) < local_max_index ) &&
@@ -1676,14 +1676,14 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		         ( (idx + lag - 7) % 13 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "9(p-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "9(p-ro, %d, %d) ", type,
 				      (idx + lag - 7));
 
 		        /*** protect ro entry idx + lag - 7 ***/
 		        protect_entry_ro2(file_ptr, type, (idx + lag - 7));
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx + lag - 7) >= 0 ) &&
 		         ( (idx + lag - 7) >= lower_bound ) &&
 		         ( (idx + lag - 7) < local_max_index ) &&
@@ -1691,7 +1691,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		         ( (idx + lag - 7) % 9 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "10(u-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "10(u-ro, %d, %d) ", type,
 				      (idx + lag - 7));
 
 		        /*** unprotect ro entry idx + lag - 7 ***/
@@ -1699,7 +1699,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 				         FALSE, H5C2__NO_FLAGS_SET);
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx + lag - 8) >= 0 ) &&
 		         ( (idx + lag - 8) >= lower_bound ) &&
 		         ( (idx + lag - 8) < local_max_index ) &&
@@ -1707,7 +1707,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		         ( (idx + lag - 8) % 11 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "11(u-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "11(u-ro, %d, %d) ", type,
 				      (idx + lag - 8));
 
 		        /*** unprotect ro entry idx + lag - 8 ***/
@@ -1715,7 +1715,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 				         FALSE, H5C2__NO_FLAGS_SET);
 		    }
 
-		    if ( ( pass2 ) && 
+		    if ( ( pass2 ) &&
 		         ( (idx + lag - 9) >= 0 ) &&
 		         ( (idx + lag - 9) >= lower_bound ) &&
 		         ( (idx + lag - 9) < local_max_index ) &&
@@ -1723,7 +1723,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		         ( (idx + lag - 9) % 13 == 0 ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "12(u-ro, %d, %d) ", type, 
+                            HDfprintf(stdout, "12(u-ro, %d, %d) ", type,
 				      (idx + lag - 9));
 
 		        /*** unprotect ro entry idx + lag - 9 ***/
@@ -1732,9 +1732,9 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 		    }
 	        } /* if ( do_mult_ro_protects ) */
 
-                if ( ( pass2 ) && 
-		     ( idx >= 0 ) && 
-		     ( idx >= lower_bound ) && 
+                if ( ( pass2 ) &&
+		     ( idx >= 0 ) &&
+		     ( idx >= lower_bound ) &&
 		     ( idx <= local_max_index ) &&
 		     ( idx <= upper_bound ) ) {
 
@@ -1745,7 +1745,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                     protect_entry2(file_ptr, type, idx);
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx - lag + 2) >= 0 ) &&
 		     ( (idx - lag + 2) >= lower_bound ) &&
                      ( (idx - lag + 2) <= local_max_index ) &&
@@ -1753,7 +1753,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 2) % 7 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "14(u, %d, %d) ", 
+                        HDfprintf(stdout, "14(u, %d, %d) ",
 				  type, (idx - lag + 2));
 
 		    /*** unprotect entry idx - lag + 2 ***/
@@ -1761,7 +1761,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                                      H5C2__NO_FLAGS_SET);
                 }
 
-                if ( ( pass2 ) && 
+                if ( ( pass2 ) &&
 		     ( (idx - lag + 1) >= 0 ) &&
 		     ( (idx - lag + 1) >= lower_bound ) &&
                      ( (idx - lag + 1) <= local_max_index ) &&
@@ -1769,7 +1769,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                      ( ( (idx - lag + 1) % 7 ) == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "15(p, %d, %d) ", 
+                        HDfprintf(stdout, "15(p, %d, %d) ",
 				  type, (idx - lag + 1));
 
 		    /*** protect entry idx - lag + 1 ***/
@@ -1779,7 +1779,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 
                 if ( do_destroys ) {
 
-                    if ( ( pass2 ) && 
+                    if ( ( pass2 ) &&
 		         ( (idx - lag) >= 0 ) &&
 		         ( (idx - lag) >= lower_bound ) &&
                          ( ( idx - lag) <= local_max_index ) &&
@@ -1790,7 +1790,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                             case 0: /* we just did an insert */
 
                                 if ( verbose )
-                                    HDfprintf(stdout, "16(u, %d, %d) ", 
+                                    HDfprintf(stdout, "16(u, %d, %d) ",
 					      type, (idx - lag));
 
 			        /*** unprotect entry NC idx - lag ***/
@@ -1802,17 +1802,17 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                                 if ( (entries2[type])[idx-lag].is_dirty ) {
 
                                     if ( verbose )
-                                        HDfprintf(stdout, "17(u, %d, %d) ", 
+                                        HDfprintf(stdout, "17(u, %d, %d) ",
 						  type, (idx - lag));
 
 			            /*** unprotect entry NC idx - lag ***/
                                     unprotect_entry2(file_ptr, type, idx - lag,
-                                                     NO_CHANGE, 
+                                                     NO_CHANGE,
 						     H5C2__NO_FLAGS_SET);
                                 } else {
 
                                     if ( verbose )
-                                        HDfprintf(stdout, "18(u, %d, %d) ", 
+                                        HDfprintf(stdout, "18(u, %d, %d) ",
 						  type, (idx - lag));
 
 			            /*** unprotect entry idx - lag ***/
@@ -1825,7 +1825,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                             case 2: /* we just did an insrt */
 
                                 if ( verbose )
-                                    HDfprintf(stdout, "19(u-del, %d, %d) ", 
+                                    HDfprintf(stdout, "19(u-del, %d, %d) ",
 					      type, (idx - lag));
 
 			        /*** unprotect delete idx - lag ***/
@@ -1837,17 +1837,17 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
                                 if ( (entries2[type])[idx-lag].is_dirty ) {
 
                                     if ( verbose )
-                                        HDfprintf(stdout, "20(u-del, %d, %d) ", 
+                                        HDfprintf(stdout, "20(u-del, %d, %d) ",
 					          type, (idx - lag));
 
 				    /*** unprotect delete idx - lag ***/
                                     unprotect_entry2(file_ptr, type, idx - lag,
-                                                     NO_CHANGE, 
+                                                     NO_CHANGE,
 						     H5C2__DELETED_FLAG);
                                 } else {
 
                                     if ( verbose )
-                                        HDfprintf(stdout, "21(u-del, %d, %d) ", 
+                                        HDfprintf(stdout, "21(u-del, %d, %d) ",
 					          type, (idx - lag));
 
 				    /*** unprotect delete idx - lag ***/
@@ -1865,14 +1865,14 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 
                 } else {
 
-                    if ( ( pass2 ) && 
+                    if ( ( pass2 ) &&
 		         ( (idx - lag) >= 0 ) &&
 		         ( (idx - lag) >= lower_bound ) &&
                          ( ( idx - lag) <= local_max_index ) &&
                          ( ( idx - lag) <= upper_bound ) ) {
 
                         if ( verbose )
-                            HDfprintf(stdout, "22(u, %d, %d) ", 
+                            HDfprintf(stdout, "22(u, %d, %d) ",
 				      type, (idx - lag));
 
 		        /*** unprotect idx - lag ***/
@@ -1888,7 +1888,7 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 
 	    } /* while ( ( pass2 ) && ( idx <= upper_bound ) ) */
 
-	    end_trans(file_ptr, cache_ptr, verbose, trans_num, 
+	    end_trans(file_ptr, cache_ptr, verbose, trans_num,
                       "jrnl_row_major_scan_forward inner loop");
 
 	    if ( verbose )
@@ -1918,12 +1918,12 @@ jrnl_row_major_scan_forward2(H5F_t * file_ptr,
 /*-------------------------------------------------------------------------
  * Function:    open_existing_file_for_journaling()
  *
- * Purpose:     If pass2 is true on entry, open the specified a HDF5 file 
- * 		with journaling enabled and journal file with the specified 
- * 		name.  Return pointers to the cache data structure and file 
+ * Purpose:     If pass2 is true on entry, open the specified a HDF5 file
+ * 		with journaling enabled and journal file with the specified
+ * 		name.  Return pointers to the cache data structure and file
  * 		data structures, and verify that it contains the expected data.
  *
- *              On failure, set pass2 to FALSE, and set failure_mssg2 
+ *              On failure, set pass2 to FALSE, and set failure_mssg2
  *              to point to an appropriate failure message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -1947,7 +1947,7 @@ open_existing_file_for_journaling(const char * hdf_file_name,
                                   hid_t * file_id_ptr,
                                   H5F_t ** file_ptr_ptr,
                                   H5C2_t ** cache_ptr_ptr,
-                                  hbool_t human_readable) 
+                                  hbool_t human_readable)
 {
     const char * fcn_name = "open_existing_file_for_journaling()";
     hbool_t show_progress = FALSE;
@@ -1968,7 +1968,7 @@ open_existing_file_for_journaling(const char * hdf_file_name,
 	     ( file_ptr_ptr == NULL ) ||
 	     ( cache_ptr_ptr == NULL ) ) {
 
-            failure_mssg2 = 
+            failure_mssg2 =
                "Bad param(s) on entry to open_existing_file_for_journaling().\n";
 	    pass2 = FALSE;
         }
@@ -1979,9 +1979,9 @@ open_existing_file_for_journaling(const char * hdf_file_name,
 
         } else  if ( verbose ) {
 
-            HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", 
+            HDfprintf(stdout, "%s: HDF file name = \"%s\".\n",
 		      fcn_name, hdf_file_name);
-            HDfprintf(stdout, "%s: journal file name = \"%s\".\n", 
+            HDfprintf(stdout, "%s: journal file name = \"%s\".\n",
 		      fcn_name, journal_file_name);
 	}
     }
@@ -2005,7 +2005,7 @@ open_existing_file_for_journaling(const char * hdf_file_name,
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) 
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST)
 		< 0 ) {
 
             pass2 = FALSE;
@@ -2053,7 +2053,7 @@ open_existing_file_for_journaling(const char * hdf_file_name,
     }
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
- 
+
     /**************************************/
     /* open the file with the fapl above. */
     /**************************************/
@@ -2086,20 +2086,20 @@ open_existing_file_for_journaling(const char * hdf_file_name,
 
     /* At least within the context of the cache2 test code, there should be
      * no need to allocate space for test entries since we are re-opening
-     * the file, and any needed space allocation should have been done at 
+     * the file, and any needed space allocation should have been done at
      * file creation.
      */
 
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * to the cache structure
      */
     if ( pass2 ) {
 
         if ( file_ptr->shared->cache2 == NULL ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "can't get cache2 pointer(1).\n";
 
@@ -2119,7 +2119,7 @@ open_existing_file_for_journaling(const char * hdf_file_name,
 	*cache_ptr_ptr = cache_ptr;
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++);
 
     return;
@@ -2130,12 +2130,12 @@ open_existing_file_for_journaling(const char * hdf_file_name,
 /*-------------------------------------------------------------------------
  * Function:    open_existing_file_without_journaling()
  *
- * Purpose:     If pass2 is true on entry, open the specified a HDF5 file 
- * 		with journaling disabled.  Return pointers to the cache 
- * 		data structure and file data structures, and verify that 
+ * Purpose:     If pass2 is true on entry, open the specified a HDF5 file
+ * 		with journaling disabled.  Return pointers to the cache
+ * 		data structure and file data structures, and verify that
  * 		it contains the expected data.
  *
- *              On failure, set pass2 to FALSE, and set failure_mssg2 
+ *              On failure, set pass2 to FALSE, and set failure_mssg2
  *              to point to an appropriate failure message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -2172,7 +2172,7 @@ open_existing_file_without_journaling(const char * hdf_file_name,
 	     ( file_ptr_ptr == NULL ) ||
 	     ( cache_ptr_ptr == NULL ) ) {
 
-            failure_mssg2 = 
+            failure_mssg2 =
            "Bad param(s) on entry to open_existing_file_without_journaling().\n";
 	    pass2 = FALSE;
 
@@ -2180,7 +2180,7 @@ open_existing_file_without_journaling(const char * hdf_file_name,
 
             if ( verbose ) {
 
-                HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", 
+                HDfprintf(stdout, "%s: HDF file name = \"%s\".\n",
 			  fcn_name, hdf_file_name);
 	    }
 	}
@@ -2205,7 +2205,7 @@ open_existing_file_without_journaling(const char * hdf_file_name,
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				  H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
@@ -2248,20 +2248,20 @@ open_existing_file_without_journaling(const char * hdf_file_name,
 
     /* At least within the context of the cache2 test code, there should be
      * no need to allocate space for test entries since we are re-opening
-     * the file, and any needed space allocation should have been done at 
+     * the file, and any needed space allocation should have been done at
      * file creation.
      */
 
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * to the cache structure
      */
     if ( pass2 ) {
 
         if ( file_ptr->shared->cache2 == NULL ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "can't get cache2 pointer(1).\n";
 
@@ -2281,7 +2281,7 @@ open_existing_file_without_journaling(const char * hdf_file_name,
 	*cache_ptr_ptr = cache_ptr;
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++);
 
     return;
@@ -2292,12 +2292,12 @@ open_existing_file_without_journaling(const char * hdf_file_name,
 /*-------------------------------------------------------------------------
  * Function:    setup_cache_for_journaling()
  *
- * Purpose:     If pass2 is true on entry, create a HDF5 file with 
- * 		journaling enabled and journal file with the specified name.  
- * 		Return pointers to the cache data structure and file data 
+ * Purpose:     If pass2 is true on entry, create a HDF5 file with
+ * 		journaling enabled and journal file with the specified name.
+ * 		Return pointers to the cache data structure and file data
  * 		structures.  and verify that it contains the expected data.
  *
- *              On failure, set pass2 to FALSE, and set failure_mssg2 
+ *              On failure, set pass2 to FALSE, and set failure_mssg2
  *              to point to an appropriate failure message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -2309,8 +2309,8 @@ open_existing_file_without_journaling(const char * hdf_file_name,
  *
  * Modifications:
  *
- *		Added the human_readable parameter and associated 
- *		code to allow selection of either binary or human 
+ *		Added the human_readable parameter and associated
+ *		code to allow selection of either binary or human
  *		readable journal file.
  *						JRM -- 5/8/09
  *
@@ -2393,7 +2393,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
 	     ( file_ptr_ptr == NULL ) ||
 	     ( cache_ptr_ptr == NULL ) ) {
 
-            failure_mssg2 = 
+            failure_mssg2 =
                 "Bad param(s) on entry to setup_cache_for_journaling().\n";
 	    pass2 = FALSE;
         }
@@ -2408,9 +2408,9 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
             if ( verbose ) {
 
-                HDfprintf(stdout, "%s: HDF file name = \"%s\".\n", 
+                HDfprintf(stdout, "%s: HDF file name = \"%s\".\n",
 			  fcn_name, hdf_file_name);
-                HDfprintf(stdout, "%s: journal file name = \"%s\".\n", 
+                HDfprintf(stdout, "%s: journal file name = \"%s\".\n",
 			  fcn_name, journal_file_name);
 	    }
 	}
@@ -2435,7 +2435,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
 				  H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
@@ -2486,7 +2486,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
- 
+
     /**************************************/
     /* Create a file with the fapl above. */
     /**************************************/
@@ -2543,7 +2543,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
             failure_mssg2 = "actual_base_addr > BASE_ADDR";
 
             if ( verbose ) {
-                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n", 
+                HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n",
 			  fcn_name);
             }
         }
@@ -2551,13 +2551,13 @@ setup_cache_for_journaling(const char * hdf_file_name,
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * to the cache structure
      */
     if ( pass2 ) {
 
         if ( file_ptr->shared->cache2 == NULL ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "can't get cache2 pointer(1).\n";
 
@@ -2592,7 +2592,7 @@ setup_cache_for_journaling(const char * hdf_file_name,
 	*cache_ptr_ptr = cache_ptr;
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s: cp = %d -- exiting.\n", fcn_name, cp++);
 
     return;
@@ -2620,12 +2620,12 @@ static void
 takedown_cache_after_journaling(hid_t file_id,
                                 const char * filename,
                                 const char * journal_filename,
-				hbool_t 
+				hbool_t
 				use_core_driver_if_avail)
 {
     hbool_t verbose = FALSE;
     int error;
-    
+
     if ( file_id >= 0 ) {
 
 	if ( H5Fclose(file_id) < 0 ) {
@@ -2639,8 +2639,8 @@ takedown_cache_after_journaling(hid_t file_id,
                     ( ( error = HDremove(filename) ) != 0 ) ) {
 
 	    if ( verbose ) {
-	        HDfprintf(stdout, 
-		  "HDremove(\"%s\") failed, returned %d, errno = %d = %s.\n", 
+	        HDfprintf(stdout,
+		  "HDremove(\"%s\") failed, returned %d, errno = %d = %s.\n",
 		  filename, error, errno, strerror(errno));
 	    }
 
@@ -2662,10 +2662,10 @@ takedown_cache_after_journaling(hid_t file_id,
 /*-------------------------------------------------------------------------
  * Function:    verify_journal_contents()
  *
- * Purpose:     If pass2 is true on entry, verify that the contents of the 
- * 		journal file matches that of the expected file.  If 
+ * Purpose:     If pass2 is true on entry, verify that the contents of the
+ * 		journal file matches that of the expected file.  If
  * 		differences are detected, or if any other error is detected,
- * 		set pass2 to FALSE and set failure_mssg2 to point to an 
+ * 		set pass2 to FALSE and set failure_mssg2 to point to an
  * 		appropriate error message.
  *
  *              Do nothing if pass2 is FALSE on entry.
@@ -2678,7 +2678,7 @@ takedown_cache_after_journaling(hid_t file_id,
  * Modifications:
  *
  *		JRM -- 6/10/09
- *		Updated function to deal with binary as well as human 
+ *		Updated function to deal with binary as well as human
  *		readable journal files.
  *
  *-------------------------------------------------------------------------
@@ -2750,16 +2750,16 @@ verify_journal_contents(const char * journal_file_path_ptr,
 	        pass2 = FALSE;
 
 	    } else {
-                
+
 	        journal_len = (size_t)(buf.st_size);
 
 		if ( verbose ) {
 
-		    HDfprintf(stdout, "%s: journal_len = %d.\n", 
+		    HDfprintf(stdout, "%s: journal_len = %d.\n",
 		              fcn_name, (int)journal_len);
 		}
             }
-	} 
+	}
     }
 
     /* get the actual length of the expected file */
@@ -2783,22 +2783,22 @@ verify_journal_contents(const char * journal_file_path_ptr,
 	        pass2 = FALSE;
 
 	    } else {
-                
+
 	        expected_len = (size_t)(buf.st_size);
 
 		if ( verbose ) {
 
-		    HDfprintf(stdout, "%s: expected_len = %d.\n", 
+		    HDfprintf(stdout, "%s: expected_len = %d.\n",
 		              fcn_name, (int)expected_len);
 		}
             }
-	} 
+	}
     }
 
     /* open the journal file */
     if ( pass2 ) {
 
-	if ( (journal_file_fd = HDopen(journal_file_path_ptr, O_RDONLY, 0777)) 
+	if ( (journal_file_fd = HDopen(journal_file_path_ptr, O_RDONLY, 0777))
 	     == -1 ) {
 
 	    if ( verbose ) {
@@ -2814,7 +2814,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
     /* open the expected file */
     if ( pass2 ) {
 
-	if ( (expected_file_fd = HDopen(expected_file_path_ptr, O_RDONLY, 0777)) 
+	if ( (expected_file_fd = HDopen(expected_file_path_ptr, O_RDONLY, 0777))
 	     == -1 ) {
 
 	    if ( verbose ) {
@@ -2828,12 +2828,12 @@ verify_journal_contents(const char * journal_file_path_ptr,
     }
 
     /* The first lines of the journal and expected files will usually differ
-     * in magic number and creation date.  We could look at everything else 
-     * on the line, but for now we will just skip past it, and compute the 
+     * in magic number and creation date.  We could look at everything else
+     * on the line, but for now we will just skip past it, and compute the
      * length of the remainder of the journal and expected files as we do so.
      *
-     * Do this by reading the file one character at a time until we hit a 
-     * newline.  This is very inefficient, but this is test code, and the 
+     * Do this by reading the file one character at a time until we hit a
+     * newline.  This is very inefficient, but this is test code, and the
      * first line can't be very long.
      */
     if ( pass2 ) {
@@ -2841,7 +2841,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
         first_line_len = 1;
 	read_result = HDread(journal_file_fd, &ch, 1);
 
-	while ( ( ch != '\n' ) && 
+	while ( ( ch != '\n' ) &&
 		( first_line_len < 256 ) &&
 	        ( read_result == 1 ) ) {
 
@@ -2850,7 +2850,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
 	}
 
 	if ( ch != '\n' ) {
-	
+
 	    failure_mssg2 = "error skipping first line of journal file.";
 	    pass2 = FALSE;
 
@@ -2870,7 +2870,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
         first_line_len = 1;
 	read_result = HDread(expected_file_fd, &ch, 1);
 
-	while ( ( ch != '\n' ) && 
+	while ( ( ch != '\n' ) &&
 		( first_line_len < 256 ) &&
 	        ( read_result == 1 ) ) {
 
@@ -2879,7 +2879,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
 	}
 
 	if ( ch != '\n' ) {
-	
+
 	    failure_mssg2 = "error skipping first line of expected file.";
 	    pass2 = FALSE;
 
@@ -2903,12 +2903,12 @@ verify_journal_contents(const char * journal_file_path_ptr,
 	}
     }
 
-    /* If we get this far without an error, the lengths of the actual 
+    /* If we get this far without an error, the lengths of the actual
      * and expected files (after skipping the first line) are identical.
      * Thus we have to go and compare the actual data.
      */
     while ( ( pass2 ) &&
-	    ( journal_remainder_len > 0 ) ) 
+	    ( journal_remainder_len > 0 ) )
     {
         HDassert( journal_remainder_len == expected_remainder_len );
 
@@ -2931,7 +2931,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
 
             if ( verbose ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                           "%s: HDread(j) failed. result = %d, errno = %d.\n",
                           fcn_name, (int)read_result, errno);
             }
@@ -2949,7 +2949,7 @@ verify_journal_contents(const char * journal_file_path_ptr,
 
 	        if ( verbose ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "%s: HDread(e) failed. result = %d, errno = %d.\n",
                               fcn_name, (int)read_result, errno);
                 }
@@ -2968,9 +2968,9 @@ verify_journal_contents(const char * journal_file_path_ptr,
 
 		    if ( verbose ) {
 
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "expected_buf = \"%s\"\n", expected_buf);
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "journal_buf  = \"%s\"\n", journal_buf);
                     }
 
@@ -3035,8 +3035,8 @@ verify_journal_contents(const char * journal_file_path_ptr,
  *
  * Purpose:     If pass2 is true on entry, stat the target journal file,
  * 		and verify that it does not exist.  If it does, set
- * 		pass2 to FALSE, and set failure_mssg2 to point to an 
- * 		appropriate failure message.  Similarly, if any errors 
+ * 		pass2 to FALSE, and set failure_mssg2 to point to an
+ * 		appropriate failure message.  Similarly, if any errors
  * 		are detected in this process, set pass2 to FALSE and set
  * 		failure_mssg2 to point to an appropriate error message.
  *
@@ -3085,14 +3085,14 @@ verify_journal_deleted(const char * journal_file_path_ptr)
 
 	    if ( verbose ) {
 
-	        HDfprintf(stdout, 
+	        HDfprintf(stdout,
 			  "%s: HDstat() failed with unexpected errno = %d.\n",
                           fcn_name, errno);
 	    }
 	    failure_mssg2 = "journal file not deleted(2).";
 	    pass2 = FALSE;
 
-	} 
+	}
     }
 
     return;
@@ -3105,8 +3105,8 @@ verify_journal_deleted(const char * journal_file_path_ptr)
  *
  * Purpose:     If pass2 is true on entry, stat the target journal file,
  * 		and verify that it has length zero.  If it is not, set
- * 		pass2 to FALSE, and set failure_mssg2 to point to an 
- * 		appropriate failure message.  Similarly, if any errors 
+ * 		pass2 to FALSE, and set failure_mssg2 to point to an
+ * 		appropriate failure message.  Similarly, if any errors
  * 		are detected in this process, set pass2 to FALSE and set
  * 		failure_mssg2 to point to an appropriate error message.
  *
@@ -3157,7 +3157,7 @@ verify_journal_empty(const char * journal_file_path_ptr)
                 failure_mssg2 = "Empty journal file expected.";
 	        pass2 = FALSE;
             }
-	} 
+	}
     }
 
     return;
@@ -3170,31 +3170,31 @@ verify_journal_empty(const char * journal_file_path_ptr)
 /*-------------------------------------------------------------------------
  * Function:    mdj_smoke_check_00()
  *
- * Purpose:     Run a basic smoke check on the metadata journaling 
+ * Purpose:     Run a basic smoke check on the metadata journaling
  *              facilities of the metadata cache.  Proceed as follows:
  *
- *              1) Create a file with journaling enabled.  Verify that 
+ *              1) Create a file with journaling enabled.  Verify that
  *                 journal file is created.
  *
- *              2) Using the test entries, simulate a selection of 
- *                 transactions, which exercise the full range of 
- *                 metadata cache API which can generate journal entries.  
- *                 Verify that these transactions are reflected correctly 
+ *              2) Using the test entries, simulate a selection of
+ *                 transactions, which exercise the full range of
+ *                 metadata cache API which can generate journal entries.
+ *                 Verify that these transactions are reflected correctly
  *                 in the journal.
  *
  *              3) Close the hdf5 file, and verify that the journal file
- *                 is deleted.  Re-open the file with journaling, and 
- *                 do a transaction or two just to verify that the 
+ *                 is deleted.  Re-open the file with journaling, and
+ *                 do a transaction or two just to verify that the
  *                 journaling is working.
  *
  *              4) Close the file, and verify that the journal is deleted.
  *
- *              5) Re-open the file with journaling disabled.  Do a 
+ *              5) Re-open the file with journaling disabled.  Do a
  *                 transaction or two, and verify that the transactions
  *                 took place, and that there is no journal file.
  *
  *              6) Enable journaling on the open file.  Do a transaction
- *                 or two to verify that journaling is working.  
+ *                 or two to verify that journaling is working.
  *
  *              7) Disable journaling on the open file.  Verify that the
  *                 journal file has been deleted.
@@ -3206,7 +3206,7 @@ verify_journal_empty(const char * journal_file_path_ptr)
  * Programmer:  John Mainzer
  *              3/11/08
  *
- * Changes:	Modified function to run using either a human readable 
+ * Changes:	Modified function to run using either a human readable
  *		or binary journal file.
  *							JRM -- 5/8/9
  *
@@ -3217,7 +3217,7 @@ static void
 mdj_smoke_check_00(hbool_t human_readable)
 {
     const char * fcn_name = "mdj_smoke_check_00()";
-    const char * human_readable_testfiles[] = 
+    const char * human_readable_testfiles[] =
     {
         "testfiles/cache2_journal_sc00_000.jnl",
         "testfiles/cache2_journal_sc00_001.jnl",
@@ -3240,7 +3240,7 @@ mdj_smoke_check_00(hbool_t human_readable)
         "testfiles/cache2_journal_sc00_018.jnl",
 	NULL
     };
-    const char * binary_testfiles[] = 
+    const char * binary_testfiles[] =
     {
         "testfiles/cache2_journal_bsc00_000.jnl",
         "testfiles/cache2_journal_bsc00_001.jnl",
@@ -3276,7 +3276,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     H5F_t * file_ptr = NULL;
     H5C2_t * cache_ptr = NULL;
     H5AC2_jnl_config_t jnl_config;
-    
+
     if ( human_readable ) {
 
         testfiles = human_readable_testfiles;
@@ -3309,23 +3309,23 @@ mdj_smoke_check_00(hbool_t human_readable)
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s: filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s: filename = \"%s\".\n", fcn_name, filename);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-	else if ( HDstrlen(journal_filename) >= 
+	else if ( HDstrlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -3336,9 +3336,9 @@ mdj_smoke_check_00(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s: journal filename = \"%s\".\n", 
-		  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s: journal filename = \"%s\".\n",
+		  fcn_name, journal_filename);
     }
 
     /* clean out any existing journal file */
@@ -3348,7 +3348,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d *cp = %d.\n", fcn_name, pass2, cp++);
- 
+
 
     /********************************************************************/
     /* 2) Using the test entries, simulate a selection of transactions, */
@@ -3361,7 +3361,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     begin_trans(cache_ptr, verbose, (uint64_t)1, "transaction 1.0");
 
-    insert_entry2(file_ptr, 0, 1, FALSE, H5C2__NO_FLAGS_SET); 
+    insert_entry2(file_ptr, 0, 1, FALSE, H5C2__NO_FLAGS_SET);
 
     protect_entry2(file_ptr, 0, 0);
 
@@ -3423,7 +3423,7 @@ mdj_smoke_check_00(hbool_t human_readable)
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
 
-    /* c) Verify that the most recently dirtied entry get to the head of 
+    /* c) Verify that the most recently dirtied entry get to the head of
      *    the transaction list (and thus appears as the last entry in the
      *    transaction).
      */
@@ -3455,7 +3455,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[1]);
     }
-    
+
     if ( file_exists(testfiles[1]) ) {
 
         verify_journal_contents(journal_filename, testfiles[1], human_readable);
@@ -3503,7 +3503,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[2]);
     }
-    
+
     if ( file_exists(testfiles[2]) ) {
 
         verify_journal_contents(journal_filename, testfiles[2], human_readable);
@@ -3541,7 +3541,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[3]);
     }
-    
+
     if ( file_exists(testfiles[3]) ) {
 
         verify_journal_contents(journal_filename, testfiles[3], human_readable);
@@ -3589,7 +3589,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[4]);
     }
-    
+
     if ( file_exists(testfiles[4]) ) {
 
         verify_journal_contents(journal_filename, testfiles[4], human_readable);
@@ -3604,7 +3604,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
 
     /* e-2) ... then use the H5C2_mark_pinned_or_protected_entry_dirty()
-     *      call to mark a variety of protected, pinned, and pinned and 
+     *      call to mark a variety of protected, pinned, and pinned and
      *      protected entries dirty.  Also rename some pinned entries.
      */
 
@@ -3642,7 +3642,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[5]);
     }
-    
+
     if ( file_exists(testfiles[5]) ) {
 
         verify_journal_contents(journal_filename, testfiles[5], human_readable);
@@ -3681,7 +3681,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[6]);
     }
-    
+
     if ( file_exists(testfiles[6]) ) {
 
         verify_journal_contents(journal_filename, testfiles[6], human_readable);
@@ -3697,7 +3697,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
 
     /* f-1) Pin a bunch more entries -- make them variable size, as we need
-     *      to test resizing.  In passing, pin some of the entries using 
+     *      to test resizing.  In passing, pin some of the entries using
      *      the H5C2_pin_ptrotected_entry() call.
      */
 
@@ -3732,7 +3732,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[7]);
     }
-    
+
     if ( file_exists(testfiles[7]) ) {
 
         verify_journal_contents(journal_filename, testfiles[7], human_readable);
@@ -3747,8 +3747,8 @@ mdj_smoke_check_00(hbool_t human_readable)
 
 
 
-    /* f-2) Now resize a selection of pinned and unpinned entries via 
-     *      protect/unprotect pairs, H5C2_resize_pinned_entry() and 
+    /* f-2) Now resize a selection of pinned and unpinned entries via
+     *      protect/unprotect pairs, H5C2_resize_pinned_entry() and
      *      H5C2_mark_pinned_entry_dirty().
      */
 
@@ -3775,10 +3775,10 @@ mdj_smoke_check_00(hbool_t human_readable)
 		                      H5C2__SIZE_CHANGED_FLAG|H5C2__DIRTIED_FLAG,
 				      ((VARIABLE_ENTRY_SIZE / 16) * 12));
 
-    resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 4, 
+    resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 4,
 		         ((VARIABLE_ENTRY_SIZE / 16) * 11));
 
-    resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 5, 
+    resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 5,
 		         ((VARIABLE_ENTRY_SIZE / 16) * 10));
 
     mark_pinned_entry_dirty2(file_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE,
@@ -3795,7 +3795,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[8]);
     }
-    
+
     if ( file_exists(testfiles[8]) ) {
 
         verify_journal_contents(journal_filename, testfiles[8], human_readable);
@@ -3808,7 +3808,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    
+
 
     /* f-3) Now put all the sizes back, and also rename all the entries. */
 
@@ -3818,7 +3818,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 0, FALSE);
     protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 0);
     unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 0,
-		                    H5C2__SIZE_CHANGED_FLAG, 
+		                    H5C2__SIZE_CHANGED_FLAG,
 				    VARIABLE_ENTRY_SIZE);
 
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 1, FALSE);
@@ -3846,7 +3846,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     resize_pinned_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 5, VARIABLE_ENTRY_SIZE);
 
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 6, FALSE);
-    mark_pinned_entry_dirty2(file_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE, 
+    mark_pinned_entry_dirty2(file_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE,
 		             VARIABLE_ENTRY_SIZE);
 
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 7, FALSE);
@@ -3861,7 +3861,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[9]);
     }
-    
+
     if ( file_exists(testfiles[9]) ) {
 
         verify_journal_contents(journal_filename, testfiles[9], human_readable);
@@ -3873,9 +3873,9 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
-    
-    
-    
+
+
+
     /* f-4) Finally, rename all the entries back to their original locations,
      *      and unpin all the pinned entries.
      */
@@ -3896,7 +3896,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 2, TRUE);
     protect_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 2);
     unprotect_entry_with_size_change2(file_ptr, VARIABLE_ENTRY_TYPE, 2,
-		                    H5C2__SIZE_CHANGED_FLAG|H5C2__UNPIN_ENTRY_FLAG, 
+		                    H5C2__SIZE_CHANGED_FLAG|H5C2__UNPIN_ENTRY_FLAG,
 				    VARIABLE_ENTRY_SIZE);
 
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 3, TRUE);
@@ -3914,7 +3914,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     unpin_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 5);
 
     rename_entry2(cache_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE);
-    mark_pinned_entry_dirty2(file_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE, 
+    mark_pinned_entry_dirty2(file_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE,
 		             VARIABLE_ENTRY_SIZE);
     unpin_entry2(file_ptr, VARIABLE_ENTRY_TYPE, 6);
 
@@ -3931,7 +3931,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[10]);
     }
-    
+
     if ( file_exists(testfiles[10]) ) {
 
         verify_journal_contents(journal_filename, testfiles[10], human_readable);
@@ -3950,9 +3950,9 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
-    
-    
-    
+
+
+
     /* g) verify that the journaling code handles a cascade of changes
      *    caused when the serialization of an entry causes dirties, resizes,
      *    and/or resizes of other entries.
@@ -3986,7 +3986,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[11]);
     }
-    
+
     if ( file_exists(testfiles[11]) ) {
 
         verify_journal_contents(journal_filename, testfiles[11], human_readable);
@@ -4025,7 +4025,7 @@ mdj_smoke_check_00(hbool_t human_readable)
      *
      */
 
-    add_flush_op2(MICRO_ENTRY_TYPE, 20, 
+    add_flush_op2(MICRO_ENTRY_TYPE, 20,
 		  FLUSH_OP__DIRTY, MICRO_ENTRY_TYPE, 30, FALSE, 0);
 
 
@@ -4070,7 +4070,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
 
     /* g-3) Start with a simple check -- dirty (MICRO_ENTRY_TYPE, 20),
-     *      which should also dirty (MICRO_ENTRY_TYPE, 30) when 
+     *      which should also dirty (MICRO_ENTRY_TYPE, 30) when
      *      (MICRO_ENTRY_TYPE, 20) is serialized at transaction close.
      */
 
@@ -4087,7 +4087,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[12]);
     }
-    
+
     if ( file_exists(testfiles[12]) ) {
 
         verify_journal_contents(journal_filename, testfiles[12], human_readable);
@@ -4098,8 +4098,8 @@ mdj_smoke_check_00(hbool_t human_readable)
     }
 
 
-    /* g-4) Now dirty (MICRO_ENTRY_TYPE, 24), which dirties 
-     *      (MICRO_ENTRY_TYPE, 21), which dirties, resizes, and 
+    /* g-4) Now dirty (MICRO_ENTRY_TYPE, 24), which dirties
+     *      (MICRO_ENTRY_TYPE, 21), which dirties, resizes, and
      *      renames (VARIABLE_ENTRY_TYPE, 10) and (VARIABLE_ENTRY_TYPE, 13)
      */
 
@@ -4116,7 +4116,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[13]);
     }
-    
+
     if ( file_exists(testfiles[13]) ) {
 
         verify_journal_contents(journal_filename, testfiles[13], human_readable);
@@ -4127,9 +4127,9 @@ mdj_smoke_check_00(hbool_t human_readable)
     }
 
 
-    /* g-4) Now dirty (MICRO_ENTRY_TYPE, 25), which dirties 
-     *      (MICRO_ENTRY_TYPE, 22) and (MICRO_ENTRY_TYPE, 23), which 
-     *      in turn resize (VARIABLE_ENTRY_TYPE, 11) and 
+    /* g-4) Now dirty (MICRO_ENTRY_TYPE, 25), which dirties
+     *      (MICRO_ENTRY_TYPE, 22) and (MICRO_ENTRY_TYPE, 23), which
+     *      in turn resize (VARIABLE_ENTRY_TYPE, 11) and
      *      (VARIABLE_ENTRY_TYPE, 12), and rename (VARIABLE_ENTRY_TYPE, 10)
      *      and (VARIABLE_ENTRY_TYPE, 13) back to their original locations.
      */
@@ -4147,7 +4147,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[14]);
     }
-    
+
     if ( file_exists(testfiles[14]) ) {
 
         verify_journal_contents(journal_filename, testfiles[14], human_readable);
@@ -4163,7 +4163,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
-    
+
 
 
     /* h) Dirty an entry, and then expunge it.  Entry should not appear
@@ -4171,7 +4171,7 @@ mdj_smoke_check_00(hbool_t human_readable)
      *    entry in the transaction, and a second time with other entries
      *    involved.
      *
-     *    Note that no journal file will be written until the first 
+     *    Note that no journal file will be written until the first
      *    entry, so start with a transaction that generates some data.
      */
 
@@ -4201,7 +4201,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[15]);
     }
-    
+
     if ( file_exists(testfiles[15]) ) {
 
         verify_journal_contents(journal_filename, testfiles[15], human_readable);
@@ -4213,7 +4213,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
-    
+
 
 
     begin_trans(cache_ptr, verbose, (uint64_t)3, "transaction 3.4");
@@ -4232,7 +4232,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[16]);
     }
-    
+
     if ( file_exists(testfiles[16]) ) {
 
         verify_journal_contents(journal_filename, testfiles[16], human_readable);
@@ -4291,7 +4291,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     begin_trans(cache_ptr, verbose, (uint64_t)1, "transaction 1.5");
 
-    insert_entry2(file_ptr, 0, 1, FALSE, H5C2__NO_FLAGS_SET); 
+    insert_entry2(file_ptr, 0, 1, FALSE, H5C2__NO_FLAGS_SET);
     protect_entry2(file_ptr, 0, 0);
     unprotect_entry2(file_ptr, 0, 0, TRUE, H5C2__NO_FLAGS_SET);
 
@@ -4303,7 +4303,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[17]);
     }
-    
+
     if ( file_exists(testfiles[17]) ) {
 
         verify_journal_contents(journal_filename, testfiles[17], human_readable);
@@ -4356,23 +4356,23 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     /* re-open the file without journaling enabled */
 
-    open_existing_file_without_journaling(filename, &file_id, 
+    open_existing_file_without_journaling(filename, &file_id,
                                           &file_ptr, &cache_ptr);
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
 
-    /* do a transaction to verify that journaling is disabled.  
+    /* do a transaction to verify that journaling is disabled.
      *
-     * Note that we will only get a transaction number of zero if 
+     * Note that we will only get a transaction number of zero if
      * journaling is disabled -- thus the following begin/end trans
      * calls should fail if journaling is enabled.
      */
 
     begin_trans(cache_ptr, verbose, (uint64_t)0, "transaction 1.6");
 
-    insert_entry2(file_ptr, 0, 10, FALSE, H5C2__NO_FLAGS_SET); 
+    insert_entry2(file_ptr, 0, 10, FALSE, H5C2__NO_FLAGS_SET);
     protect_entry2(file_ptr, 0, 0);
     unprotect_entry2(file_ptr, 0, 0, TRUE, H5C2__NO_FLAGS_SET);
 
@@ -4400,7 +4400,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
- 
+
     /************************************************************/
     /* 6) Enable journaling on the open file.  Do a transaction */
     /*    or two to verify that journaling is working.          */
@@ -4452,7 +4452,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
     begin_trans(cache_ptr, verbose, (uint64_t)1, "transaction 1.7");
 
-    insert_entry2(file_ptr, 0, 20, FALSE, H5C2__NO_FLAGS_SET); 
+    insert_entry2(file_ptr, 0, 20, FALSE, H5C2__NO_FLAGS_SET);
     protect_entry2(file_ptr, 0, 0);
     unprotect_entry2(file_ptr, 0, 0, TRUE, H5C2__NO_FLAGS_SET);
 
@@ -4464,7 +4464,7 @@ mdj_smoke_check_00(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[18]);
     }
-    
+
     if ( file_exists(testfiles[18]) ) {
 
         verify_journal_contents(journal_filename, testfiles[18], human_readable);
@@ -4479,7 +4479,7 @@ mdj_smoke_check_00(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
- 
+
     /************************************************************/
     /* 7) Disable journaling on the open file.  Verify that the */
     /*    journal file has been deleted.                        */
@@ -4507,11 +4507,11 @@ mdj_smoke_check_00(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
- 
+
     /*********************************/
     /* 8) Close and delete the file. */
     /*********************************/
- 
+
     if ( pass2 ) {
 
         if ( H5Fclose(file_id) < 0 ) {
@@ -4527,18 +4527,18 @@ mdj_smoke_check_00(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( pass2 ) { 
-	    
-        PASSED(); 
+    if ( pass2 ) {
+
+        PASSED();
 
 	if ( testfile_missing ) {
 
-	    puts("	WARNING: One or more missing test files."); 
+	    puts("	WARNING: One or more missing test files.");
 	    fflush(stdout);
         }
-    } else { 
-	    
-        H5_FAILED(); 
+    } else {
+
+        H5_FAILED();
     }
 
     if ( ! pass2 ) {
@@ -4567,7 +4567,7 @@ mdj_smoke_check_00(hbool_t human_readable)
  * Programmer:  John Mainzer
  *              5/19/08
  *
- * Changes:	Modified function to run using either a human readable 
+ * Changes:	Modified function to run using either a human readable
  *		or binary journal file.
  *							JRM -- 5/13/09
  *
@@ -4578,7 +4578,7 @@ static void
 mdj_smoke_check_01(hbool_t human_readable)
 {
     const char * fcn_name = "mdj_smoke_check_01()";
-    const char * human_readable_testfiles[] = 
+    const char * human_readable_testfiles[] =
     {
         "testfiles/cache2_journal_sc01_000.jnl",
         "testfiles/cache2_journal_sc01_001.jnl",
@@ -4587,7 +4587,7 @@ mdj_smoke_check_01(hbool_t human_readable)
         "testfiles/cache2_journal_sc01_004.jnl",
 	NULL
     };
-    const char * binary_testfiles[] = 
+    const char * binary_testfiles[] =
     {
         "testfiles/cache2_journal_bsc01_000.jnl",
         "testfiles/cache2_journal_bsc01_001.jnl",
@@ -4647,23 +4647,23 @@ mdj_smoke_check_01(hbool_t human_readable)
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s: filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s: filename = \"%s\".\n", fcn_name, filename);
     }
 
     /* setup the journal file name */
     if ( pass2 ) {
 
-        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename, 
+        if ( h5_fixname(FILENAMES[3], H5P_DEFAULT, journal_filename,
                         sizeof(journal_filename)) == NULL ) {
 
             pass2 = FALSE;
             failure_mssg2 = "h5_fixname() failed (2).\n";
         }
-	else if ( HDstrlen(journal_filename) >= 
+	else if ( HDstrlen(journal_filename) >=
 			H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             pass2 = FALSE;
@@ -4674,22 +4674,22 @@ mdj_smoke_check_01(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s: journal filename = \"%s\".\n", 
-		  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s: journal filename = \"%s\".\n",
+		  fcn_name, journal_filename);
     }
 
     /* clean out any existing journal file */
     HDremove(journal_filename);
 
-    /* Unfortunately, we get different journal output depending on the 
+    /* Unfortunately, we get different journal output depending on the
      * file driver, as at present we are including the end of address
-     * space in journal entries, and the end of address space seems to 
-     * be in part a function of the file driver.  
+     * space in journal entries, and the end of address space seems to
+     * be in part a function of the file driver.
      *
-     * Thus, if we want to use the core file driver when available, we 
-     * will either have to remove the end of address space from the 
-     * journal entries, get the different file drivers to agree on 
+     * Thus, if we want to use the core file driver when available, we
+     * will either have to remove the end of address space from the
+     * journal entries, get the different file drivers to agree on
      * end of address space, or maintain different sets of architype
      * files for the different file drivers.
      */
@@ -4698,7 +4698,7 @@ mdj_smoke_check_01(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
- 
+
 
     /******************************************/
     /* Run a small, fairly simple stress test */
@@ -4732,7 +4732,7 @@ mdj_smoke_check_01(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[0]);
     }
-    
+
     if ( file_exists(testfiles[0]) ) {
 
         verify_journal_contents(journal_filename, testfiles[0], human_readable);
@@ -4777,7 +4777,7 @@ mdj_smoke_check_01(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[1]);
     }
-    
+
     if ( file_exists(testfiles[1]) ) {
 
         verify_journal_contents(journal_filename, testfiles[1], human_readable);
@@ -4822,7 +4822,7 @@ mdj_smoke_check_01(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[2]);
     }
-    
+
     if ( file_exists(testfiles[2]) ) {
 
         verify_journal_contents(journal_filename, testfiles[2], human_readable);
@@ -4862,7 +4862,7 @@ mdj_smoke_check_01(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[3]);
     }
-    
+
     if ( file_exists(testfiles[3]) ) {
 
         verify_journal_contents(journal_filename, testfiles[3], human_readable);
@@ -4902,7 +4902,7 @@ mdj_smoke_check_01(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[4]);
     }
-    
+
     if ( file_exists(testfiles[4]) ) {
 
         verify_journal_contents(journal_filename, testfiles[4], human_readable);
@@ -4930,18 +4930,18 @@ mdj_smoke_check_01(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( pass2 ) { 
-	    
-        PASSED(); 
+    if ( pass2 ) {
+
+        PASSED();
 
 	if ( testfile_missing ) {
 
-	    puts("	WARNING: One or more missing test files."); 
+	    puts("	WARNING: One or more missing test files.");
 	    fflush(stdout);
         }
-    } else { 
-	    
-        H5_FAILED(); 
+    } else {
+
+        H5_FAILED();
     }
 
     if ( ! pass2 ) {
@@ -4970,7 +4970,7 @@ mdj_smoke_check_01(hbool_t human_readable)
  * Programmer:  John Mainzer
  *              5/19/08
  *
- * Changes:	Modified function to run using either a human readable 
+ * Changes:	Modified function to run using either a human readable
  *		or binary journal file.
  *							JRM -- 5/13/09
  *
@@ -4981,7 +4981,7 @@ static void
 mdj_smoke_check_02(hbool_t human_readable)
 {
     const char * fcn_name = "mdj_smoke_check_02()";
-    const char * human_readable_testfiles[] = 
+    const char * human_readable_testfiles[] =
     {
         "testfiles/cache2_journal_sc02_000.jnl",
         "testfiles/cache2_journal_sc02_001.jnl",
@@ -4990,7 +4990,7 @@ mdj_smoke_check_02(hbool_t human_readable)
         "testfiles/cache2_journal_sc02_004.jnl",
 	NULL
     };
-    const char * binary_testfiles[] = 
+    const char * binary_testfiles[] =
     {
         "testfiles/cache2_journal_bsc02_000.jnl",
         "testfiles/cache2_journal_bsc02_001.jnl",
@@ -5049,11 +5049,11 @@ mdj_smoke_check_02(hbool_t human_readable)
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s: filename = \"%s\".\n", fcn_name, filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s: filename = \"%s\".\n", fcn_name, filename);
     }
 
     /* setup the journal file name */
@@ -5074,22 +5074,22 @@ mdj_smoke_check_02(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( verbose ) { 
-        HDfprintf(stdout, "%s: journal filename = \"%s\".\n", 
-		  fcn_name, journal_filename); 
+    if ( verbose ) {
+        HDfprintf(stdout, "%s: journal filename = \"%s\".\n",
+		  fcn_name, journal_filename);
     }
 
     /* clean out any existing journal file */
     HDremove(journal_filename);
 
-    /* Unfortunately, we get different journal output depending on the 
+    /* Unfortunately, we get different journal output depending on the
      * file driver, as at present we are including the end of address
-     * space in journal entries, and the end of address space seems to 
-     * be in part a function of the file driver.  
+     * space in journal entries, and the end of address space seems to
+     * be in part a function of the file driver.
      *
-     * Thus, if we want to use the core file driver when available, we 
-     * will either have to remove the end of address space from the 
-     * journal entries, get the different file drivers to agree on 
+     * Thus, if we want to use the core file driver when available, we
+     * will either have to remove the end of address space from the
+     * journal entries, get the different file drivers to agree on
      * end of address space, or maintain different sets of architype
      * files for the different file drivers.
      */
@@ -5098,7 +5098,7 @@ mdj_smoke_check_02(hbool_t human_readable)
 
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
- 
+
 
     /******************************************/
     /* Run a small, fairly simple stress test */
@@ -5132,7 +5132,7 @@ mdj_smoke_check_02(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[0]);
     }
-    
+
     if ( file_exists(testfiles[0]) ) {
 
         verify_journal_contents(journal_filename, testfiles[0], human_readable);
@@ -5177,7 +5177,7 @@ mdj_smoke_check_02(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[1]);
     }
-    
+
     if ( file_exists(testfiles[1]) ) {
 
         verify_journal_contents(journal_filename, testfiles[1], human_readable);
@@ -5222,7 +5222,7 @@ mdj_smoke_check_02(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[2]);
     }
-    
+
     if ( file_exists(testfiles[2]) ) {
 
         verify_journal_contents(journal_filename, testfiles[2], human_readable);
@@ -5262,7 +5262,7 @@ mdj_smoke_check_02(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[3]);
     }
-    
+
     if ( file_exists(testfiles[3]) ) {
 
         verify_journal_contents(journal_filename, testfiles[3], human_readable);
@@ -5302,7 +5302,7 @@ mdj_smoke_check_02(hbool_t human_readable)
 
         copy_file(journal_filename, testfiles[4]);
     }
-    
+
     if ( file_exists(testfiles[4]) ) {
 
         verify_journal_contents(journal_filename, testfiles[4], human_readable);
@@ -5330,18 +5330,18 @@ mdj_smoke_check_02(hbool_t human_readable)
     if ( show_progress )
         HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass2, cp++);
 
-    if ( pass2 ) { 
-	    
-        PASSED(); 
+    if ( pass2 ) {
+
+        PASSED();
 
 	if ( testfile_missing ) {
 
-	    puts("	WARNING: One or more missing test files."); 
+	    puts("	WARNING: One or more missing test files.");
 	    fflush(stdout);
         }
-    } else { 
-	    
-        H5_FAILED(); 
+    } else {
+
+        H5_FAILED();
     }
 
     if ( ! pass2 ) {
@@ -5359,11 +5359,11 @@ mdj_smoke_check_02(hbool_t human_readable)
 /*-------------------------------------------------------------------------
  * Function:	mdj_api_example_test
  *
- * Purpose:	Verify that the example code for using the metadata 
+ * Purpose:	Verify that the example code for using the metadata
  * 		journaling works as expected
  *
- * 		This example demonstrates enabling journaling at file 
- * 		creation time, and enabling journaling on an open file.  It 
+ * 		This example demonstrates enabling journaling at file
+ * 		creation time, and enabling journaling on an open file.  It
  * 		also demonstrates disabling journaling both manualy during a
  * 		computation and automatically at file close.  Finally,
  * 		it demonstrates the use of H5Fflush() to keep the journal
@@ -5372,77 +5372,77 @@ mdj_smoke_check_02(hbool_t human_readable)
  * 		We begin by creating an hdf5 file with journaling enabled.
  *
  * 		The inital calls to TESTING(), SKIPPED(), h5_fixname(),
- * 		HDremove(), the initialization of pass2, and the like are all 
+ * 		HDremove(), the initialization of pass2, and the like are all
  * 		part of the HDF5 test framework, and may be largely ignored.
  * 		In your application, the only point here is that you will
- * 		have to set up the paths to your data file and journal 
+ * 		have to set up the paths to your data file and journal
  * 		file.  Further, the journal file must not exist before
  *              the hdf5 file is opened, as hdf5 will refuse to overwrite
  *              a journal file.
  *
- *              With these preliminaries dealt with, we allocate a 
- *              file access property list (FAPL).  Journaling uses some 
+ *              With these preliminaries dealt with, we allocate a
+ *              file access property list (FAPL).  Journaling uses some
  *              recent extensions to the superblock, so the first step
- *              is to set the library version to latest via a call to 
+ *              is to set the library version to latest via a call to
  *              H5Pset_libver_bounds().
  *
- *              Next, we must set up the journaling property.  We could 
- *              do this in several ways, but in this example we will do 
- *              this by using H5Pget_jnl_config() to get the default 
- *              journaling configuration, modifing it, and then using 
- *		H5Pset_jnl_config() to replace the default with our 
- *		configuration.  See the comments in the code for the 
+ *              Next, we must set up the journaling property.  We could
+ *              do this in several ways, but in this example we will do
+ *              this by using H5Pget_jnl_config() to get the default
+ *              journaling configuration, modifing it, and then using
+ *		H5Pset_jnl_config() to replace the default with our
+ *		configuration.  See the comments in the code for the
  *		particulars -- note that we must set the version field of
  *		the H5AC2_jnl_config_t before we call H5Pget_jnl_config().
  *
  *		After setting up the FAPL, we create the file as usual.
  *		Journaling will be enabled with configuration as specified.
  *
- *		With file created and journaling running we then go off 
+ *		With file created and journaling running we then go off
  *		and do what we want -- in this example we set up a selection
- *		of chunked data sets.  Note that these data sets (and our 
+ *		of chunked data sets.  Note that these data sets (and our
  *		access pattern) are chosen to maximize the amount of dirty
- *		metadata generated.  In your application, you will want to 
+ *		metadata generated.  In your application, you will want to
  *		do just the opposite if possible.
  *
  *		After the data sets are created, we then shut down journaling
- *		and then re-enable it via the H5Fget_jnl_config() and 
- *		H5Fset_jnl_config() calls.  Note that when we re-enable 
+ *		and then re-enable it via the H5Fget_jnl_config() and
+ *		H5Fset_jnl_config() calls.  Note that when we re-enable
  *		journaling via the H5Fset_jnl_config() call, we don't need
- *		to set all the fields in the H5AC2_jnl_config_t, since we 
- *		are re-using the configuration we obtained via the 
+ *		to set all the fields in the H5AC2_jnl_config_t, since we
+ *		are re-using the configuration we obtained via the
  *		H5Fget_jnl_config() call.  If we had opened the file without
- *		journaling, and then wanted to enable journaling, we would 
- *		have had to set up the fields of the H5AC2_jnl_config_t in 
- *		much the same way we did earlier in the example.  We would 
- *		also have had to create the file initially with the latest 
+ *		journaling, and then wanted to enable journaling, we would
+ *		have had to set up the fields of the H5AC2_jnl_config_t in
+ *		much the same way we did earlier in the example.  We would
+ *		also have had to create the file initially with the latest
  *		format (using H5Pset_libver_bounds()).
  *
- *		Having re-enabled journaling, we then proceed to write to 
+ *		Having re-enabled journaling, we then proceed to write to
  *		our data sets.  Again, please not that our write strategy
  *		(round robin and small chunks) is designed to maximize
  *		dirty metadata generation and load on the metadata cache.
  *		In your application, you should try to do just the opposite
- *		if possible.  
+ *		if possible.
  *
  *		However, since we are maximizing dirty metadata generation,
  *		the journal file will grow quickly.  This can be a problem,
  *		so from time to time we force truncation of the journal file
  *		via a call to H5Fflush().  This call flushes the hdf5 file,
  *		and then truncates the journal file, as the contents of the
- *		journal becomes irrelvant after the metadata journal is 
+ *		journal becomes irrelvant after the metadata journal is
  *		flushed.
  *
- * 		After writing data to our data sets, we then to a number of 
- * 		reads.  We could turn off journaling here, as we are not 
- * 		modifying the file.  But since we are not generating any 
+ * 		After writing data to our data sets, we then to a number of
+ * 		reads.  We could turn off journaling here, as we are not
+ * 		modifying the file.  But since we are not generating any
  * 		dirty metadata, we aren't generating any journal entries
  * 		either -- so it really doesn't matter.
  *
  * 		Finally, we close the hdf5 file.  Since journaling is enabled,
- * 		the call to H5Fclose() will flush the journal, flush the 
- * 		metadata cache, truncate the journal, mark the file as not 
- * 		having journaling in progress, and then delete the journal 
+ * 		the call to H5Fclose() will flush the journal, flush the
+ * 		metadata cache, truncate the journal, mark the file as not
+ * 		having journaling in progress, and then delete the journal
  * 		file as part of the close.
  *
  * Return:	void
@@ -5452,8 +5452,8 @@ mdj_smoke_check_02(hbool_t human_readable)
  *
  * Modifications:
  *
- * 		Modified the function to used either the human readable 
- *		or the binary journal file format as directed via the 
+ * 		Modified the function to used either the human readable
+ *		or the binary journal file format as directed via the
  *		new human_readable parameter.
  *						JRM -- 5/13/09
  *
@@ -5559,7 +5559,7 @@ mdj_api_example_test(hbool_t human_readable)
     }
 
 
-    /* clean out any existing journal file -- must do this as 
+    /* clean out any existing journal file -- must do this as
      * HDF5 will refuse to overwrite an existing journal file.
      */
     if ( ( pass2 ) && ( report_progress ) ) {
@@ -5608,7 +5608,7 @@ mdj_api_example_test(hbool_t human_readable)
     }
 
 
-    /* Get the current FAPL journaling configuration.  This should be 
+    /* Get the current FAPL journaling configuration.  This should be
      * the default, and we could just write a predifined journal configuration
      * structure to the FAPL directly, but doing it this way shows off the
      * H5Pget_jnl_config() call, and is less suceptible to API definition
@@ -5634,7 +5634,7 @@ mdj_api_example_test(hbool_t human_readable)
     }
 
 
-    /* Modify the current FAPL journaling configuration to enable 
+    /* Modify the current FAPL journaling configuration to enable
      * journaling as desired, and then write the revised configuration
      * back to the FAPL.
      */
@@ -5652,39 +5652,39 @@ mdj_api_example_test(hbool_t human_readable)
         HDstrcpy(jnl_config_0.journal_file_path, journal_filename);
 
         /* jnl_config_0.journal_recovered should always be FALSE unless
-         * you are writing a new journal recovery tool, and need to 
-         * tell the library that you have recovered the journal and 
-         * that the file is now readable.  As this field is set to 
+         * you are writing a new journal recovery tool, and need to
+         * tell the library that you have recovered the journal and
+         * that the file is now readable.  As this field is set to
          * FALSE by default, we don't touch it here.
          */
 
-        /* the journal buffer size should  be some multiple of the block 
-         * size of the underlying file system.  
+        /* the journal buffer size should  be some multiple of the block
+         * size of the underlying file system.
          */
         jnl_config_0.jbrb_buf_size = (16 * 1024);
 
-        /* the number of journal buffers should be either 1 or 2 when 
+        /* the number of journal buffers should be either 1 or 2 when
          * synchronous I/O is used for journal writes.  If AIO is used,
-         * the number should be large enough that the write of a buffer 
+         * the number should be large enough that the write of a buffer
          * will usually be complete by the time that buffer is needed
          * again.
          */
         jnl_config_0.jbrb_num_bufs = 2;
 
-        /* At present we don't support AIO for journal writes, so this 
+        /* At present we don't support AIO for journal writes, so this
          * field will be FALSE.
          */
         jnl_config_0.jbrb_use_aio = FALSE;
 
         /* set human readable as specified in the human_readable parameter
-         * to this function.  If human_readable is FALSE, we will use 
+         * to this function.  If human_readable is FALSE, we will use
          * the binary journal file format which should reduce the size
-         * of the journal file by about two thirds, and also reduce the 
+         * of the journal file by about two thirds, and also reduce the
          * overhead involved in formating journal entries for writing
          * to the journal file.
          */
 	jnl_config_0.jbrb_human_readable = human_readable;
-        
+
         status = H5Pset_jnl_config(fapl_id, &jnl_config_0);
 
         if ( status < 0 ) {
@@ -5772,7 +5772,7 @@ mdj_api_example_test(hbool_t human_readable)
 
                 sprintf(dset_name, "/dset%03d", i);
                 dataset_ids[i] = H5Dcreate2(file_id, dset_name, H5T_STD_I32BE,
-				            dataspace_id, H5P_DEFAULT, 
+				            dataspace_id, H5P_DEFAULT,
 					    properties, H5P_DEFAULT);
 
                 if ( dataset_ids[i] < 0 ) {
@@ -5799,10 +5799,10 @@ mdj_api_example_test(hbool_t human_readable)
     }
 
 
-    /* just for purposes of demonstration, turn off journaling, and 
-     * then turn it back on again.  Note that this will force a 
-     * flush of the file, and all metadata with it.  Turning off 
-     * journaling will also cause us to close and discard the 
+    /* just for purposes of demonstration, turn off journaling, and
+     * then turn it back on again.  Note that this will force a
+     * flush of the file, and all metadata with it.  Turning off
+     * journaling will also cause us to close and discard the
      * journal file after all metadata is on disk.
      */
     if ( ( pass2 ) && ( report_progress ) ) {
@@ -5840,10 +5840,10 @@ mdj_api_example_test(hbool_t human_readable)
 
 
     /* Note that here we simply set jnl_config_1.enable_journaling to
-     * TRUE, and pass it back to the HDF5 library via the 
-     * H5Fset_jnl_config() call.  
+     * TRUE, and pass it back to the HDF5 library via the
+     * H5Fset_jnl_config() call.
      *
-     * We can do this because jnl_config_1 reflected the current 
+     * We can do this because jnl_config_1 reflected the current
      * journaling configuration when we got it from the library
      * via the H5Fget_jnl_config() call, and H5Fset_mdc_config()
      * doesn't change the values of any fields.
@@ -5975,15 +5975,15 @@ mdj_api_example_test(hbool_t human_readable)
 	    }
 	}
 
-	/* We are generating a lot of dirty metadata here, all of which 
+	/* We are generating a lot of dirty metadata here, all of which
 	 * will wind up in the journal file.  To keep the journal file
-	 * from getting too big (and to make sure the raw data is on 
+	 * from getting too big (and to make sure the raw data is on
 	 * disk, we should do an occasional flush of the HDF5 file.
 	 *
 	 * This will force all metadata to disk, and cause the journal
 	 * file to be truncated.
 	 *
-	 * On the other hand, it will impose a significant file I/O 
+	 * On the other hand, it will impose a significant file I/O
 	 * overhead, and slow us down. (try it both ways).
 	 */
 #if 1
@@ -6323,7 +6323,7 @@ mdj_api_example_test(hbool_t human_readable)
 /*-------------------------------------------------------------------------
  * Function:    check_superblock_extensions()
  *
- * Purpose:     Verify that the super block extensions for tracking 
+ * Purpose:     Verify that the super block extensions for tracking
  *              journaling status operate as they should.
  *
  *              Note that this test code will have to be re-worked
@@ -6348,7 +6348,7 @@ check_superblock_extensions(void)
     char filename[512];
     hbool_t show_progress = FALSE;
     hbool_t verbose = FALSE;
-    int cp = 0; 
+    int cp = 0;
     hid_t fapl_id = -1;
     hid_t file_id = -1;
     hid_t dataset_id = -1;
@@ -6361,7 +6361,7 @@ check_superblock_extensions(void)
 
     pass2 = TRUE;
 
-    /* Verify that the journaling superblock extension performs as 
+    /* Verify that the journaling superblock extension performs as
      * expected.  Note that this test will have to be re-written
      * (or possibly subsumed in another test) once the full journaling
      * code is up and running.
@@ -6372,7 +6372,7 @@ check_superblock_extensions(void)
      *     listed as being off.
      *
      *  2) create a dataset in the file, and then close the file
-     * 
+     *
      *  3) Open the file again, and verifiy that journaling is still
      *     listed as being off.
      *
@@ -6380,7 +6380,7 @@ check_superblock_extensions(void)
      *     being journaled, and close the file again.
      *
      *  5) Open the file a third time, and verify that the superblock
-     *     extension indicates that the file is being journaled.  
+     *     extension indicates that the file is being journaled.
      *
      *  6) Reset the journaling information to indicate that the file
      *     is not being journaled, and close the file again.
@@ -6389,16 +6389,16 @@ check_superblock_extensions(void)
      *     extension indicates that the file is not being journaled.
      *
      *  8) Write data to the superblock, marking the file as being
-     *     journaled.  Now write different data to the superbloc, that 
-     *     still marks the file as being journaled.  Close the file. 
+     *     journaled.  Now write different data to the superbloc, that
+     *     still marks the file as being journaled.  Close the file.
      *
-     *  9) Re-open the file, and verify that the second write in 8 
+     *  9) Re-open the file, and verify that the second write in 8
      *     above took.
      *
      * 10) Write data to the superblock indicating that journaling is
      *     not in progress.  Close the file.
      *
-     * 11) Reopen the file, and verify that journaling is not in 
+     * 11) Reopen the file, and verify that journaling is not in
      *     progress.
      *
      * 12) Close the file and delete it.
@@ -6441,7 +6441,7 @@ check_superblock_extensions(void)
     /* call H5Pset_libver_bounds() on the fapl_id */
     if ( pass2 ) {
 
-	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST, 
+	if ( H5Pset_libver_bounds(fapl_id, H5F_LIBVER_LATEST,
                                   H5F_LIBVER_LATEST) < 0 ) {
 
             pass2 = FALSE;
@@ -6465,7 +6465,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * verify that journaling is disabled.
      */
     if ( pass2 ) {
@@ -6478,7 +6478,7 @@ check_superblock_extensions(void)
             failure_mssg2 = "Can't get file_ptr (1).\n";
 
         } else if ( file_ptr->shared->mdc_jnl_enabled ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "Journaling enabled on file creation.\n";
 	}
@@ -6553,7 +6553,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * verify that journaling is disabled.
      */
     if ( pass2 ) {
@@ -6566,7 +6566,7 @@ check_superblock_extensions(void)
             failure_mssg2 = "Can't get file_ptr (2).\n";
 
         } else if ( file_ptr->shared->mdc_jnl_enabled ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "Journaling enabled on file open (1).\n";
 	}
@@ -6579,7 +6579,7 @@ check_superblock_extensions(void)
     /*    being journaled, and close the file again.                 */
     /*****************************************************************/
 
-    /* At present, we just write the super block regardless if the 
+    /* At present, we just write the super block regardless if the
      * file is opened read/write.  This is ugly, but that is how it
      * is for now.  Thus just go in and modify the journaling fields
      * of the super block to taste.
@@ -6651,7 +6651,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * verify that journaling is enabled.
      */
     if ( pass2 ) {
@@ -6664,26 +6664,26 @@ check_superblock_extensions(void)
             failure_mssg2 = "Can't get file_ptr (3).\n";
 
         } else if ( ! file_ptr->shared->mdc_jnl_enabled ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "Journaling disabled on file open (1).\n";
 
 	} else if ( file_ptr->shared->mdc_jnl_magic != 123 ) {
-	
+
 	    pass2 = FALSE;
 	    HDfprintf(stdout, "%s: mdc_jnl_magic = %d (%d).\n",
 		      fcn_name, (int)(file_ptr->shared->mdc_jnl_magic),
 		      123);
 	    failure_mssg2 = "unexpected mdc_jnl_magic(1).\n";
 
-	} else if ( file_ptr->shared->mdc_jnl_file_name_len != 
+	} else if ( file_ptr->shared->mdc_jnl_file_name_len !=
 		    (size_t)HDstrlen("abc") ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "unexpected mdc_jnl_file_name_len (1).\n";
 
 	} else if ( HDstrcmp(file_ptr->shared->mdc_jnl_file_name, "abc") != 0 ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "unexpected mdc_jnl_file_name (1).\n";
 
@@ -6721,7 +6721,7 @@ check_superblock_extensions(void)
     }
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
-    
+
 
     /******************************************************************/
     /* 7) Open the file a fourth time, and verify that the superblock */
@@ -6742,7 +6742,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * verify that journaling is disabled.
      */
     if ( pass2 ) {
@@ -6755,7 +6755,7 @@ check_superblock_extensions(void)
             failure_mssg2 = "Can't get file_ptr (4).\n";
 
         } else if ( file_ptr->shared->mdc_jnl_enabled ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "Journaling enabled on file open (2).\n";
 	}
@@ -6818,7 +6818,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    
+
     /***************************************************************/
     /*  9) Re-open the file, and verify that the second write in 8 */
     /*     above took.                                             */
@@ -6842,7 +6842,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * verify that journaling is enabled.
      */
     if ( pass2 ) {
@@ -6855,26 +6855,26 @@ check_superblock_extensions(void)
             failure_mssg2 = "Can't get file_ptr (5).\n";
 
         } else if ( ! file_ptr->shared->mdc_jnl_enabled ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "Journaling disabled on file open (2).\n";
 
 	} else if ( file_ptr->shared->mdc_jnl_magic != 789 ) {
-	
+
 	    pass2 = FALSE;
 	    HDfprintf(stdout, "%s: mdc_jnl_magic = %d (%d).\n",
 		      fcn_name, (int)(file_ptr->shared->mdc_jnl_magic),
 		      789);
 	    failure_mssg2 = "unexpected mdc_jnl_magic(2).\n";
 
-	} else if ( file_ptr->shared->mdc_jnl_file_name_len != 
+	} else if ( file_ptr->shared->mdc_jnl_file_name_len !=
 		    (size_t)HDstrlen("z") ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "unexpected mdc_jnl_file_name_len (2).\n";
 
 	} else if ( HDstrcmp(file_ptr->shared->mdc_jnl_file_name, "z") != 0 ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "unexpected mdc_jnl_file_name (2).\n";
 
@@ -6934,7 +6934,7 @@ check_superblock_extensions(void)
 
     if ( show_progress ) HDfprintf(stdout, "%s: cp = %d.\n", fcn_name, cp++);
 
-    /* get a pointer to the files internal data structure and then 
+    /* get a pointer to the files internal data structure and then
      * verify that journaling is disabled.
      */
     if ( pass2 ) {
@@ -6947,7 +6947,7 @@ check_superblock_extensions(void)
             failure_mssg2 = "Can't get file_ptr (6).\n";
 
         } else if ( file_ptr->shared->mdc_jnl_enabled ) {
-	
+
 	    pass2 = FALSE;
 	    failure_mssg2 = "Journaling enabled on file open (3).\n";
 	}
@@ -6959,7 +6959,7 @@ check_superblock_extensions(void)
     /*************************************/
     /* 12) Close the file and delete it. */
     /*************************************/
-    
+
     if ( pass2 ) {
 
 	if ( H5Fclose(file_id) < 0 ) {
@@ -6991,12 +6991,12 @@ check_superblock_extensions(void)
 /***************************************************************************
  * Function: 	check_mdjsc_callbacks()
  *
- * Purpose:  	Verify that the registration and deregistration of 
+ * Purpose:  	Verify that the registration and deregistration of
  *		metadata journaling status change registration/deregistraion
- *		works correctly.  
+ *		works correctly.
  *
- *		Verify that the status change callbacks are called as 
- *		they should be, and that the cache is clean when the 
+ *		Verify that the status change callbacks are called as
+ *		they should be, and that the cache is clean when the
  *		callback is called.
  *
  *              On failure, set pass2 to false, and failure_mssg2 to an
@@ -7006,10 +7006,10 @@ check_superblock_extensions(void)
  *
  * Programmer: 	John Mainzer
  *              7/2/08
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_mdjsc_callbacks(void)
 {
     const char * fcn_name = "check_mdjsc_callbacks():";
@@ -7040,14 +7040,14 @@ check_mdjsc_callbacks(void)
  *
  * Function: 	test_mdjsc_callback()
  *
- * Purpose:  	Test callback function used to test the metadata 
+ * Purpose:  	Test callback function used to test the metadata
  *		journaling status change callback facility.
  *
  * Return:      void
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static H5C2_t * callback_test_cache_ptr        = NULL;
@@ -7058,7 +7058,7 @@ static hbool_t callback_test_null_data_ptr     = FALSE;
 static hbool_t callback_test_cache_is_dirty    = FALSE;
 static int callback_test_null_data_ptr_count   = 0;
 
-static herr_t 
+static herr_t
 test_mdjsc_callback(const H5C2_mdj_config_t * config_ptr,
                     hid_t UNUSED dxpl_id,
                     void * data_ptr)
@@ -7067,7 +7067,7 @@ test_mdjsc_callback(const H5C2_mdj_config_t * config_ptr,
     {
         callback_test_null_config_ptr = TRUE;
     }
-    
+
     if ( ( callback_test_cache_ptr == NULL ) ||
          ( callback_test_cache_ptr->magic != H5C2__H5C2_T_MAGIC ) )
     {
@@ -7078,7 +7078,7 @@ test_mdjsc_callback(const H5C2_mdj_config_t * config_ptr,
         callback_test_cache_is_dirty = TRUE;
     }
     else if ( ( callback_test_cache_ptr != NULL ) &&
-              ( callback_test_cache_ptr->mdj_enabled != 
+              ( callback_test_cache_ptr->mdj_enabled !=
                 config_ptr->enable_journaling ) )
     {
         callback_test_invalid_config = TRUE;
@@ -7103,8 +7103,8 @@ test_mdjsc_callback(const H5C2_mdj_config_t * config_ptr,
  *
  * Function: 	deregister_mdjsc_callback()
  *
- * Purpose:  	Attempt to deregister the metadata journaling status change 
- * 		callback with the supplied index, and verify that the 
+ * Purpose:  	Attempt to deregister the metadata journaling status change
+ * 		callback with the supplied index, and verify that the
  * 		deregistration took place.
  *
  * 		If any error is detected, set pass2 t FALSE, and set the
@@ -7116,7 +7116,7 @@ test_mdjsc_callback(const H5C2_mdj_config_t * config_ptr,
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7126,14 +7126,14 @@ deregister_mdjsc_callback(H5F_t * file_ptr,
 {
     herr_t result;
 
-    if ( pass2 ) 
+    if ( pass2 )
     {
         if ( ( file_ptr == NULL ) ||
 	     ( cache_ptr == NULL ) ||
 	     ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) )
         {
 	    pass2 = FALSE;
-            failure_mssg2 = 
+            failure_mssg2 =
 		"deregister_mdjsc_callback(): bad param(s) on entry.";
 	}
     }
@@ -7142,7 +7142,7 @@ deregister_mdjsc_callback(H5F_t * file_ptr,
     {
 	result = H5AC2_deregister_mdjsc_callback(file_ptr, idx);
 
-	if ( result < 0 ) 
+	if ( result < 0 )
 	{
 	    pass2 = FALSE;
 	    failure_mssg2 = "H5AC2_deregister_mdjsc_callback() failed.";
@@ -7160,7 +7160,7 @@ deregister_mdjsc_callback(H5F_t * file_ptr,
  *
  * Function: 	register_mdjsc_callback()
  *
- * Purpose:  	Attempt to register the supplied metadata journaling 
+ * Purpose:  	Attempt to register the supplied metadata journaling
  * 		status change callback, and verify that the registration
  * 		took.
  *
@@ -7173,7 +7173,7 @@ deregister_mdjsc_callback(H5F_t * file_ptr,
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7186,7 +7186,7 @@ register_mdjsc_callback(H5F_t * file_ptr,
     herr_t result;
     H5C2_mdj_config_t init_config;
 
-    if ( pass2 ) 
+    if ( pass2 )
     {
         if ( ( file_ptr == NULL ) ||
 	     ( cache_ptr == NULL ) ||
@@ -7204,7 +7204,7 @@ register_mdjsc_callback(H5F_t * file_ptr,
 	result = H5AC2_register_mdjsc_callback(file_ptr, fcn_ptr, data_ptr,
 			                       idx_ptr, &init_config);
 
-	if ( result < 0 ) 
+	if ( result < 0 )
 	{
 	    pass2 = FALSE;
 	    failure_mssg2 = "H5AC2_register_mdjsc_callback() failed.";
@@ -7212,13 +7212,13 @@ register_mdjsc_callback(H5F_t * file_ptr,
 	else if ( init_config.enable_journaling != cache_ptr->mdj_enabled )
 	{
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "init_config.enable_journaling != cache_ptr->mdj_enabled";
 	}
 
-	verify_mdjsc_callback_registered(cache_ptr, 
-			                 fcn_ptr, 
-			                 data_ptr, 
+	verify_mdjsc_callback_registered(cache_ptr,
+			                 fcn_ptr,
+			                 data_ptr,
 					 *idx_ptr);
     }
 
@@ -7231,7 +7231,7 @@ register_mdjsc_callback(H5F_t * file_ptr,
  *
  * Function: 	verify_mdjsc_table_config()
  *
- * Purpose:  	Verify that the mdjsc callback table is configured as 
+ * Purpose:  	Verify that the mdjsc callback table is configured as
  *		specified.
  *
  *		If all is as it should be, do nothing.
@@ -7245,7 +7245,7 @@ register_mdjsc_callback(H5F_t * file_ptr,
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7259,20 +7259,20 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
     hbool_t show_progress = FALSE;
     int cp = 0;
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d: %d.\n", fcn_name, pass2, cp++);
 
     if ( pass2 )
     {
         if ( ( cache_ptr == NULL ) ||
-             ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) 
+             ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) )
         {
             pass2 = FALSE;
             failure_mssg2 = "bad cache_ptr.";
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d: %d.\n", fcn_name, pass2, cp++);
 
     if ( pass2 )
@@ -7284,7 +7284,7 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d: %d.\n", fcn_name, pass2, cp++);
 
     if ( pass2 )
@@ -7306,7 +7306,7 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d: %d.\n", fcn_name, pass2, cp++);
 
     if ( ( pass2 ) && ( free_entries ) )
@@ -7325,11 +7325,11 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
                    )
                 {
                     pass2 = FALSE;
-                    failure_mssg2 = 
+                    failure_mssg2 =
                         "mdjsc callback table entry in use that should be free";
                 }
-            } 
-            else 
+            }
+            else
             {
 		/* recall that the data_ptr can be NULL when an entry is
 		 * in use.
@@ -7337,7 +7337,7 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
                 if ( ((cache_ptr->mdjsc_cb_tbl)[i]).fcn_ptr == NULL )
                 {
                     pass2 = FALSE;
-                    failure_mssg2 = 
+                    failure_mssg2 =
                         "mdjsc callback table entry free that shoult be in use";
                 }
             }
@@ -7345,14 +7345,14 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
             i++;
         }
 
-        if ( show_progress ) 
+        if ( show_progress )
             HDfprintf(stdout, "%s:%d: %d.\n", fcn_name, pass2, cp++);
 
         i = 0;
         j = cache_ptr->mdjsc_cb_tbl_fl_head;
 
-        while ( ( pass2 ) && 
-                ( i < (table_len - num_entries) ) && 
+        while ( ( pass2 ) &&
+                ( i < (table_len - num_entries) ) &&
                 ( j >= 0 ) &&
                 ( j < table_len ) )
         {
@@ -7364,12 +7364,12 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
                 pass2 = FALSE;
                 failure_mssg2 = "mdjsc callback table free list entry in use.";
             }
-            
+
             i++;
             j = record_ptr->fl_next;
         }
 
-        if ( show_progress ) 
+        if ( show_progress )
             HDfprintf(stdout, "%s:%d: %d.\n", fcn_name, pass2, cp++);
 
         if ( pass2 )
@@ -7377,21 +7377,21 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
             if ( i != (table_len - num_entries) ) {
 
                 pass2 = FALSE;
-                failure_mssg2 = 
+                failure_mssg2 =
                     "mdjsc callback table free list shorter than expected.";
 
             } else if ( ( record_ptr != NULL ) &&
 			( record_ptr->fl_next != -1 ) ) {
 
                 pass2 = FALSE;
-                failure_mssg2 = 
+                failure_mssg2 =
                     "mdjsc callback table free list longer than expected.";
 
             }
         }
     }
 
-    if ( show_progress ) 
+    if ( show_progress )
         HDfprintf(stdout, "%s:%d: %d -- done.\n", fcn_name, pass2, cp++);
 
     return;
@@ -7418,7 +7418,7 @@ verify_mdjsc_table_config(H5C2_t * cache_ptr,
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7428,7 +7428,7 @@ verify_mdjsc_callback_deregistered(H5C2_t * cache_ptr,
     if ( pass2 )
     {
         if ( ( cache_ptr == NULL ) ||
-             ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) 
+             ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) )
         {
             pass2 = FALSE;
             failure_mssg2 = "bad cache_ptr.";
@@ -7482,7 +7482,7 @@ verify_mdjsc_callback_deregistered(H5C2_t * cache_ptr,
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7494,7 +7494,7 @@ verify_mdjsc_callback_registered(H5C2_t * cache_ptr,
     if ( pass2 )
     {
         if ( ( cache_ptr == NULL ) ||
-             ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) 
+             ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) )
         {
             pass2 = FALSE;
             failure_mssg2 = "bad cache_ptr.";
@@ -7557,9 +7557,9 @@ verify_mdjsc_callback_registered(H5C2_t * cache_ptr,
  *
  * Function: 	verify_mdjsc_callback_error_rejection()
  *
- * Purpose:  	Run a variety of tests to verify that the metadata 
- *		journaling status change callbacks registration and 
- *		de-registration routines will fail on obviously 
+ * Purpose:  	Run a variety of tests to verify that the metadata
+ *		journaling status change callbacks registration and
+ *		de-registration routines will fail on obviously
  *		invalid input.
  *
  *		If anything is not as it should be, set pass2 to FALSE,
@@ -7571,7 +7571,7 @@ verify_mdjsc_callback_registered(H5C2_t * cache_ptr,
  *
  * Programmer: 	John Mainzer
  *              8/20/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7603,9 +7603,9 @@ verify_mdjsc_callback_error_rejection(void)
 	indicies[i] = -1;
     }
 
-    /* 1) Create a file with journaling enabled.  
+    /* 1) Create a file with journaling enabled.
      *
-     * 2) Attempt to register callbacks with a variety of NULL 
+     * 2) Attempt to register callbacks with a variety of NULL
      *    pointers supplied for parameters other than data_ptr.
      *    All attempts should fail.
      *
@@ -7688,7 +7688,7 @@ verify_mdjsc_callback_error_rejection(void)
     }
 
 
-    /* 2) Attempt to register callbacks with a variety of NULL 
+    /* 2) Attempt to register callbacks with a variety of NULL
      *    pointers supplied for parameters other than data_ptr.
      *    All attempts should fail.
      */
@@ -7696,15 +7696,15 @@ verify_mdjsc_callback_error_rejection(void)
     if ( pass2 )
     {
         result = H5AC2_register_mdjsc_callback(NULL,
-				               test_mdjsc_callback, 
-					       NULL, 
+				               test_mdjsc_callback,
+					       NULL,
 					       &(indicies[0]),
 					       NULL);
 
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_register_mdjsc_callback() succeeded with NULL file_ptr";
         }
     }
@@ -7712,15 +7712,15 @@ verify_mdjsc_callback_error_rejection(void)
     if ( pass2 )
     {
         result = H5AC2_register_mdjsc_callback(file_ptr,
-				               NULL, 
-					       NULL, 
+				               NULL,
+					       NULL,
 					       &(indicies[0]),
 					       NULL);
 
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_register_mdjsc_callback() succeeded with NULL fcn_ptr";
         }
     }
@@ -7728,15 +7728,15 @@ verify_mdjsc_callback_error_rejection(void)
     if ( pass2 )
     {
         result = H5AC2_register_mdjsc_callback(file_ptr,
-				               test_mdjsc_callback, 
-					       NULL, 
+				               test_mdjsc_callback,
+					       NULL,
 					       NULL,
 					       NULL);
 
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_register_mdjsc_callback() succeeded with NULL idx_ptr";
         }
     }
@@ -7753,7 +7753,7 @@ verify_mdjsc_callback_error_rejection(void)
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	      "H5AC2_deregister_mdjsc_callback() succeeded with NULL file_ptr";
         }
     }
@@ -7765,7 +7765,7 @@ verify_mdjsc_callback_error_rejection(void)
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_deregister_mdjsc_callback() succeeded with invld idx(1)";
         }
     }
@@ -7785,13 +7785,13 @@ verify_mdjsc_callback_error_rejection(void)
     register_mdjsc_callback(file_ptr, cache_ptr, test_mdjsc_callback,
 		            &(counters[2]), &(indicies[2]));
 
-    free_entries[0] = FALSE; 
-    free_entries[1] = FALSE; 
-    free_entries[2] = FALSE; 
+    free_entries[0] = FALSE;
+    free_entries[1] = FALSE;
+    free_entries[2] = FALSE;
     expected_num_entries += 3;
     expected_max_idx = 2;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -7803,7 +7803,7 @@ verify_mdjsc_callback_error_rejection(void)
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_deregister_mdjsc_callback() succeeded with invld idx(2)";
         }
     }
@@ -7815,12 +7815,12 @@ verify_mdjsc_callback_error_rejection(void)
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_deregister_mdjsc_callback() succeeded with invld idx(3)";
         }
     }
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -7832,15 +7832,15 @@ verify_mdjsc_callback_error_rejection(void)
         if ( result != SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_deregister_mdjsc_callback() failed with valid idx";
         }
         else
 	{
-            free_entries[1] = TRUE; 
+            free_entries[1] = TRUE;
             expected_num_entries--;
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
 
@@ -7854,7 +7854,7 @@ verify_mdjsc_callback_error_rejection(void)
         if ( result == SUCCEED )
         {
 	    pass2 = FALSE;
-	    failure_mssg2 = 
+	    failure_mssg2 =
 	        "H5AC2_deregister_mdjsc_callback() succeeded with invld idx(4)";
         }
     }
@@ -7867,12 +7867,12 @@ verify_mdjsc_callback_error_rejection(void)
     deregister_mdjsc_callback(file_ptr, cache_ptr, 0);
     deregister_mdjsc_callback(file_ptr, cache_ptr, 2);
 
-    free_entries[0] = TRUE; 
-    free_entries[2] = TRUE; 
+    free_entries[0] = TRUE;
+    free_entries[2] = TRUE;
     expected_num_entries -= 2;
     expected_max_idx = -1;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -7902,7 +7902,7 @@ verify_mdjsc_callback_error_rejection(void)
 #endif
     if ( show_progress ) {
 
-        HDfprintf(stdout, "%s%d cp = %d done.\n", 
+        HDfprintf(stdout, "%s%d cp = %d done.\n",
 		  fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
@@ -7916,9 +7916,9 @@ verify_mdjsc_callback_error_rejection(void)
  *
  * Function: 	verify_mdjsc_callback_execution()
  *
- * Purpose:  	Run a variety of tests to verify that the metadata 
+ * Purpose:  	Run a variety of tests to verify that the metadata
  *		journaling status change callbacks are actually performed,
- *		at the correct time, and that the expected data is passed 
+ *		at the correct time, and that the expected data is passed
  *		to the callback function.
  *
  *		If anything is not as it should be, set pass2 to FALSE,
@@ -7930,7 +7930,7 @@ verify_mdjsc_callback_error_rejection(void)
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
@@ -7966,22 +7966,22 @@ verify_mdjsc_callback_execution(void)
 	indicies[i] = -1;
     }
 
-    /*  1) Create a file with journaling enabled.  
+    /*  1) Create a file with journaling enabled.
      *
-     *  2) Register a callback.  
+     *  2) Register a callback.
      *
      *  3) Disable journaling.  Verify that the callback is called,
      *     that it gets the correct data, and that the cache is clean
      *     at time of call.
      *
-     *  4) Enable journaling again.  Verify that the callback is 
+     *  4) Enable journaling again.  Verify that the callback is
      *     called, that it gets the correct data, and that the cache
      *     is clear at time of call.
      *
-     *  5) Perform some writes to the file.  
+     *  5) Perform some writes to the file.
      *
-     *  6) Disable journaling.  Verify that the callback is called, 
-     *     that it gets the correct data, and that the cache is 
+     *  6) Disable journaling.  Verify that the callback is called,
+     *     that it gets the correct data, and that the cache is
      *     clean at time of call.
      *
      *  7) Perform some more writes to the file.
@@ -7991,10 +7991,10 @@ verify_mdjsc_callback_execution(void)
      *     is clear at time of call.
      *
      *  9) Deregister the callback, and close the file.  Recall that
-     *     all metadata journaling status change callbacks must 
+     *     all metadata journaling status change callbacks must
      *     deregister before the metadata cache is destroyed.
      *
-     * 10) Re-open the file with journaling disabled, and register 
+     * 10) Re-open the file with journaling disabled, and register
      *     several callbacks.  Ensure that at least one has NULL
      *     data_ptr.
      *
@@ -8088,11 +8088,11 @@ verify_mdjsc_callback_execution(void)
     register_mdjsc_callback(file_ptr, cache_ptr, test_mdjsc_callback,
 		            &(counters[0]), &(indicies[0]));
 
-    free_entries[0] = FALSE; 
+    free_entries[0] = FALSE;
     expected_num_entries++;
     expected_max_idx = 0;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -8185,7 +8185,7 @@ verify_mdjsc_callback_execution(void)
     }
 
 
-    /*  4) Enable journaling again.  Verify that the callback is 
+    /*  4) Enable journaling again.  Verify that the callback is
      *     called, that it gets the correct data, and that the cache
      *     is clear at time of call.
      */
@@ -8338,8 +8338,8 @@ verify_mdjsc_callback_execution(void)
     }
 
 
-    /*  6) Disable journaling.  Verify that the callback is called, 
-     *     that it gets the correct data, and that the cache is 
+    /*  6) Disable journaling.  Verify that the callback is called,
+     *     that it gets the correct data, and that the cache is
      *     clean at time of call.
      */
 
@@ -8571,20 +8571,20 @@ verify_mdjsc_callback_execution(void)
         HDfflush(stdout);
     }
 
-     
+
     /*  9) Deregister the callback, and close the file.  Recall that
-     *     all metadata journaling status change callbacks must 
+     *     all metadata journaling status change callbacks must
      *     deregister before the metadata cache is destroyed.
      */
 
     deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[0]);
 
     indicies[0] = -1;
-    free_entries[0] = TRUE; 
+    free_entries[0] = TRUE;
     expected_num_entries = 0;
     expected_max_idx = -1;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -8608,7 +8608,7 @@ verify_mdjsc_callback_execution(void)
 
 
 
-    /* 10) Re-open the file with journaling disabled, and register 
+    /* 10) Re-open the file with journaling disabled, and register
      *     several callbacks.  Ensure that at least one has NULL
      *     data_ptr.
      */
@@ -8624,13 +8624,13 @@ verify_mdjsc_callback_execution(void)
     register_mdjsc_callback(file_ptr, cache_ptr, test_mdjsc_callback,
 		            &(counters[2]), &(indicies[2]));
 
-    free_entries[0] = FALSE; 
-    free_entries[1] = FALSE; 
-    free_entries[2] = FALSE; 
+    free_entries[0] = FALSE;
+    free_entries[1] = FALSE;
+    free_entries[2] = FALSE;
     expected_num_entries += 3;
     expected_max_idx = 2;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -8697,8 +8697,8 @@ verify_mdjsc_callback_execution(void)
 
     if ( pass2 ) {
 
-        if ( ( counters[0] != 1 ) && 
-	     ( counters[1] != 0 ) && 
+        if ( ( counters[0] != 1 ) &&
+	     ( counters[1] != 0 ) &&
 	     ( counters[2] != 1 ) &&
 	     ( counters[3] != 0 ) )
         {
@@ -8811,7 +8811,7 @@ verify_mdjsc_callback_execution(void)
 
 	    HDassert( indicies[i] == i );
 
-            free_entries[i] = FALSE; 
+            free_entries[i] = FALSE;
             expected_num_entries++;
 
 	    if ( i > expected_max_idx ) {
@@ -8824,7 +8824,7 @@ verify_mdjsc_callback_execution(void)
 	        expected_table_len *= 2;
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -8943,7 +8943,7 @@ verify_mdjsc_callback_execution(void)
 
     /* 15) Deregister some of the callbacks. */
 
-    /* working from the top downwards, de-register all entries with 
+    /* working from the top downwards, de-register all entries with
      * indicies not divisible by 8.
      */
 
@@ -8954,10 +8954,10 @@ verify_mdjsc_callback_execution(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 	        double fraction_in_use;
 
@@ -8970,12 +8970,12 @@ verify_mdjsc_callback_execution(void)
                 fraction_in_use = ((double)expected_num_entries) /
 	                           ((double)expected_table_len);
 
-	        while ( ( expected_max_idx < (expected_table_len / 2) ) 
+	        while ( ( expected_max_idx < (expected_table_len / 2) )
 	                &&
-	                ( fraction_in_use < 
-			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+	                ( fraction_in_use <
+			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		        &&
-		        ( (expected_table_len / 2) >= 
+		        ( (expected_table_len / 2) >=
 			  H5C2__MIN_MDJSC_CB_TBL_LEN )
 		      )
                 {
@@ -8983,8 +8983,8 @@ verify_mdjsc_callback_execution(void)
 	        }
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
-	                              expected_num_entries, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
+	                              expected_num_entries,
                                       expected_max_idx,
                                       free_entries);
 	}
@@ -9123,10 +9123,10 @@ verify_mdjsc_callback_execution(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 	        double fraction_in_use;
 
@@ -9139,12 +9139,12 @@ verify_mdjsc_callback_execution(void)
                 fraction_in_use = ((double)expected_num_entries) /
 	                           ((double)expected_table_len);
 
-	        while ( ( expected_max_idx < (expected_table_len / 2) ) 
+	        while ( ( expected_max_idx < (expected_table_len / 2) )
 	                &&
-	                ( fraction_in_use < 
-			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+	                ( fraction_in_use <
+			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		        &&
-		        ( (expected_table_len / 2) >= 
+		        ( (expected_table_len / 2) >=
 			  H5C2__MIN_MDJSC_CB_TBL_LEN )
 		      )
                 {
@@ -9152,8 +9152,8 @@ verify_mdjsc_callback_execution(void)
 	        }
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
-	                              expected_num_entries, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
+	                              expected_num_entries,
                                       expected_max_idx,
                                       free_entries);
 	}
@@ -9196,7 +9196,7 @@ verify_mdjsc_callback_execution(void)
 #endif
     if ( show_progress ) {
 
-        HDfprintf(stdout, "%s%d cp = %d done.\n", 
+        HDfprintf(stdout, "%s%d cp = %d done.\n",
 		  fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
@@ -9210,8 +9210,8 @@ verify_mdjsc_callback_execution(void)
  *
  * Function: 	verify_mdjsc_callback_registration_deregistration()
  *
- * Purpose:  	Run a variety of tests to verify that the metadata 
- *		journaling status change callback registration and 
+ * Purpose:  	Run a variety of tests to verify that the metadata
+ *		journaling status change callback registration and
  *		deregistration works as expected.
  *
  *		If all tests pass, do nothing.
@@ -9225,13 +9225,13 @@ verify_mdjsc_callback_execution(void)
  *
  * Programmer: 	John Mainzer
  *              8/15/08
- * 
+ *
  **************************************************************************/
 
 static void
 verify_mdjsc_callback_registration_deregistration(void)
 {
-    const char * fcn_name = 
+    const char * fcn_name =
         "verify_mdjsc_callback_registration_deregistration():";
     char filename[512];
     char journal_filename[H5AC2__MAX_JOURNAL_FILE_NAME_LEN + 1];
@@ -9282,7 +9282,7 @@ verify_mdjsc_callback_registration_deregistration(void)
      *  7) In LIFO order, deregister (H5C2__MIN_MDJSC_CB_TBL_LEN / 2) + 1
      *     callbacks in LIFO order.  Verify that the entries are deregistered,
      *     and that the table has not changed size.
-     * 
+     *
      *  8) Again, in LIFO order, deregister another callback.  Verify that
      *     the callback is deregistered, and that the table has been reduced
      *     in size to H5C2__MIN_MDJSC_CB_TBL_LEN.
@@ -9293,34 +9293,34 @@ verify_mdjsc_callback_registration_deregistration(void)
      *     that all callbacks are registered, and that the table lenght grows
      *     to 16 * H5C2__MIN_MDJSC_CB_TBL_LEN.
      *
-     * 11) Deregister all callbacks with even indicies.  Verify the 
+     * 11) Deregister all callbacks with even indicies.  Verify the
      *     deregistrations.  Verify that the table does not shrink.
      *
-     * 12) Register a callback.  Verify that it is place in one of the 
+     * 12) Register a callback.  Verify that it is place in one of the
      *     slots freed by the dergistrations in 11) above.
      *
      * 13) Starting with the lowest index, deregister all the callbacks.
-     *     Verify the deregistrations, and also verify that the table 
+     *     Verify the deregistrations, and also verify that the table
      *     does not shrink until the last callback is de-registered.
      *
      * 14) Register 8 * H5C2__MIN_MDJSC_CB_TBL_LEN + 1 callbacks.  Verify
      *     that all callbacks are registered, and that the table length grows
      *     to 16 * H5C2__MIN_MDJSC_CB_TBL_LEN.
      *
-     * 15) Starting with the highest index, deregister all entries with 
+     * 15) Starting with the highest index, deregister all entries with
      *     index not divisible by H5C2__MIN_MDJSC_CB_TBL_LEN / 2.  Verify
      *     that the callbacks are de-registers, and that the table does
      *     not shrink
      *
-     * 16) Register H5C2__MIN_MDJSC_CB_TBL_LEN / 2 callbacks.  Verify that 
+     * 16) Register H5C2__MIN_MDJSC_CB_TBL_LEN / 2 callbacks.  Verify that
      *     they are placed in slots freed by the dergistrations in 15) above.
      *
-     * 17) Starting with the lowest index, deregister all entries with 
-     *     index with index >= H5C2__MIN_MDJSC_CB_TBL_LEN and not divisible 
-     *     by H5C2__MIN_MDJSC_CB_TBL_LEN.  Verify that the callbacks are 
+     * 17) Starting with the lowest index, deregister all entries with
+     *     index with index >= H5C2__MIN_MDJSC_CB_TBL_LEN and not divisible
+     *     by H5C2__MIN_MDJSC_CB_TBL_LEN.  Verify that the callbacks are
      *     deregistered, and that the table does not shrink.
      *
-     * 18) Register a callback.  Verify that it is place in one of the 
+     * 18) Register a callback.  Verify that it is place in one of the
      *     slots freed by the dergistrations in 17) above.
      *
      * 19) Starting with the highest index, deregister all callbacks.
@@ -9402,11 +9402,11 @@ verify_mdjsc_callback_registration_deregistration(void)
     register_mdjsc_callback(file_ptr, cache_ptr, test_mdjsc_callback,
 		            &(counters[j]), &(indicies[j]));
 
-    free_entries[j] = FALSE; 
+    free_entries[j] = FALSE;
     expected_num_entries++;
     expected_max_idx = 0;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9426,11 +9426,11 @@ verify_mdjsc_callback_registration_deregistration(void)
 
     deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[j]);
 
-    free_entries[j] = TRUE; 
+    free_entries[j] = TRUE;
     expected_num_entries--;
     expected_max_idx = -1;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		              expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9451,11 +9451,11 @@ verify_mdjsc_callback_registration_deregistration(void)
         register_mdjsc_callback(file_ptr, cache_ptr, test_mdjsc_callback,
 		                &(counters[j]), &(indicies[j]));
 
-        free_entries[j] = FALSE; 
+        free_entries[j] = FALSE;
         expected_num_entries++;
         expected_max_idx++;
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
 
@@ -9482,7 +9482,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfflush(stdout);
     }
 
-    free_entries[j] = FALSE; 
+    free_entries[j] = FALSE;
     expected_num_entries++;
     expected_max_idx++;
 
@@ -9492,7 +9492,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfflush(stdout);
     }
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
                               expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9518,12 +9518,12 @@ verify_mdjsc_callback_registration_deregistration(void)
     register_mdjsc_callback(file_ptr, cache_ptr, test_mdjsc_callback,
                             &(counters[j]), &(indicies[j]));
 
-    free_entries[j] = FALSE; 
+    free_entries[j] = FALSE;
     expected_num_entries++;
     expected_max_idx++;
     expected_table_len *= 2;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
                               expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9547,11 +9547,11 @@ verify_mdjsc_callback_registration_deregistration(void)
 
         deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[j]);
 
-        free_entries[j] = TRUE; 
+        free_entries[j] = TRUE;
         expected_num_entries--;
         expected_max_idx--;
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
     }
@@ -9572,12 +9572,12 @@ verify_mdjsc_callback_registration_deregistration(void)
 
     deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[j]);
 
-    free_entries[j] = TRUE; 
+    free_entries[j] = TRUE;
     expected_num_entries--;
     expected_max_idx--;
     expected_table_len /= 2;
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
                               expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9587,7 +9587,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfflush(stdout);
     }
 
-     
+
     /*  9) Deregister all callbacks.  Verify that the table is empty.
      */
 
@@ -9597,11 +9597,11 @@ verify_mdjsc_callback_registration_deregistration(void)
 
         deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[j]);
 
-        free_entries[j] = TRUE; 
+        free_entries[j] = TRUE;
         expected_num_entries--;
         expected_max_idx--;
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
     }
@@ -9625,7 +9625,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 
 	HDassert( indicies[i] == i );
 
-        free_entries[i] = FALSE; 
+        free_entries[i] = FALSE;
         expected_num_entries++;
         expected_max_idx++;
 
@@ -9634,7 +9634,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 	    expected_table_len *= 2;
 	}
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
     }
@@ -9648,9 +9648,9 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
-     
 
-    /* 11) Deregister all callbacks with even indicies.  Verify the 
+
+    /* 11) Deregister all callbacks with even indicies.  Verify the
      *     deregistrations.  Verify that the table does not shrink.
      */
 
@@ -9659,14 +9659,14 @@ verify_mdjsc_callback_registration_deregistration(void)
         deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	indicies[i] = -1;
-        free_entries[i] = TRUE; 
+        free_entries[i] = TRUE;
         expected_num_entries--;
 
 	if ( i == expected_max_idx ) {
             expected_max_idx--;
 	}
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
 
@@ -9679,11 +9679,11 @@ verify_mdjsc_callback_registration_deregistration(void)
     }
 
 
-    /* 12) Register a callback.  Verify that it is place in one of the 
+    /* 12) Register a callback.  Verify that it is place in one of the
      *     slots freed by the dergistrations in 11) above.
      */
 
-    /* The index assigned to the new callback is determined by the 
+    /* The index assigned to the new callback is determined by the
      * free list management algorithm.  In the present implementation
      * freed entries are added to the head of the free list, so the
      * next index issues will be 8 * H5C2__MIN_MDJSC_CB_TBL_LEN.
@@ -9695,7 +9695,7 @@ verify_mdjsc_callback_registration_deregistration(void)
                             &(counters[j]), &(indicies[j]));
 
     HDassert( indicies[j] == j ); /* see comment above */
-    free_entries[j] = FALSE; 
+    free_entries[j] = FALSE;
     expected_num_entries++;
 
     if ( j > expected_max_idx ) {
@@ -9703,7 +9703,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         expected_max_idx = j;
     }
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
                               expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9715,27 +9715,27 @@ verify_mdjsc_callback_registration_deregistration(void)
 
 
     /* 13) Starting with the lowest index, deregister all the callbacks.
-     *     Verify the deregistrations, and also verify that the table 
+     *     Verify the deregistrations, and also verify that the table
      *     does not shrink until the last callback is de-registered.
      */
 
     for ( i = 0; i < (8 * H5C2__MIN_MDJSC_CB_TBL_LEN) + 1; i++ )
     {
-	if ( ! free_entries[i] ) 
+	if ( ! free_entries[i] )
 	{
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
                 expected_max_idx = -1;
 		expected_table_len = H5C2__MIN_MDJSC_CB_TBL_LEN;
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -9746,7 +9746,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
-     
+
 
     /* 14) Register 8 * H5C2__MIN_MDJSC_CB_TBL_LEN + 1 callbacks.  Verify
      *     that all callbacks are registered, and that the table length grows
@@ -9760,7 +9760,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 
 	HDassert( indicies[i] == i );
 
-        free_entries[i] = FALSE; 
+        free_entries[i] = FALSE;
         expected_num_entries++;
         expected_max_idx++;
 
@@ -9769,7 +9769,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 	    expected_table_len *= 2;
 	}
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
     }
@@ -9783,9 +9783,9 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
-     
 
-    /* 15) Starting with the highest index, deregister all entries with 
+
+    /* 15) Starting with the highest index, deregister all entries with
      *     index not divisible by H5C2__MIN_MDJSC_CB_TBL_LEN / 2.  Verify
      *     that the callbacks are de-registers, and that the table does
      *     not shrink
@@ -9799,15 +9799,15 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
                 expected_max_idx = -1;
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -9818,13 +9818,13 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
-     
 
-    /* 16) Register H5C2__MIN_MDJSC_CB_TBL_LEN / 2 callbacks.  Verify that 
+
+    /* 16) Register H5C2__MIN_MDJSC_CB_TBL_LEN / 2 callbacks.  Verify that
      *     they are placed in slots freed by the dergistrations in 15) above.
      */
 
-    /* The index assigned to the new callback is determined by the 
+    /* The index assigned to the new callback is determined by the
      * free list management algorithm.  In the present implementation
      * freed entries are added to the head of the free list, so the
      * next index issues will be 1.
@@ -9843,7 +9843,7 @@ verify_mdjsc_callback_registration_deregistration(void)
                                 &(counters[j]), &(indicies[j]));
 
         HDassert( indicies[j] == j ); /* see comment above */
-        free_entries[j] = FALSE; 
+        free_entries[j] = FALSE;
         expected_num_entries++;
 
         if ( j > expected_max_idx ) {
@@ -9851,7 +9851,7 @@ verify_mdjsc_callback_registration_deregistration(void)
             expected_max_idx = j;
         }
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
                                   expected_num_entries, expected_max_idx,
                                   free_entries);
     }
@@ -9865,14 +9865,14 @@ verify_mdjsc_callback_registration_deregistration(void)
     }
 
 
-    /* 17) Starting with the lowest index, deregister all entries with 
-     *     index with index >= H5C2__MIN_MDJSC_CB_TBL_LEN and not divisible 
-     *     by H5C2__MIN_MDJSC_CB_TBL_LEN.  Verify that the callbacks are 
+    /* 17) Starting with the lowest index, deregister all entries with
+     *     index with index >= H5C2__MIN_MDJSC_CB_TBL_LEN and not divisible
+     *     by H5C2__MIN_MDJSC_CB_TBL_LEN.  Verify that the callbacks are
      *     deregistered, and that the table does not shrink.
      */
 
-    for ( i = H5C2__MIN_MDJSC_CB_TBL_LEN; 
-          i < (8 * H5C2__MIN_MDJSC_CB_TBL_LEN) + 1; 
+    for ( i = H5C2__MIN_MDJSC_CB_TBL_LEN;
+          i < (8 * H5C2__MIN_MDJSC_CB_TBL_LEN) + 1;
 	  i++ )
     {
 	if ( ( ! free_entries[i] ) &&
@@ -9881,15 +9881,15 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
                 expected_max_idx = -1;
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -9900,13 +9900,13 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
-     
 
-    /* 18) Register a callback.  Verify that it is place in one of the 
+
+    /* 18) Register a callback.  Verify that it is place in one of the
      *     slots freed by the dergistrations in 17) above.
      */
 
-    /* The index assigned to the new callback is determined by the 
+    /* The index assigned to the new callback is determined by the
      * free list management algorithm.  In the present implementation
      * freed entries are added to the head of the free list, so the
      * next index issues will be (7 * H5C2__MIN_MDJSC_CB_TBL_LEN) +
@@ -9919,7 +9919,7 @@ verify_mdjsc_callback_registration_deregistration(void)
                             &(counters[j]), &(indicies[j]));
 
     HDassert( indicies[j] == j ); /* see comment above */
-    free_entries[j] = FALSE; 
+    free_entries[j] = FALSE;
     expected_num_entries++;
 
     if ( j > expected_max_idx ) {
@@ -9927,7 +9927,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         expected_max_idx = j;
     }
 
-    verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+    verify_mdjsc_table_config(cache_ptr, expected_table_len,
                               expected_num_entries, expected_max_idx,
                               free_entries);
 
@@ -9949,10 +9949,10 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 		double fraction_in_use;
 
@@ -9966,9 +9966,9 @@ verify_mdjsc_callback_registration_deregistration(void)
 	                          ((double)expected_table_len);
 
 
-		if ( ( expected_max_idx < (expected_table_len / 2) ) 
+		if ( ( expected_max_idx < (expected_table_len / 2) )
 		     &&
-		     ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+		     ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		     &&
 		     ( (expected_table_len / 2) >= H5C2__MIN_MDJSC_CB_TBL_LEN )
 		   )
@@ -9977,7 +9977,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 		}
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -9988,7 +9988,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfprintf(stdout, "%s%d cp = %d.\n", fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
-     
+
 
     /* 20) Do a torture tests -- forcing the number of registered callbacks
      *     into the thousands.  After each registration and deregistration,
@@ -10004,7 +10004,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 
 	HDassert( indicies[i] == i );
 
-        free_entries[i] = FALSE; 
+        free_entries[i] = FALSE;
         expected_num_entries++;
         expected_max_idx++;
 
@@ -10013,7 +10013,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 	    expected_table_len *= 2;
 	}
 
-        verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+        verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                  expected_num_entries, expected_max_idx,
                                   free_entries);
     }
@@ -10027,8 +10027,8 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfflush(stdout);
     }
 
-     
-    /* Starting from 3 * max_callbacks / 8 and working down to 
+
+    /* Starting from 3 * max_callbacks / 8 and working down to
      * max_callbacks / 8, deregister the odd index callbacks.
      */
     for ( i = (3 * max_callbacks / 8); i >= max_callbacks / 8; i-- )
@@ -10038,10 +10038,10 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 		double fraction_in_use;
 
@@ -10055,9 +10055,9 @@ verify_mdjsc_callback_registration_deregistration(void)
 	                          ((double)expected_table_len);
 
 
-		if ( ( expected_max_idx < (expected_table_len / 2) ) 
+		if ( ( expected_max_idx < (expected_table_len / 2) )
 		     &&
-		     ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+		     ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		     &&
 		     ( (expected_table_len / 2) >= H5C2__MIN_MDJSC_CB_TBL_LEN )
 		   )
@@ -10066,7 +10066,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 		}
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -10081,10 +10081,10 @@ verify_mdjsc_callback_registration_deregistration(void)
     /* now re-register the callbacks just deregistered.  To keep the test
      * at least somewhat sane, re-register the entries in the order they
      * appear in the free list, so as to maintain the indicies[i] == i
-     * invarient.  At present, this means re-registering entries the 
+     * invarient.  At present, this means re-registering entries the
      * the reverse of the order they were deregistered in.
      */
-     
+
     for ( i = (max_callbacks / 8); i <= (3 * max_callbacks / 8); i++ )
     {
 	if ( ( pass2 ) && ( free_entries[i] ) && ( (i % 2) == 1 ) )
@@ -10094,7 +10094,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 
 	    HDassert( indicies[i] == i );
 
-            free_entries[i] = FALSE; 
+            free_entries[i] = FALSE;
             expected_num_entries++;
 
 	    if ( i > expected_max_idx ) {
@@ -10107,7 +10107,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 	        expected_table_len *= 2;
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -10123,7 +10123,7 @@ verify_mdjsc_callback_registration_deregistration(void)
     }
 
     /* now register more entries up to max_callbacks */
-     
+
     for ( i = (max_callbacks / 2); i < max_callbacks; i++ )
     {
 	if ( ( pass2 ) && ( free_entries[i] ) )
@@ -10133,7 +10133,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 
 	    HDassert( indicies[i] == i );
 
-            free_entries[i] = FALSE; 
+            free_entries[i] = FALSE;
             expected_num_entries++;
 
 	    if ( i > expected_max_idx ) {
@@ -10146,7 +10146,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 	        expected_table_len *= 2;
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
 		                      expected_num_entries, expected_max_idx,
                                       free_entries);
         }
@@ -10173,10 +10173,10 @@ verify_mdjsc_callback_registration_deregistration(void)
                 deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	        indicies[i] = -1;
-                free_entries[i] = TRUE; 
+                free_entries[i] = TRUE;
                 expected_num_entries--;
 
-	        if ( i == expected_max_idx ) 
+	        if ( i == expected_max_idx )
 	        {
 		    double fraction_in_use;
 
@@ -10189,12 +10189,12 @@ verify_mdjsc_callback_registration_deregistration(void)
                     fraction_in_use = ((double)expected_num_entries) /
 	                               ((double)expected_table_len);
 
-		    if ( ( expected_max_idx < (expected_table_len / 2) ) 
+		    if ( ( expected_max_idx < (expected_table_len / 2) )
 		         &&
-		         ( fraction_in_use < 
-			   H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+		         ( fraction_in_use <
+			   H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		         &&
-		         ( (expected_table_len / 2) >= 
+		         ( (expected_table_len / 2) >=
 			   H5C2__MIN_MDJSC_CB_TBL_LEN )
 		       )
 		    {
@@ -10202,8 +10202,8 @@ verify_mdjsc_callback_registration_deregistration(void)
 		    }
 	        }
 
-                verify_mdjsc_table_config(cache_ptr, expected_table_len, 
-		                          expected_num_entries, 
+                verify_mdjsc_table_config(cache_ptr, expected_table_len,
+		                          expected_num_entries,
 					  expected_max_idx,
                                           free_entries);
             }
@@ -10217,7 +10217,7 @@ verify_mdjsc_callback_registration_deregistration(void)
     }
 
 
-    /* working from the top downwards, de-register all entries with 
+    /* working from the top downwards, de-register all entries with
      * indicies not divisible by 3.
      */
 
@@ -10228,10 +10228,10 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 	        double fraction_in_use;
 
@@ -10244,12 +10244,12 @@ verify_mdjsc_callback_registration_deregistration(void)
                 fraction_in_use = ((double)expected_num_entries) /
 	                           ((double)expected_table_len);
 
-	        while ( ( expected_max_idx < (expected_table_len / 2) ) 
+	        while ( ( expected_max_idx < (expected_table_len / 2) )
 	                &&
-	                ( fraction_in_use < 
-			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+	                ( fraction_in_use <
+			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		        &&
-		        ( (expected_table_len / 2) >= 
+		        ( (expected_table_len / 2) >=
 			  H5C2__MIN_MDJSC_CB_TBL_LEN )
 		      )
                 {
@@ -10257,8 +10257,8 @@ verify_mdjsc_callback_registration_deregistration(void)
 	        }
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
-	                              expected_num_entries, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
+	                              expected_num_entries,
                                       expected_max_idx,
                                       free_entries);
 	}
@@ -10270,7 +10270,7 @@ verify_mdjsc_callback_registration_deregistration(void)
         HDfflush(stdout);
     }
 
-    
+
     /* working from low index up, deregister all entries with index
      * greater than (max_callbacks / 8).
      */
@@ -10282,10 +10282,10 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 	        double fraction_in_use;
 
@@ -10298,12 +10298,12 @@ verify_mdjsc_callback_registration_deregistration(void)
                 fraction_in_use = ((double)expected_num_entries) /
 	                           ((double)expected_table_len);
 
-	        while ( ( expected_max_idx < (expected_table_len / 2) ) 
+	        while ( ( expected_max_idx < (expected_table_len / 2) )
 	                &&
-	                ( fraction_in_use < 
-			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+	                ( fraction_in_use <
+			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		        &&
-		        ( (expected_table_len / 2) >= 
+		        ( (expected_table_len / 2) >=
 			  H5C2__MIN_MDJSC_CB_TBL_LEN )
 		      )
                 {
@@ -10311,8 +10311,8 @@ verify_mdjsc_callback_registration_deregistration(void)
 	        }
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
-	                              expected_num_entries, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
+	                              expected_num_entries,
                                       expected_max_idx,
                                       free_entries);
 	}
@@ -10336,10 +10336,10 @@ verify_mdjsc_callback_registration_deregistration(void)
             deregister_mdjsc_callback(file_ptr, cache_ptr, indicies[i]);
 
 	    indicies[i] = -1;
-            free_entries[i] = TRUE; 
+            free_entries[i] = TRUE;
             expected_num_entries--;
 
-	    if ( i == expected_max_idx ) 
+	    if ( i == expected_max_idx )
 	    {
 	        double fraction_in_use;
 
@@ -10352,12 +10352,12 @@ verify_mdjsc_callback_registration_deregistration(void)
                 fraction_in_use = ((double)expected_num_entries) /
 	                           ((double)expected_table_len);
 
-	        while ( ( expected_max_idx < (expected_table_len / 2) ) 
+	        while ( ( expected_max_idx < (expected_table_len / 2) )
 	                &&
-	                ( fraction_in_use < 
-			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) 
+	                ( fraction_in_use <
+			  H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO )
 		        &&
-		        ( (expected_table_len / 2) >= 
+		        ( (expected_table_len / 2) >=
 			  H5C2__MIN_MDJSC_CB_TBL_LEN )
 		      )
                 {
@@ -10365,8 +10365,8 @@ verify_mdjsc_callback_registration_deregistration(void)
 	        }
 	    }
 
-            verify_mdjsc_table_config(cache_ptr, expected_table_len, 
-	                              expected_num_entries, 
+            verify_mdjsc_table_config(cache_ptr, expected_table_len,
+	                              expected_num_entries,
                                       expected_max_idx,
                                       free_entries);
 	}
@@ -10408,7 +10408,7 @@ verify_mdjsc_callback_registration_deregistration(void)
 #endif
     if ( show_progress ) {
 
-        HDfprintf(stdout, "%s%d cp = %d done.\n", 
+        HDfprintf(stdout, "%s%d cp = %d done.\n",
 		  fcn_name, (int)pass2, cp++);
         HDfflush(stdout);
     }
@@ -10422,7 +10422,7 @@ verify_mdjsc_callback_registration_deregistration(void)
  * Function: 	check_buffer_writes
  *
  * Purpose:  	Verify the function H5C_jb__write_to_buffer properly writes
- *              messages of varying sizes into the journal buffers, and 
+ *              messages of varying sizes into the journal buffers, and
  *              that the journal buffers properly flush out when filled.
  *
  * Return:      void
@@ -10431,12 +10431,12 @@ verify_mdjsc_callback_registration_deregistration(void)
  *              Thursday, February 21, 2008
  *
  * Changes:	John Mainzer -- 4/16/09
- *		Updated for the addition of new parameters to 
+ *		Updated for the addition of new parameters to
  *		H5C2_jb__init().
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_buffer_writes(void)
 {
     const char * fcn_name = "check_buffer_writes(): ";
@@ -10461,16 +10461,16 @@ check_buffer_writes(void)
     HDmemcpy(filldata[3], "ZAB-ZAB-ZAB-ZAB-ZAB-ZAB-ZAB-ZA\n", 32);
     HDmemcpy(filldata[4], "ABC-ABC-ABC-ABC-ABC-ABC-ABC-ABC\n", 33);
     HDmemcpy(filldata[5], "BCD-BCD-BCD-BCD-BCD-BCD-BCD-BCD-\n", 34);
-    HDmemcpy(filldata[6], "12345-12345-12345-12345-12345-12345-12345-1234\n", 
+    HDmemcpy(filldata[6], "12345-12345-12345-12345-12345-12345-12345-1234\n",
 	     48);
-    HDmemcpy(filldata[7], "01234-01234-01234-01234-01234-01234-01234-01234\n", 
+    HDmemcpy(filldata[7], "01234-01234-01234-01234-01234-01234-01234-01234\n",
 	     49);
     HDmemcpy(filldata[8], "23456-23456-23456-23456-23456-23456-23456-23456-\n",
 	     50);
     HDmemcpy(filldata[9], "aaaa-bbbb-cccc-dddd-eeee-ffff-gggg-hhhh-iiii-jjjj-kkkk-llll-mmmm-nnnn-oooo-pppp-qqqq-rrrr-ssss\n", 96);
     HDmemcpy(filldata[10], "bbbb-cccc-dddd-eeee-ffff-gggg-hhhh-iiii-jjjj-kkkk-llll-mmmm-nnnn-oooo-pppp-qqqq-rrrr-ssss-tttt-\n", 97);
     HDmemcpy(filldata[11], "cccc-dddd-eeee-ffff-gggg-hhhh-iiii-jjjj-kkkk-llll-mmmm-nnnn-oooo-pppp-qqqq-rrrr-ssss-tttt-uuuu-v\n", 98);
-    
+
     /* Assert that size of data is as expected */
     HDassert(HDstrlen(filldata[0]) == 15);
     HDassert(HDstrlen(filldata[1]) == 16);
@@ -10487,9 +10487,9 @@ check_buffer_writes(void)
 
     /* Give structure its magic number */
     jbrb_struct.magic = H5C2__H5C2_JBRB_T_MAGIC;
-	
-    if ( show_progress ) /* 1 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+
+    if ( show_progress ) /* 1 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* setup the file name */
@@ -10504,25 +10504,25 @@ check_buffer_writes(void)
         } /* end if */
 
     } /* end if */
-	
-    if ( show_progress ) /* 2 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+
+    if ( show_progress ) /* 2 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal_magic */	    123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            16, 
-                               /* Number of Buffers */      3, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            16,
+                               /* Number of Buffers */      3,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -10545,24 +10545,24 @@ check_buffer_writes(void)
             failure_mssg2 = "H5C2_jb__write_header_entry failed";
         }
     }
-	
-    if ( show_progress ) /* 3 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+
+    if ( show_progress ) /* 3 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush and truncate journal file to get rid of the header
      * message for subsequent tests. */
     if ( pass2 ) {
-	
+
 	if ( H5C2_jb__flush(&jbrb_struct) != SUCCEED ) {
 
             pass2 = FALSE;
 	    failure_mssg2 = "H5C2_jb_flush failed";
 
-	} /* end if */	
+	} /* end if */
 
     } /* end if */
-	
+
     /* Truncate journal file */
     if ( pass2 ) {
 
@@ -10575,38 +10575,38 @@ check_buffer_writes(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 4 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 4 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* open journal file for reading */
     readback = fopen(filename, "r");
 
-    /* run a collection of calls to write_flush_verify(). These calls 
-     * write specific lengths of data into the journal buffers and 
-     * then flushes them to disk, and ensures that what makes it to 
-     * disk is as expected 
+    /* run a collection of calls to write_flush_verify(). These calls
+     * write specific lengths of data into the journal buffers and
+     * then flushes them to disk, and ensures that what makes it to
+     * disk is as expected
      */
 
     for (i=0; i<12; i++) {
 
-	write_flush_verify(&jbrb_struct, 
-			   (int)HDstrlen(filldata[i]), 
-			   filldata[i], 
+	write_flush_verify(&jbrb_struct,
+			   (int)HDstrlen(filldata[i]),
+			   filldata[i],
 			   readback);
 
 	if ( show_progress )
-	    HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+	    HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		      checkpoint++, (int)pass2);
 
     } /* end for */
 
-    /* run a collection of calls to write_noflush_verify(). These 
-     * calls write specific lengths of data into the journal buffers 
-     * multiple times, but only flushes at the end of the set of writes. 
-     * This tests to ensure that the automatic flush calls in 
-     * H5C2_jb__write_to_buffer are working properly. The routine then 
-     * ensures that what makes it it disk is as expected 
+    /* run a collection of calls to write_noflush_verify(). These
+     * calls write specific lengths of data into the journal buffers
+     * multiple times, but only flushes at the end of the set of writes.
+     * This tests to ensure that the automatic flush calls in
+     * H5C2_jb__write_to_buffer are working properly. The routine then
+     * ensures that what makes it it disk is as expected
      */
 
     /* Initialize repeat array to specify how many times to repeat each write
@@ -10631,13 +10631,13 @@ check_buffer_writes(void)
                              filldata[i],
                              readback,
                              repeatnum[i]);
-        
+
 	if ( show_progress )
-	    HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+	    HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		      checkpoint++, (int)pass2);
 
     } /* end for */
-    
+
     /* close journal file pointer */
     fclose(readback);
 
@@ -10685,7 +10685,7 @@ check_buffer_writes(void)
 /***************************************************************************
  * Function: 	write_flush_verify
  *
- * Purpose:  	Helper function for check_buffer_writes test. Writes a 
+ * Purpose:  	Helper function for check_buffer_writes test. Writes a
  *              piece of data of specified size into the journal buffer, then
  *              flushes the journal buffers. The data is read back and
  *              verified for correctness.
@@ -10694,19 +10694,19 @@ check_buffer_writes(void)
  *
  * Programmer: 	Mike McGreevy <mcgreevy@hdfgroup.org>
  *              Thursday, February 21, 2008
- * 
+ *
  **************************************************************************/
-static void 
-write_flush_verify(H5C2_jbrb_t * struct_ptr, 
-		   int size, 
-		   char * data, 
+static void
+write_flush_verify(H5C2_jbrb_t * struct_ptr,
+		   int size,
+		   char * data,
 		   FILE * readback)
 {
     char verify[150];
 
     if ( pass2 ) {
 
-	if ( H5C2_jb__write_to_buffer(struct_ptr, (size_t)size, 
+	if ( H5C2_jb__write_to_buffer(struct_ptr, (size_t)size,
 				      data, 0, (uint64_t)0) != SUCCEED ) {
 
 	    pass2 = FALSE;
@@ -10730,7 +10730,7 @@ write_flush_verify(H5C2_jbrb_t * struct_ptr,
     if ( pass2 ) {
 
 	fgets(verify, size+10, readback);
-		
+
 	if (HDstrcmp(verify, data) != 0) {
 
 	    pass2 = FALSE;
@@ -10749,10 +10749,10 @@ write_flush_verify(H5C2_jbrb_t * struct_ptr,
 /***************************************************************************
  * Function: 	write_noflush_verify
  *
- * Purpose:  	Helper function for check_buffer_writes test. Writes a 
+ * Purpose:  	Helper function for check_buffer_writes test. Writes a
  *              piece of data of specified size into the journal buffer
  *              multiple times, without calling H5C_jb__flush in between
- *              writes. After all writes are completed, H5C_jb__flush is 
+ *              writes. After all writes are completed, H5C_jb__flush is
  *              called, and the data is read back from the journal file and
  *              verified for correctness.
  *
@@ -10760,23 +10760,23 @@ write_flush_verify(H5C2_jbrb_t * struct_ptr,
  *
  * Programmer: 	Mike McGreevy <mcgreevy@hdfgroup.org>
  *              Thursday, February 21, 2008
- * 
+ *
  **************************************************************************/
-static void 
-write_noflush_verify(H5C2_jbrb_t * struct_ptr, 
-		     int size, 
-		     char * data, 
-		     FILE * readback, 
+static void
+write_noflush_verify(H5C2_jbrb_t * struct_ptr,
+		     int size,
+		     char * data,
+		     FILE * readback,
 		     int repeats)
 {
     int i;
-    char verify[150];	
+    char verify[150];
 
     for (i=0; i<repeats; i++) {
 
         if ( pass2 ) {
-	
-            if ( H5C2_jb__write_to_buffer(struct_ptr, (size_t)size, 
+
+            if ( H5C2_jb__write_to_buffer(struct_ptr, (size_t)size,
 				          data, 0, (uint64_t)0) != SUCCEED ) {
 
                 pass2 = FALSE;
@@ -10795,7 +10795,7 @@ write_noflush_verify(H5C2_jbrb_t * struct_ptr,
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb_flush failed";
 
-	} /* end if */	
+	} /* end if */
 
     } /* end if */
 
@@ -10836,11 +10836,11 @@ write_noflush_verify(H5C2_jbrb_t * struct_ptr,
  *		in which all white space is replaced with underscores.
  *
  * 		JRM -- 4/16/09
- *		Updated for the addition of new parameters to 
+ *		Updated for the addition of new parameters to
  *		H5C2_jb__init().
- * 
+ *
  **************************************************************************/
-static void 
+static void
 check_message_format(void)
 {
     const char * fcn_name = "check_message_format(): ";
@@ -10880,17 +10880,17 @@ check_message_format(void)
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal_magic */          123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            16, 
-                               /* Number of Buffers */      3, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            16,
+                               /* Number of Buffers */      3,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -10904,17 +10904,17 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 1 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 1 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Start a transaction */
     if ( pass2 ) {
 
-        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                        /* trans number */  (uint64_t)1) 
+        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                        /* trans number */  (uint64_t)1)
            != SUCCEED ) {
-    
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__start_transaction failed";
 
@@ -10922,20 +10922,20 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 2 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 2 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)1, 
-                                    /* base address */  (haddr_t)0, 
-                                    /* data length  */  1, 
-                                    /* data         */  (const uint8_t *)"A") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)1,
+                                    /* base address */  (haddr_t)0,
+                                    /* data length  */  1,
+                                    /* data         */  (const uint8_t *)"A")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -10943,20 +10943,20 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 3 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 3 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)1, 
-                                    /* base address */  (haddr_t)1, 
-                                    /* data length  */  2, 
-                                    /* data         */  (const uint8_t *)"AB") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)1,
+                                    /* base address */  (haddr_t)1,
+                                    /* data length  */  2,
+                                    /* data         */  (const uint8_t *)"AB")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -10964,20 +10964,20 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 4 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 4 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)1, 
-                                    /* base address */  (haddr_t)3, 
-                                    /* data length  */  4, 
-                                    /* data         */  (const uint8_t *)"CDEF") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)1,
+                                    /* base address */  (haddr_t)3,
+                                    /* data length  */  4,
+                                    /* data         */  (const uint8_t *)"CDEF")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -10985,34 +10985,34 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 5 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 5 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* End transaction */
     if ( pass2 ) {
-        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                      /* trans number */  (uint64_t)1) 
+        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                      /* trans number */  (uint64_t)1)
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 6 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 6 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Start a transaction */
     if ( pass2 ) {
 
-        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                        /* trans number */  (uint64_t)2) 
+        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                        /* trans number */  (uint64_t)2)
            != SUCCEED ) {
-    
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__start_transaction failed";
 
@@ -11020,20 +11020,20 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 7 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 7 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)2, 
-                                    /* base address */  (haddr_t)285, 
-                                    /* data length  */  11, 
-                                    /* data         */  (const uint8_t *)"Test Data?!") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)2,
+                                    /* base address */  (haddr_t)285,
+                                    /* data length  */  11,
+                                    /* data         */  (const uint8_t *)"Test Data?!")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -11041,31 +11041,31 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 8 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 8 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* End transaction */
     if ( pass2 ) {
-        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                      /* trans number */  (uint64_t)2) 
+        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                      /* trans number */  (uint64_t)2)
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 9 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 9 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -11117,8 +11117,8 @@ check_message_format(void)
         }
     }
 
-    if ( show_progress ) /* 10 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 10 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     if ( pass2 ) {
@@ -11146,9 +11146,9 @@ check_message_format(void)
 
                     if ( show_progress ) {
 
-                        HDfprintf(stdout, "verify[%d]       = \"%s\"\n", 
+                        HDfprintf(stdout, "verify[%d]       = \"%s\"\n",
                                   i, verify[i]);
-                        HDfprintf(stdout, "from_journal[%d] = \"%s\"\n", 
+                        HDfprintf(stdout, "from_journal[%d] = \"%s\"\n",
                                   i, from_journal[i]);
                     }
 
@@ -11160,7 +11160,7 @@ check_message_format(void)
             } /* end if */
 
         } /* end for */
- 
+
         fclose(readback);
     }
 
@@ -11176,17 +11176,17 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 11 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 11 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Start a transaction */
     if ( pass2 ) {
 
-        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                        /* trans number */  (uint64_t)3) 
+        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                        /* trans number */  (uint64_t)3)
            != SUCCEED ) {
-    
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__start_transaction failed";
 
@@ -11194,20 +11194,20 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 12 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 12 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)3, 
-                                    /* base address */  (haddr_t)28591, 
-                                    /* data length  */  6, 
-                                    /* data         */  (const uint8_t *)"#1nN`}") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)3,
+                                    /* base address */  (haddr_t)28591,
+                                    /* data length  */  6,
+                                    /* data         */  (const uint8_t *)"#1nN`}")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -11215,65 +11215,65 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 13 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 13 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* End transaction */
     if ( pass2 ) {
-        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                      /* trans number */  (uint64_t)3) 
+        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                      /* trans number */  (uint64_t)3)
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 14 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 14 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Add a comment */
     if ( pass2 ) {
-        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct, 
-                              /* comment message */  "This is a comment!") 
+        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct,
+                              /* comment message */  "This is a comment!")
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__comment failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 14 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 14 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Add a comment */
     if ( pass2 ) {
-        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct, 
-                              /* comment message */  "This is another comment!") 
+        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct,
+                              /* comment message */  "This is another comment!")
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__comment failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 14 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 14 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -11326,8 +11326,8 @@ check_message_format(void)
         }
     }
 
-    if ( show_progress ) /* 15 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 15 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     if ( pass2 ) {
@@ -11352,9 +11352,9 @@ check_message_format(void)
 
                     if ( show_progress ) {
 
-                        HDfprintf(stdout, "verify[%d]       = \"%s\"\n", 
+                        HDfprintf(stdout, "verify[%d]       = \"%s\"\n",
                                   i, verify[i]);
-                        HDfprintf(stdout, "from_journal[%d] = \"%s\"\n", 
+                        HDfprintf(stdout, "from_journal[%d] = \"%s\"\n",
                                   i, from_journal[i]);
                     }
 
@@ -11394,8 +11394,8 @@ check_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 16 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 16 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* report pass / failure information */
@@ -11417,7 +11417,7 @@ check_message_format(void)
 /***************************************************************************
  * Function: 	check_binary_message_format
  *
- * Purpose:  	Verify that the functions that write binary messages into 
+ * Purpose:  	Verify that the functions that write binary messages into
  *		the journal buffers actually write the correct messages.
  *
  *		Note that this test was hacked from Mike's similar test
@@ -11430,10 +11430,10 @@ check_message_format(void)
  *              5/2/09
  *
  * Changes:	None.
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_binary_message_format(void)
 {
     const char * fcn_name = "check_binary_message_format()";
@@ -11471,17 +11471,17 @@ check_binary_message_format(void)
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal_magic */          123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            16, 
-                               /* Number of Buffers */      3, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            16,
+                               /* Number of Buffers */      3,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ FALSE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -11495,17 +11495,17 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 1 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 1 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Start a transaction */
     if ( pass2 ) {
 
-        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                        /* trans number */  (uint64_t)1) 
+        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                        /* trans number */  (uint64_t)1)
            != SUCCEED ) {
-    
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__start_transaction failed";
 
@@ -11513,20 +11513,20 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 2 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 2 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)1, 
-                                    /* base address */  (haddr_t)0, 
-                                    /* data length  */  1, 
-                                    /* data         */  (const uint8_t *)"A") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)1,
+                                    /* base address */  (haddr_t)0,
+                                    /* data length  */  1,
+                                    /* data         */  (const uint8_t *)"A")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -11534,17 +11534,17 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 3 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 3 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write an eoa message */
     if ( pass2 ) {
 
-        if ( H5C2_jb__eoa(/* H5C2_jbrb_t */  &jbrb_struct, 
+        if ( H5C2_jb__eoa(/* H5C2_jbrb_t */  &jbrb_struct,
                           /* eoa         */  (haddr_t)0x01020304)
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__eoa failed(1)";
 
@@ -11552,20 +11552,20 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 4 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 4 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)1, 
-                                    /* base address */  (haddr_t)1, 
-                                    /* data length  */  2, 
-                                    /* data         */  (const uint8_t *)"AB") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)1,
+                                    /* base address */  (haddr_t)1,
+                                    /* data length  */  2,
+                                    /* data         */  (const uint8_t *)"AB")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -11573,20 +11573,20 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 5 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 5 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)1, 
-                                    /* base address */  (haddr_t)3, 
-                                    /* data length  */  4, 
-                                    /* data         */  (const uint8_t *)"CDEF") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)1,
+                                    /* base address */  (haddr_t)3,
+                                    /* data length  */  4,
+                                    /* data         */  (const uint8_t *)"CDEF")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -11594,34 +11594,34 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 6 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 6 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
- 
+
     /* End transaction */
     if ( pass2 ) {
-        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                      /* trans number */  (uint64_t)1) 
+        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                      /* trans number */  (uint64_t)1)
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction failed (1)";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 7 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 7 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write an eoa message */
     if ( pass2 ) {
 
-        if ( H5C2_jb__eoa(/* H5C2_jbrb_t */  &jbrb_struct, 
+        if ( H5C2_jb__eoa(/* H5C2_jbrb_t */  &jbrb_struct,
                           /* eoa         */  (haddr_t)0x0102030405)
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__eoa failed(2)";
 
@@ -11629,17 +11629,17 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 8 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 8 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Start a transaction */
     if ( pass2 ) {
 
-        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                        /* trans number */  (uint64_t)2) 
+        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                        /* trans number */  (uint64_t)2)
            != SUCCEED ) {
-    
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__start_transaction failed";
 
@@ -11647,20 +11647,20 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 9 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 9 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                    /* trans number */  (uint64_t)2, 
-                                    /* base address */  (haddr_t)285, 
-                                    /* data length  */  11, 
-                                    /* data         */  (const uint8_t *)"Test Data?!") 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                    /* trans number */  (uint64_t)2,
+                                    /* base address */  (haddr_t)285,
+                                    /* data length  */  11,
+                                    /* data         */  (const uint8_t *)"Test Data?!")
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -11668,31 +11668,31 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 10 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 10 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* End transaction */
     if ( pass2 ) {
-        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                      /* trans number */  (uint64_t)2) 
+        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                      /* trans number */  (uint64_t)2)
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction failed (2)";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 11 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 11 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -11744,8 +11744,8 @@ check_binary_message_format(void)
         }
     }
 
-    if ( show_progress ) /* 12 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 12 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     if ( pass2 ) {
@@ -11756,8 +11756,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_1[] =
         {
             /* mssg 1: begin transaction 1 */
-                /* header:    */ 'b', 't', 'r', 'n', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'b', 't', 'r', 'n',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_1_len = 13;
@@ -11766,7 +11766,7 @@ check_binary_message_format(void)
         {
             /* mssg 2: journal entry */
                 /* header:    */ 'j', 'e', 'n', 't',
-                /* version:   */ 0x00, 
+                /* version:   */ 0x00,
                 /* trans num: */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* base addr: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* length:    */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11778,8 +11778,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_3[] =
         {
             /* mssg 3: eoas */
-                /* header:    */ 'e', 'o', 'a', 's', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'e', 'o', 'a', 's',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_3_len = 13;
@@ -11788,7 +11788,7 @@ check_binary_message_format(void)
         {
             /* mssg 4: journal entry */
                 /* header:    */ 'j', 'e', 'n', 't',
-                /* version:   */ 0x00, 
+                /* version:   */ 0x00,
                 /* trans num: */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* base addr: */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* length:    */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11801,7 +11801,7 @@ check_binary_message_format(void)
         {
             /* mssg 5: journal entry */
                 /* header:    */ 'j', 'e', 'n', 't',
-                /* version:   */ 0x00, 
+                /* version:   */ 0x00,
                 /* trans num: */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* base addr: */ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* length:    */ 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11813,8 +11813,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_6[] =
         {
             /* mssg 6: end transaction 1 */
-                /* header:    */ 'e', 't', 'r', 'n', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'e', 't', 'r', 'n',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_6_len = 13;
@@ -11822,8 +11822,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_7[] =
         {
             /* mssg 7: eoas */
-                /* header:    */ 'e', 'o', 'a', 's', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'e', 'o', 'a', 's',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00
         };
         int expected_msg_7_len = 13;
@@ -11831,8 +11831,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_8[] =
         {
             /* mssg 8: begin transaction 2 */
-                /* header:    */ 'b', 't', 'r', 'n', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'b', 't', 'r', 'n',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_8_len = 13;
@@ -11841,11 +11841,11 @@ check_binary_message_format(void)
         {
             /* mssg 9: journal entry */
                 /* h9ader:    */ 'j', 'e', 'n', 't',
-                /* version:   */ 0x00, 
+                /* version:   */ 0x00,
                 /* trans num: */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* base addr: */ 0x1d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* length:    */ 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                /* body:      */ 'T', 'e', 's', 't', ' ', 'D', 'a', 't', 
+                /* body:      */ 'T', 'e', 's', 't', ' ', 'D', 'a', 't',
                                  'a', '?', '!',
                 /* chksum:    */ 0x01, 0x7f, 0xf3, 0x43
         };
@@ -11854,13 +11854,13 @@ check_binary_message_format(void)
         uint8_t expected_msg_10[] =
         {
             /* mssg 10: end transaction 2 */
-                /* header:    */ 'e', 't', 'r', 'n', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'e', 't', 'r', 'n',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_10_len = 13;
 
-       
+
         sprintf(expected_header, "0 ver_num 1 target_file_name HDF5.file journal_magic 123 creation_date %10.10s human_readable 0 offset_width 8 length_width 8\n", time_buf);
         expected_header_len = HDstrlen(expected_header);
 
@@ -11868,14 +11868,14 @@ check_binary_message_format(void)
 
             pass2 = FALSE;
             failure_mssg2 = "Can't open journal file for test (1).";
- 
-        } 
-        
+
+        }
+
         if ( pass2 ) {
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ (uint8_t *)expected_header, 
+		/* fd                   */ fd,
+                /* expected_msg         */ (uint8_t *)expected_header,
                 /* expected msg len     */ expected_header_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual headers differ.",
@@ -11884,8 +11884,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_1, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_1,
                 /* expected msg len     */ expected_msg_1_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 1 differ.",
@@ -11894,8 +11894,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_2, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_2,
                 /* expected msg len     */ expected_msg_2_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 2 differ.",
@@ -11904,8 +11904,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_3, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_3,
                 /* expected msg len     */ expected_msg_3_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 3 differ.",
@@ -11914,8 +11914,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_4, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_4,
                 /* expected msg len     */ expected_msg_4_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 4 differ.",
@@ -11924,8 +11924,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_5, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_5,
                 /* expected msg len     */ expected_msg_5_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 5 differ.",
@@ -11934,8 +11934,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_6, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_6,
                 /* expected msg len     */ expected_msg_6_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 6 differ.",
@@ -11944,8 +11944,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_7, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_7,
                 /* expected msg len     */ expected_msg_7_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg7 differ.",
@@ -11954,8 +11954,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_8, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_8,
                 /* expected msg len     */ expected_msg_8_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 8 differ.",
@@ -11964,8 +11964,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_9, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_9,
                 /* expected msg len     */ expected_msg_9_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 9 differ.",
@@ -11974,8 +11974,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_10, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_10,
                 /* expected msg len     */ expected_msg_10_len,
                 /* last_msg             */ TRUE,
                 /* mismatch failure msg */ "expected and actual msg 10 differ.",
@@ -12003,17 +12003,17 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 13 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 13 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write an eoa message */
     if ( pass2 ) {
 
-        if ( H5C2_jb__eoa(/* H5C2_jbrb_t */ &jbrb_struct, 
+        if ( H5C2_jb__eoa(/* H5C2_jbrb_t */ &jbrb_struct,
                           /* eoa         */ (haddr_t)0x010203040506)
              != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__eoa failed(3)";
 
@@ -12021,17 +12021,17 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 14 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 14 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Start a transaction */
     if ( pass2 ) {
 
-        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                        /* trans number */  (uint64_t)3) 
+        if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                        /* trans number */  (uint64_t)3)
            != SUCCEED ) {
-    
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__start_transaction failed";
 
@@ -12039,20 +12039,20 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 15 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 15 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Write a journal entry */
     if ( pass2 ) {
 
-        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                 /* trans number */  (uint64_t)3, 
-                                 /* base address */  (haddr_t)28591, 
-                                 /* data length  */  6, 
+        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                 /* trans number */  (uint64_t)3,
+                                 /* base address */  (haddr_t)28591,
+                                 /* data length  */  6,
                                  /* data         */  (const uint8_t *)"#1nN`}" )
              != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__journal_entry failed";
 
@@ -12060,65 +12060,65 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 16 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 16 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* End transaction */
     if ( pass2 ) {
-        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct, 
-                                      /* trans number */  (uint64_t)3) 
+        if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t  */  &jbrb_struct,
+                                      /* trans number */  (uint64_t)3)
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction failed (3)";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 17 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 17 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Add a comment */
     if ( pass2 ) {
-        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct, 
-                              /* comment message */  "This is a comment!") 
+        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct,
+                              /* comment message */  "This is a comment!")
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__comment failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 18 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 18 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Add a comment */
     if ( pass2 ) {
-        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct, 
-                              /* comment message */  "This is another comment!") 
+        if ( H5C2_jb__comment(/* H5C2_jbrb_t     */  &jbrb_struct,
+                              /* comment message */  "This is another comment!")
            != SUCCEED ) {
 
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__comment failed";
-            
+
         } /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 19 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 19 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -12171,8 +12171,8 @@ check_binary_message_format(void)
         }
     }
 
-    if ( show_progress ) /* 20 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 20 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     if ( pass2 ) {
@@ -12183,8 +12183,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_11[] =
         {
             /* mssg 11: eoas */
-                /* header:    */ 'e', 'o', 'a', 's', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'e', 'o', 'a', 's',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00
         };
         int expected_msg_11_len = 13;
@@ -12193,8 +12193,8 @@ check_binary_message_format(void)
         uint8_t expected_msg_12[] =
         {
             /* mssg 12: begin transaction 3 */
-                /* header:    */ 'b', 't', 'r', 'n', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'b', 't', 'r', 'n',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_12_len = 13;
@@ -12203,7 +12203,7 @@ check_binary_message_format(void)
         {
             /* mssg 13: journal entry */
                 /* header:    */ 'j', 'e', 'n', 't',
-                /* version:   */ 0x00, 
+                /* version:   */ 0x00,
                 /* trans num: */ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* base addr: */ 0xaf, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                 /* length:    */ 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12215,12 +12215,12 @@ check_binary_message_format(void)
         uint8_t expected_msg_14[] =
         {
             /* mssg 14: end transaction 1 */
-                /* header:    */ 'e', 't', 'r', 'n', 
-                /* version:   */ 0x00, 
+                /* header:    */ 'e', 't', 'r', 'n',
+                /* version:   */ 0x00,
                 /* trans num: */ 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
         int expected_msg_14_len = 13;
-       
+
         sprintf(expected_header, "0 ver_num 1 target_file_name HDF5.file journal_magic 123 creation_date %10.10s human_readable 0 offset_width 8 length_width 8\n", time_buf);
         expected_header_len = HDstrlen(expected_header);
 
@@ -12228,14 +12228,14 @@ check_binary_message_format(void)
 
             pass2 = FALSE;
             failure_mssg2 = "Can't open journal file for test (2).";
- 
-        } 
+
+        }
 
         if ( pass2 ) {
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ (uint8_t *)expected_header, 
+		/* fd                   */ fd,
+                /* expected_msg         */ (uint8_t *)expected_header,
                 /* expected msg len     */ expected_header_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual headers differ.",
@@ -12244,8 +12244,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_11, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_11,
                 /* expected msg len     */ expected_msg_11_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 11 differ.",
@@ -12254,8 +12254,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_12, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_12,
                 /* expected msg len     */ expected_msg_12_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 12 differ.",
@@ -12264,8 +12264,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_13, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_13,
                 /* expected msg len     */ expected_msg_13_len,
                 /* last_msg             */ FALSE,
                 /* mismatch failure msg */ "expected and actual msg 13 differ.",
@@ -12274,8 +12274,8 @@ check_binary_message_format(void)
                 /* not last msg failure */ NULL);
 
             verify_journal_msg(
-		/* fd                   */ fd, 
-                /* expected_msg         */ expected_msg_14, 
+		/* fd                   */ fd,
+                /* expected_msg         */ expected_msg_14,
                 /* expected msg len     */ expected_msg_14_len,
                 /* last_msg             */ TRUE,
                 /* mismatch failure msg */ "expected and actual msg 14 differ.",
@@ -12316,8 +12316,8 @@ check_binary_message_format(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 20 */ 
-	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 20 */
+	HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
 		  checkpoint++, (int)pass2);
 
     /* report pass / failure information */
@@ -12339,7 +12339,7 @@ check_binary_message_format(void)
 /***************************************************************************
  * Function: 	verify_journal_msg
  *
- * Purpose:  	Verify that the supplied expected journal message is 
+ * Purpose:  	Verify that the supplied expected journal message is
  *		the next in the message in the indicated journal file.
  *
  *		Do nothing it the expected message matches the file
@@ -12353,7 +12353,7 @@ check_binary_message_format(void)
  * Programmer:  J Mainzer
  *
  * Changes:	None.
- * 
+ *
  **************************************************************************/
 
 static void
@@ -12387,7 +12387,7 @@ verify_journal_msg(int fd,
         }
     }
 
-    while ( ( pass2 ) && ( i < expected_msg_len ) ) 
+    while ( ( pass2 ) && ( i < expected_msg_len ) )
     {
         ret_val = read(fd, (void *)(&ch), (size_t)1);
 
@@ -12424,7 +12424,7 @@ verify_journal_msg(int fd,
 
             if ( verbose ) {
 
-                HDfprintf(stdout, "%s: read returned unexpected value (%d).\n", 
+                HDfprintf(stdout, "%s: read returned unexpected value (%d).\n",
                           fcn_name, (int)ret_val);
             }
 
@@ -12434,7 +12434,7 @@ verify_journal_msg(int fd,
         }
 
         i++;
-            
+
     }
 
     if ( ( pass2 ) && ( last_msg ) ) {
@@ -12469,12 +12469,12 @@ verify_journal_msg(int fd,
  *              Tuesday, February 26, 2008
  *
  * Changes:	JRM -- 4/16/09
- *		Updated for the addition of new parameters to 
+ *		Updated for the addition of new parameters to
  *		H5C2_jb__init().
- * 
+ *
  **************************************************************************/
 
-static void 
+static void
 check_legal_calls(void)
 {
     const char * fcn_name = "check_legal_calls(): ";
@@ -12504,24 +12504,24 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 1 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 1 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Initialize H5C2_jbrb_t structure. This call should SUCCEED. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal magic */	    123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            4000, 
-                               /* Number of Buffers */      3, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            4000,
+                               /* Number of Buffers */      3,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -12535,20 +12535,20 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 2 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 2 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 #if 0
     /* Start transaction 2. This should FAIL because transaction 1 has
-       not occurred yet. Ensure that it fails, and flag an error if it 
+       not occurred yet. Ensure that it fails, and flag an error if it
        does not. */
-    /* transaction numbers need not be sequential, only monitonically 
+    /* transaction numbers need not be sequential, only monitonically
      * increasing -- thus this is not an error any more.
      *                                                    -- JRM
      */
     if ( pass2 ) {
 
-	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                         /* Transaction # */  (uint64_t)2)
            == SUCCEED ) {
 
@@ -12557,41 +12557,41 @@ check_legal_calls(void)
 
 	} /* end if */
 
-    } /* end if */ 
+    } /* end if */
 #endif
-    if ( show_progress ) /* 3 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 3 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* End transaction 1. This should FAIL because transaction 1 has
-       not started yet. Ensure that it fails, and flag an error if it 
+       not started yet. Ensure that it fails, and flag an error if it
        does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                       /* Transaction # */  (uint64_t)1)
            == SUCCEED ) {
-        
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__end_transaction should have failed";
- 
+
 	} /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 4 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 4 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Attempt to write a journal entry before transaction has started..
-       This should FAIL because transaction 1 has not started yet. Ensure 
+       This should FAIL because transaction 1 has not started yet. Ensure
        that it fails, and flag an error if it does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct,
                                     /* Transaction # */  (uint64_t)1,
-                                    /* Base Address  */  (haddr_t)123456789, 
-                                    /* Length        */  16, 
+                                    /* Base Address  */  (haddr_t)123456789,
+                                    /* Length        */  16,
                                     /* Body          */  (const uint8_t *)"This should fail")
            == SUCCEED ) {
 
@@ -12602,14 +12602,14 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 5 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 5 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Start transaction 1. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                         /* Transaction # */  (uint64_t)1)
            != SUCCEED ) {
 
@@ -12620,16 +12620,16 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 6 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 6 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
-    /* Attempt to start transaction 1 again. This should FAIL because 
+    /* Attempt to start transaction 1 again. This should FAIL because
        transaction 1 is already open. Ensure that it fails, and flag an
        error if it does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                         /* Transaction # */  (uint64_t)1)
            == SUCCEED ) {
 
@@ -12640,15 +12640,15 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 7 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 7 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
-    /* Attempt to end transaction 1. This should FAIL because no 
+    /* Attempt to end transaction 1. This should FAIL because no
        journal entry has been written under this transaction. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                       /* Transaction # */  (uint64_t)1)
            == SUCCEED ) {
 
@@ -12659,19 +12659,19 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 8 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 8 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Attempt to write a journal entry into the wrong transaction number.
-       This should FAIL because specified transaction number isn't in 
+       This should FAIL because specified transaction number isn't in
        progress. Ensure that it fails, and flag an error if it does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct,
                                     /* Transaction # */  (uint64_t)2,
-                                    /* Base Address  */  (haddr_t)123456789, 
-                                    /* Length        */  16, 
+                                    /* Base Address  */  (haddr_t)123456789,
+                                    /* Length        */  16,
                                     /* Body          */  (const uint8_t *)"This should fail")
            == SUCCEED ) {
 
@@ -12682,17 +12682,17 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 9 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 9 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write a journal entry during transaction 1. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct,
                                     /* Transaction # */  (uint64_t)1,
-                                    /* Base Address  */  (haddr_t)123456789, 
-                                    /* Length        */  51, 
+                                    /* Base Address  */  (haddr_t)123456789,
+                                    /* Length        */  51,
                                     /* Body          */  (const uint8_t *)"This is the first transaction during transaction 1.")
            != SUCCEED ) {
 
@@ -12703,8 +12703,8 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 10 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 10 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Attempt to flush buffers. This should FAIL because a transaction
@@ -12712,7 +12712,7 @@ check_legal_calls(void)
        if it does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
              == SUCCEED ) {
 
 	    pass2 = FALSE;
@@ -12722,14 +12722,14 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 11 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 11 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* End transaction 1. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                       /* Transaction # */  (uint64_t)1)
            != SUCCEED ) {
 
@@ -12740,8 +12740,8 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 12 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 12 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Attempt to start transaction 1 again. This should FAIL because
@@ -12749,7 +12749,7 @@ check_legal_calls(void)
        an error if it does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                         /* Transaction # */  (uint64_t)1)
            == SUCCEED ) {
 
@@ -12760,14 +12760,14 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 13 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 13 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Start transaction 2. This should SUCCEED.*/
     if ( pass2 ) {
 
-	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                         /* Transaction # */  (uint64_t)2)
            != SUCCEED ) {
 
@@ -12778,17 +12778,17 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 14 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 14 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write a journal entry during transaction 2. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct,
                                     /* Transaction # */  (uint64_t)2,
-                                    /* Base Address  */  (haddr_t)7465, 
-                                    /* Length        */  51, 
+                                    /* Base Address  */  (haddr_t)7465,
+                                    /* Length        */  51,
                                     /* Body          */  (const uint8_t *)"This is the first transaction during transaction 2!")
            != SUCCEED ) {
 
@@ -12799,47 +12799,47 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 15 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 15 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write a journal entry during transaction 2. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  &jbrb_struct,
                                     /* Transaction # */  (uint64_t)2,
-                                    /* Base Address  */  (haddr_t)123456789, 
-                                    /* Length        */  60, 
+                                    /* Base Address  */  (haddr_t)123456789,
+                                    /* Length        */  60,
                                     /* Body          */  (const uint8_t *)"... And here's your second transaction during transaction 2.")
            != SUCCEED ) {
 
 	    pass2 = FALSE;
 	    failure_mssg2 = "H5C2_jb__journal_entry failed";
- 
+
 	} /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 16 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 16 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* End transaction 2. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct, 
+	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  &jbrb_struct,
                                       /* Transaction # */  (uint64_t)2)
            != SUCCEED ) {
 
 	    pass2 = FALSE;
 	    failure_mssg2 = "H5C2_jb__end_transaction failed";
-  
+
 	} /* end if */
 
     } /* end if */
 
-    if ( show_progress ) /* 17 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 17 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Attempt to truncate the journal file. This should FAIL because the
@@ -12847,7 +12847,7 @@ check_legal_calls(void)
        flag and error if it does not. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct)
            == SUCCEED ) {
 
             pass2 = FALSE;
@@ -12857,16 +12857,16 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 18 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 18 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
-    /* Attempt to take down the ring buffer. This should FAIL because the 
+    /* Attempt to take down the ring buffer. This should FAIL because the
        journal buffers have not been flushed yet. Ensure that it fails, and
        flag and error if it does not. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            == SUCCEED) {
 
 	    pass2 = FALSE;
@@ -12876,14 +12876,14 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 19 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 19 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -12893,16 +12893,16 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 20 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 20 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
-    /* Attempt to take down the ring buffer. This should FAIL because the 
+    /* Attempt to take down the ring buffer. This should FAIL because the
        journal file has not been truncated. Ensure that it fails, and
        flag and error if it does not. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            == SUCCEED) {
 
 	    pass2 = FALSE;
@@ -12912,14 +12912,14 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 21 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 21 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Truncate the journal file. This should SUCCEED. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -12929,25 +12929,25 @@ check_legal_calls(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 22 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 22 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Take down the journal file. This should SUCCEED. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED) {
 
 	    pass2 = FALSE;
 	    failure_mssg2 = "H5C2_jb__takedown failed";
- 
+
 	} /* end if */
 
    } /* end if */
 
-    if ( show_progress ) /* 23 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 23 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* report pass / failure information */
@@ -12971,7 +12971,7 @@ check_legal_calls(void)
  * Function: 	check_transaction_tracking
  *
  * Purpose:  	Verify that the ring buffer successfully tracks when
- *              transactions make it to disk. 
+ *              transactions make it to disk.
  *
  * Return:      void
  *
@@ -12979,11 +12979,11 @@ check_legal_calls(void)
  *              Tuesday, February 26, 2008
  *
  * Changes:	JRM -- 4/16/09
- *		Updated for the addition of new parameters to 
+ *		Updated for the addition of new parameters to
  *		H5C2_jb__init().
- * 
+ *
  **************************************************************************/
-static void 
+static void
 check_transaction_tracking(void)
 {
     const char * fcn_name = "check_transaction_tracking(): ";
@@ -13012,8 +13012,8 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 1 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 1 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Give structure its magic number */
@@ -13023,7 +13023,7 @@ check_transaction_tracking(void)
      * First ring buffer configuration.
      * 4 Buffers, each size 250.
      * Writing transactions of size 100.
-     * Test cases: 
+     * Test cases:
      *     - writing multiple transactions in each buffer
      *     - writing end transaction message to exact end
      *       of a journal buffer, as well as the exact end
@@ -13033,17 +13033,17 @@ check_transaction_tracking(void)
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal magic */	    123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            250, 
-                               /* Number of Buffers */      4, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            250,
+                               /* Number of Buffers */      4,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -13059,7 +13059,7 @@ check_transaction_tracking(void)
 
 
     /* H5C2_jb__init() no longer generates the header message -- instead
-     * it is generated by the first real journal entry.  This causes 
+     * it is generated by the first real journal entry.  This causes
      * problems in this test, so generate the header message manually
      * and then flush it.
      */
@@ -13073,14 +13073,14 @@ check_transaction_tracking(void)
     }
 
 
-    if ( show_progress ) /* 2 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 2 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13090,8 +13090,8 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 3 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 3 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write journal entries and verify that the transactions that get to
@@ -13116,20 +13116,20 @@ check_transaction_tracking(void)
        the expected_tval array */
     for (i = 1; i < 11; i++) {
 
-        write_verify_trans_num(/* H5C2_jbrb_t   */ &jbrb_struct, 
-                           /* transaction num */ (uint64_t)i, 
+        write_verify_trans_num(/* H5C2_jbrb_t   */ &jbrb_struct,
+                           /* transaction num */ (uint64_t)i,
                            /* expected trans */(uint64_t)expected_tval[i]);
 
     } /* end for */
 
-    if ( show_progress ) /* 4 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 4 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13142,7 +13142,7 @@ check_transaction_tracking(void)
     /* Truncate the journal file. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13155,7 +13155,7 @@ check_transaction_tracking(void)
     /* Take down the journal file. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED) {
 
 	    pass2 = FALSE;
@@ -13165,15 +13165,15 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 5 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 5 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* ===================================================
      * Second ring buffer configuration
      * 4 Buffers, each size 100.
      * Writing transactions of size 100.
-     * Test cases: 
+     * Test cases:
      *     - end transaction messages appear on buffer
      *       boundaries.
      * =================================================== */
@@ -13181,17 +13181,17 @@ check_transaction_tracking(void)
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal magic */	    123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            100, 
-                               /* Number of Buffers */      4, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            100,
+                               /* Number of Buffers */      4,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -13218,7 +13218,7 @@ check_transaction_tracking(void)
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13228,30 +13228,30 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 6 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 6 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write journal entries and verify that the transactions that get to
        disk are accurately reported after each write. The following tests the
-       case where end transaction messages hit exactly at the end of the 
+       case where end transaction messages hit exactly at the end of the
        ring buffer. */
     for (i=1; i<20; i++) {
 
-        write_verify_trans_num(/* H5C2_ujbrb_t */&jbrb_struct, 
-                               /* transaction num */(uint64_t)i, 
+        write_verify_trans_num(/* H5C2_ujbrb_t */&jbrb_struct,
+                               /* transaction num */(uint64_t)i,
                                /* expected trans on disk */(uint64_t)i);
 
     } /* end for */
 
-    if ( show_progress ) /* 7 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 7 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13264,7 +13264,7 @@ check_transaction_tracking(void)
     /* Truncate the journal file. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13277,7 +13277,7 @@ check_transaction_tracking(void)
     /* Take down the journal file. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED) {
 
 	    pass2 = FALSE;
@@ -13291,29 +13291,29 @@ check_transaction_tracking(void)
      * Third ring buffer configuration
      * 10 Buffers, each size 30.
      * Writing transactions of size 100.
-     * Test cases: 
+     * Test cases:
      *     - end transaction messages start in one buffer
      *       and end in the following buffer.
-     *     - end transaction messages start in the last 
+     *     - end transaction messages start in the last
      *       buffer and loop around to the first buffer.
-     *     - multiple buffers are filled between end 
+     *     - multiple buffers are filled between end
      *       transaction messages.
      * =================================================== */
 
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
                                /* journal_magic */	    123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            30, 
-                               /* Number of Buffers */      10, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            30,
+                               /* Number of Buffers */      10,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -13338,14 +13338,14 @@ check_transaction_tracking(void)
     }
 
 
-    if ( show_progress ) /* 8 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 8 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13355,8 +13355,8 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 9 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 9 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write journal entries and verify that the transactions that get to
@@ -13364,54 +13364,54 @@ check_transaction_tracking(void)
        case where end transaction messages start in one buffer and end in
        another buffer. Also tests the case where one transaction ends several
        buffers ahead of the next transaction end. */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)1, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)1,
 			   (uint64_t)0); /* 1 in bufs, 0 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)2, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)2,
 			   (uint64_t)1); /* 2 in bufs, 1 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)3, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)3,
 			   (uint64_t)3); /* nothing in bufs, 3 on disk */
-    H5C2_jb__write_to_buffer(&jbrb_struct, 10, "XXXXXXXXX\n", 0, (uint64_t)0);   
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)4, 
+    H5C2_jb__write_to_buffer(&jbrb_struct, 10, "XXXXXXXXX\n", 0, (uint64_t)0);
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)4,
 			   (uint64_t)3); /* 1 in bufs, 0 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)5, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)5,
 			   (uint64_t)5); /* 2 in bufs, 1 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)6, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)6,
 			   (uint64_t)5); /* nothing in bufs, 3 on disk */
-    H5C2_jb__write_to_buffer(&jbrb_struct, 10, "XXXXXXXXX\n", 0, (uint64_t)0);   
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)7, 
+    H5C2_jb__write_to_buffer(&jbrb_struct, 10, "XXXXXXXXX\n", 0, (uint64_t)0);
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)7,
 			   (uint64_t)7); /* 1 in bufs, 0 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)8, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)8,
 			   (uint64_t)7); /* 2 in bufs, 1 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)9, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)9,
 			   (uint64_t)8); /* nothing in bufs, 3 on disk */
-    H5C2_jb__write_to_buffer(&jbrb_struct, 10, "XXXXXXXXX\n", 0, (uint64_t)0);   
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)10, 
+    H5C2_jb__write_to_buffer(&jbrb_struct, 10, "XXXXXXXXX\n", 0, (uint64_t)0);
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)10,
 			   (uint64_t)9); /* 1 in bufs, 0 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)11, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)11,
 			   (uint64_t)10); /* 2 in bufs, 1 on disk */
-    write_verify_trans_num(&jbrb_struct, 
-		           (uint64_t)12, 
+    write_verify_trans_num(&jbrb_struct,
+		           (uint64_t)12,
 			   (uint64_t)12); /* nothing in buf, 3 on disk */
 
-    if ( show_progress ) /* 10 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 10 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13424,7 +13424,7 @@ check_transaction_tracking(void)
     /* Truncate the journal file. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13437,7 +13437,7 @@ check_transaction_tracking(void)
     /* Take down the journal file. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED) {
 
 	    pass2 = FALSE;
@@ -13451,8 +13451,8 @@ check_transaction_tracking(void)
      * Fourth ring buffer configuration
      * 35 Buffers, each size 1.
      * Writing transactions of size 100.
-     * Test cases: 
-     *     - end transaction messages are longer than the 
+     * Test cases:
+     *     - end transaction messages are longer than the
      *       entire ring buffer structure. note this is an
      *       extreme corner case situation as buffer sizes
      *       should generally be much larger than an end
@@ -13462,17 +13462,17 @@ check_transaction_tracking(void)
     /* Initialize H5C2_jbrb_t structure. */
     if ( pass2 ) {
 
-        /* Note that the sizeof_addr & sizeof_size parameters are 
+        /* Note that the sizeof_addr & sizeof_size parameters are
          * ignored when human_readable is TRUE.
          */
 
-       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct, 
+       	result = H5C2_jb__init(/* H5C2_jbrb_t */            &jbrb_struct,
 			       /* journal_magic */	    123,
                                /* HDF5 file name */         HDF5_FILE_NAME,
-                               /* journal file name */      filename, 
-                               /* Buffer size */            1, 
-                               /* Number of Buffers */      35, 
-                               /* Use Synchronois I/O */    FALSE, 
+                               /* journal file name */      filename,
+                               /* Buffer size */            1,
+                               /* Number of Buffers */      35,
+                               /* Use Synchronois I/O */    FALSE,
                                /* human readable journal */ TRUE,
                                /* sizeof_addr */            8,
                                /* sizeof_size */            8);
@@ -13500,7 +13500,7 @@ check_transaction_tracking(void)
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13510,8 +13510,8 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 11 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 11 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Write journal entries and verify that the transactions that get to
@@ -13520,20 +13520,20 @@ check_transaction_tracking(void)
        ensures that the trans_tracking array is properly propogated */
     for (i=1; i<5; i++) {
 
-        write_verify_trans_num(/* H5C2_jbrb_t */  &jbrb_struct, 
-                               /* transaction num */  (uint64_t)i, 
+        write_verify_trans_num(/* H5C2_jbrb_t */  &jbrb_struct,
+                               /* transaction num */  (uint64_t)i,
                                /* expected returned trans */  (uint64_t)i);
 
     } /* end for */
 
-    if ( show_progress ) /* 12 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 12 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* Flush the journal buffers. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__flush(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13546,7 +13546,7 @@ check_transaction_tracking(void)
     /* Truncate the journal file. */
     if ( pass2 ) {
 
-	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if ( H5C2_jb__trunc(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED ) {
 
             pass2 = FALSE;
@@ -13559,7 +13559,7 @@ check_transaction_tracking(void)
     /* Take down the journal file. */
     if ( pass2 ) {
 
-	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct) 
+	if (H5C2_jb__takedown(/* H5C2_jbrb_t */  &jbrb_struct)
            != SUCCEED) {
 
 	    pass2 = FALSE;
@@ -13569,8 +13569,8 @@ check_transaction_tracking(void)
 
     } /* end if */
 
-    if ( show_progress ) /* 13 */ 
-        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name, 
+    if ( show_progress ) /* 13 */
+        HDfprintf(stdout, "%s%0d -- pass = %d\n", fcn_name,
                   checkpoint++, (int)pass2);
 
     /* report pass / failure information */
@@ -13593,37 +13593,37 @@ check_transaction_tracking(void)
 /***************************************************************************
  * Function: 	write_verify_trans_num
  *
- * Purpose:  	Helper function for check_transaction_tracking test. Writes a 
+ * Purpose:  	Helper function for check_transaction_tracking test. Writes a
  *              journal entry of length 100 into the ring buffer, provided that
- *              the transaction number of the journal entry is less than 1000, 
- *              and then verifies that the recorded last transaction on disk is 
- *              as specified in verify_val. 
+ *              the transaction number of the journal entry is less than 1000,
+ *              and then verifies that the recorded last transaction on disk is
+ *              as specified in verify_val.
  *
  * Return:      void
  *
  * Programmer: 	Mike McGreevy <mcgreevy@hdfgroup.org>
  *              Thursday, February 28, 2008
- * 
+ *
  **************************************************************************/
 static void
-write_verify_trans_num(H5C2_jbrb_t * struct_ptr, 
-                       uint64_t trans_num, 
+write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
+                       uint64_t trans_num,
                        uint64_t verify_val)
 {
     uint64_t trans_verify;
-    
+
     /* Write an entire transaction. (start, journal entry, end).
      * As long as the supplied transaction number is less than 1000,
      * the total length of the transaction will be 100. For cases where
      * the transaction number increases in number of digits, the amount
      * of data in the body is reduced to account for the extra trans digits,
      * so transactions remain at size 100. Note that data is converted
-     * into hex, so reducing input by one character reduces journal entry 
+     * into hex, so reducing input by one character reduces journal entry
      * by three (two hex characters and a space).
-     */  
+     */
     if ( pass2 ) {
-        
-       	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  struct_ptr, 
+
+       	if ( H5C2_jb__start_transaction(/* H5C2_jbrb_t  */  struct_ptr,
                                         /* trans number */  trans_num)
            != SUCCEED) {
 
@@ -13635,10 +13635,10 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
         if (trans_num < 10) {
 
-	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr, 
+	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr,
                                             /* Transaction # */  trans_num,
-                                            /* Base Address  */  (haddr_t)16, 
-                                            /* Length        */  9, 
+                                            /* Base Address  */  (haddr_t)16,
+                                            /* Length        */  9,
                                             /* Body          */  (const uint8_t *)"XXXXXXXXX")
                    != SUCCEED ) {
 
@@ -13651,10 +13651,10 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
         else if (trans_num < 100) {
 
-	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr, 
+	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr,
                                             /* Transaction # */  trans_num,
-                                            /* Base Address  */  (haddr_t)16, 
-                                            /* Length        */  8, 
+                                            /* Base Address  */  (haddr_t)16,
+                                            /* Length        */  8,
                                             /* Body          */  (const uint8_t *)"XXXXXXXX")
                    != SUCCEED ) {
 
@@ -13667,10 +13667,10 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
         else {
 
-	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr, 
+	        if ( H5C2_jb__journal_entry(/* H5C2_jbrb_t   */  struct_ptr,
                                             /* Transaction # */  trans_num,
-                                            /* Base Address  */  (haddr_t)16, 
-                                            /* Length        */  7, 
+                                            /* Base Address  */  (haddr_t)16,
+                                            /* Length        */  7,
                                             /* Body          */  (const uint8_t *)"XXXXXXX")
                    != SUCCEED ) {
 
@@ -13681,7 +13681,7 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
 
         } /* end else */
 
-	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  struct_ptr, 
+	if ( H5C2_jb__end_transaction(/* H5C2_jbrb_t   */  struct_ptr,
                                       /* Transaction # */  trans_num)
            != SUCCEED ) {
 
@@ -13699,7 +13699,7 @@ write_verify_trans_num(H5C2_jbrb_t * struct_ptr,
                                               /* H5C2_jbrb_t  */  struct_ptr,
                                               /* trans number */  &trans_verify)
            != SUCCEED ) {
-            
+
             pass2 = FALSE;
             failure_mssg2 = "H5C2_jb__get_last_transaction_on_disk failed";
 
@@ -13756,7 +13756,7 @@ main(void)
         skip_long_tests2 = FALSE;
 
     }
-    
+
     /* Human readable smoke checks */
 #if 1
     mdj_smoke_check_00(TRUE);
@@ -13796,7 +13796,7 @@ main(void)
 #endif
 #if 1
     check_superblock_extensions();
-#endif 
+#endif
 #if 1
     check_mdjsc_callbacks();
 #endif
diff --git a/test/cache_api.c b/test/cache_api.c
index fcc4664..4e430b3 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -3854,7 +3854,7 @@ check_file_mdc_api_errs(void)
     {
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		    "%s: testing H5Fset_mdc_config() with invalid config %d.\n",
 		    fcn_name, i);
 	}
@@ -3884,7 +3884,7 @@ check_file_mdc_api_errs(void)
 
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n", 
+	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n",
 		      fcn_name);
 	}
 
@@ -3903,7 +3903,7 @@ check_file_mdc_api_errs(void)
 
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n", 
+	    HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n",
 		      fcn_name);
 	}
 
@@ -3924,7 +3924,7 @@ check_file_mdc_api_errs(void)
 
 	if ( show_progress ) {
 
-	    HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n", 
+	    HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n",
 		      fcn_name);
 	}
 
diff --git a/test/cache_common.c b/test/cache_common.c
index 25eb988..5eb91dc 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -736,7 +736,7 @@ flush(H5F_t *f,
     HDassert( entry_ptr->header.addr == entry_ptr->addr );
     HDassert( entry_ptr->addr == addr );
     HDassert( entry_ptr->header.size == entry_ptr->size );
-    HDassert( ( entry_ptr->type == VARIABLE_ENTRY_TYPE ) || 
+    HDassert( ( entry_ptr->type == VARIABLE_ENTRY_TYPE ) ||
 	      ( entry_ptr->size == entry_sizes[entry_ptr->type] ) );
     HDassert( entry_ptr->header.is_dirty == entry_ptr->is_dirty );
     HDassert( entry_ptr->cache_ptr != NULL );
@@ -748,7 +748,7 @@ flush(H5F_t *f,
 
         for ( i = 0; i < entry_ptr->num_flush_ops; i++ )
 	{
-            execute_flush_op(entry_ptr->cache_ptr, 
+            execute_flush_op(entry_ptr->cache_ptr,
 			     entry_ptr,
 			     &((entry_ptr->flush_ops)[i]),
 			     flags_ptr);
@@ -782,8 +782,8 @@ flush(H5F_t *f,
 
 } /* flush() */
 
-herr_t 
-pico_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+herr_t
+pico_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
            void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == PICO_ENTRY_TYPE );
@@ -791,7 +791,7 @@ pico_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-nano_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+nano_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 	   void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == NANO_ENTRY_TYPE );
@@ -799,7 +799,7 @@ nano_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-micro_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+micro_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
             void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == MICRO_ENTRY_TYPE );
@@ -807,7 +807,7 @@ micro_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-tiny_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+tiny_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
            void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == TINY_ENTRY_TYPE );
@@ -815,7 +815,7 @@ tiny_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-small_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+small_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
             void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == SMALL_ENTRY_TYPE );
@@ -823,7 +823,7 @@ small_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-medium_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+medium_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
              void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == MEDIUM_ENTRY_TYPE );
@@ -831,7 +831,7 @@ medium_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-large_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+large_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
             void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == LARGE_ENTRY_TYPE );
@@ -839,7 +839,7 @@ large_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-huge_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+huge_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
            void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == HUGE_ENTRY_TYPE );
@@ -847,7 +847,7 @@ huge_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-monster_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+monster_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 	      void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == MONSTER_ENTRY_TYPE );
@@ -855,7 +855,7 @@ monster_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 }
 
 herr_t
-variable_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, 
+variable_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
 	       void *thing, unsigned * flags_ptr)
 {
     HDassert ( ((test_entry_t *)thing)->type == VARIABLE_ENTRY_TYPE );
@@ -1135,7 +1135,7 @@ variable_size(H5F_t * f, void * thing, size_t * size_ptr)
  *
  * Purpose:	Do noting if pass is FALSE on entry.
  *
- *              Otherwise, add the specified flush operation to the 
+ *              Otherwise, add the specified flush operation to the
  *              target instance of test_entry_t.
  *
  * Return:	void
@@ -1162,10 +1162,10 @@ add_flush_op(int target_type,
     test_entry_t * target_entry_ptr;
 
     HDassert( ( 0 <= target_type ) && ( target_type < NUMBER_OF_ENTRY_TYPES ) );
-    HDassert( ( 0 <= target_idx ) && 
+    HDassert( ( 0 <= target_idx ) &&
 	      ( target_idx <= max_indices[target_type] ) );
     HDassert( ( 0 <= op_code ) && ( op_code <= FLUSH_OP__MAX_OP ) );
-    HDassert( ( op_code != FLUSH_OP__RESIZE ) || 
+    HDassert( ( op_code != FLUSH_OP__RESIZE ) ||
 	      ( type == VARIABLE_ENTRY_TYPE ) );
     HDassert( ( 0 <= type ) && ( type < NUMBER_OF_ENTRY_TYPES ) );
     HDassert( ( 0 <= idx ) && ( idx <= max_indices[type] ) );
@@ -1190,7 +1190,7 @@ add_flush_op(int target_type,
 	(target_entry_ptr->flush_ops)[i].size = new_size;
 
     }
-        
+
     return;
 
 } /* add_flush_op() */
@@ -1282,11 +1282,11 @@ create_pinned_entry_dependency(H5C_t * cache_ptr,
  * Function:	dirty_entry
  *
  * Purpose:	Given a pointer to a cache, an entry type, and an index,
- *		dirty the target entry.  
+ *		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 
+ *		target entry is in the cache and is pinned.  If it
+ *		isn't, scream and die.  If it is, use the
  *		H5C_mark_pinned_entry_dirty() call to dirty it.
  *
  *		Do nothing if pass is false on entry.
@@ -1338,7 +1338,7 @@ dirty_entry(H5C_t * cache_ptr,
 
                     pass = FALSE;
                     failure_mssg = "entry to be dirty pinned is not pinned.";
-		    
+
                 } else {
 
 		    mark_pinned_entry_dirty(cache_ptr, type, idx, FALSE, (size_t)0);
@@ -1346,7 +1346,7 @@ dirty_entry(H5C_t * cache_ptr,
 		}
 	    }
         } else {
-        
+
 	    protect_entry(cache_ptr, type, idx);
             unprotect_entry(cache_ptr, type, idx, TRUE, H5C__NO_FLAGS_SET);
 	}
@@ -1391,13 +1391,13 @@ execute_flush_op(H5C_t * cache_ptr,
     HDassert( ( entry_ptr->flush_op_self_resize_in_progress ) ||
               ( entry_ptr->header.size == entry_ptr->size ) );
     HDassert( op_ptr != NULL );
-    HDassert( ( 0 <= entry_ptr->type ) && 
+    HDassert( ( 0 <= entry_ptr->type ) &&
 	      ( entry_ptr->type < NUMBER_OF_ENTRY_TYPES ) );
-    HDassert( ( 0 <= entry_ptr->index ) && 
+    HDassert( ( 0 <= entry_ptr->index ) &&
               ( entry_ptr->index <= max_indices[entry_ptr->type] ) );
-    HDassert( ( 0 <= op_ptr->type ) && 
+    HDassert( ( 0 <= op_ptr->type ) &&
               ( op_ptr->type < NUMBER_OF_ENTRY_TYPES ) );
-    HDassert( ( 0 <= op_ptr->idx ) && 
+    HDassert( ( 0 <= op_ptr->idx ) &&
               ( op_ptr->idx <= max_indices[op_ptr->type] ) );
     HDassert( ( op_ptr->flag == FALSE ) || ( op_ptr->flag == TRUE ) );
     HDassert( flags_ptr != NULL );
@@ -1410,17 +1410,17 @@ execute_flush_op(H5C_t * cache_ptr,
 		break;
 
 	    case FLUSH_OP__DIRTY:
-		HDassert( ( entry_ptr->type != op_ptr->type ) || 
+		HDassert( ( entry_ptr->type != op_ptr->type ) ||
 			  ( entry_ptr->index != op_ptr->idx ) );
 
 		dirty_entry(cache_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 
+                    /* the flush operation is acting on the entry to
 		     * which it is attached.  Handle this here:
 		     */
                     HDassert( entry_ptr->type == VARIABLE_ENTRY_TYPE );
@@ -1439,18 +1439,18 @@ execute_flush_op(H5C_t * cache_ptr,
 
 			entry_ptr->header.size = entry_ptr->size;
 		    }
-		    
+
 		} else {
 
 		    /* change the size of some other entry */
 
-		    resize_entry(cache_ptr, op_ptr->type, op_ptr->idx, 
+		    resize_entry(cache_ptr, op_ptr->type, op_ptr->idx,
                                  op_ptr->size, op_ptr->flag);
 		}
 		break;
 
 	    case FLUSH_OP__RENAME:
-		rename_entry(cache_ptr, op_ptr->type, op_ptr->idx, 
+		rename_entry(cache_ptr, op_ptr->type, op_ptr->idx,
 			     op_ptr->flag);
 		break;
 
@@ -1538,7 +1538,7 @@ entry_in_cache(H5C_t * cache_ptr,
  * 		fields.
  *
  * 		JRM -- 4/1/07
- * 		Added initialization for the new is_read_only, and 
+ * 		Added initialization for the new is_read_only, and
  * 		ro_ref_count fields.
  *
  *-------------------------------------------------------------------------
@@ -1641,12 +1641,12 @@ reset_entries(void)
  *
  * Purpose:	Given a pointer to a cache, an entry type, an index, and
  * 		a size, set the size of the target entry to the size.  Note
- * 		that at present, the type of the entry must be 
+ * 		that at present, the type of the entry must be
  * 		VARIABLE_ENTRY_TYPE.
  *
  *		If the resize_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 
+ *		target entry is in the cache and is pinned.  If it
+ *		isn't, scream and die.  If it is, use the
  *		H5C_mark_pinned_entry_dirty() call to resize it.
  *
  *		Do nothing if pass is false on entry.
@@ -1701,15 +1701,15 @@ resize_entry(H5C_t * cache_ptr,
 
                     pass = FALSE;
                     failure_mssg = "entry to be resized pinned is not pinned.";
-		    
+
                 } else {
 
-		    mark_pinned_entry_dirty(cache_ptr, type, idx, 
+		    mark_pinned_entry_dirty(cache_ptr, type, idx,
 				            TRUE, new_size);
 		}
 	    }
         } else {
-        
+
 	    protect_entry(cache_ptr, type, idx);
 	    unprotect_entry_with_size_change(cache_ptr, type, idx,
                                              H5C__SIZE_CHANGED_FLAG, new_size);
@@ -1778,13 +1778,13 @@ resize_pinned_entry(H5C_t * cache_ptr,
 
                 pass = FALSE;
                 failure_mssg = "entry to be resized is not pinned.";
-		    
+
             } else {
 
 		entry_ptr->size = new_size;
 
-	        result = H5C_resize_pinned_entry(cache_ptr, 
-				                 (void *)entry_ptr, 
+	        result = H5C_resize_pinned_entry(cache_ptr,
+				                 (void *)entry_ptr,
 						 new_size);
 
 		if ( result != SUCCEED ) {
@@ -1845,7 +1845,7 @@ verify_clean(void)
 
             for ( j = 0; j <= max_index; j++ )
             {
-                if ( ( base_addr[j].header.is_dirty ) || 
+                if ( ( base_addr[j].header.is_dirty ) ||
 		     ( base_addr[j].is_dirty ) ) {
 
                     dirty_count++;
@@ -1914,7 +1914,7 @@ verify_entry_status(H5C_t * cache_ptr,
 
         if ( pass ) {
 
-	    in_cache = entry_in_cache(cache_ptr, expected[i].entry_type, 
+	    in_cache = entry_in_cache(cache_ptr, expected[i].entry_type,
 		                      expected[i].entry_index);
 
 	    if ( in_cache != expected[i].in_cache ) {
@@ -1936,7 +1936,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->size != expected[i].size ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                         "%d entry (%d, %d) size actualexpected = %ld/%ld.\n",
 			tag,
 	                (int)expected[i].entry_type,
@@ -1952,7 +1952,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.size != expected[i].size ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                         "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n",
 			tag,
 		        (int)expected[i].entry_type,
@@ -1968,7 +1968,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->at_main_addr != expected[i].at_main_addr ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -1984,7 +1984,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->is_dirty != expected[i].is_dirty ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2000,7 +2000,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.is_dirty != expected[i].is_dirty ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2016,7 +2016,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->is_protected != expected[i].is_protected ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2032,7 +2032,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.is_protected != expected[i].is_protected ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2048,7 +2048,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->is_pinned != expected[i].is_pinned ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                       "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n",
 		      tag,
 		      (int)expected[i].entry_type,
@@ -2064,7 +2064,7 @@ verify_entry_status(H5C_t * cache_ptr,
 	    if ( entry_ptr->header.is_pinned != expected[i].is_pinned ) {
 
 	        pass = FALSE;
-	        sprintf(msg, 
+	        sprintf(msg,
                   "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n",
 		  tag,
 		  (int)expected[i].entry_type,
@@ -2546,7 +2546,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr,
 	entry_ptr->is_dirty = TRUE;
 
 	if ( size_changed ) {
-	
+
 	    /* update entry size now to keep the sanity checks happy */
 	    entry_ptr->size = new_size;
 	}
@@ -2569,16 +2569,16 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr,
 		      (int)(entry_ptr->header.is_dirty));
 	    HDfprintf(stdout, "entry_ptr->header.is_pinned = %d.\n",
 		      (int)(entry_ptr->header.is_pinned));
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		      "(entry_ptr->header.type != &(types[type])) = %d.\n",
 		      (int)(entry_ptr->header.type != &(types[type])));
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		      "entry_ptr->size = %ld, entry_ptr->header.size = %ld.\n",
 		      (long)(entry_ptr->size), (long)(entry_ptr->header.size));
-	    HDfprintf(stdout, 
+	    HDfprintf(stdout,
 		      "entry_ptr->addr = %ld, entry_ptr->header.addr = %ld.\n",
 		      (long)(entry_ptr->addr), (long)(entry_ptr->header.addr));
-#endif 
+#endif
             pass = FALSE;
             failure_mssg = "error in H5C_mark_pinned_entry_dirty().";
 
@@ -2761,7 +2761,7 @@ rename_entry(H5C_t * cache_ptr,
 
     if ( ! done ) {
 
-        if ( ( result < 0 ) || 
+        if ( ( result < 0 ) ||
 	     ( ( ! ( entry_ptr->header.destroy_in_progress ) ) &&
 	       ( entry_ptr->header.addr != new_addr ) ) ) {
 
@@ -2798,8 +2798,8 @@ rename_entry(H5C_t * cache_ptr,
  *              6/11/04
  *
  * Modifications:
- *	
- *    - Modified call to H5C_protect to pass H5C__NO_FLAGS_SET in the 
+ *
+ *    - Modified call to H5C_protect to pass H5C__NO_FLAGS_SET in the
  *      new flags parameter.
  *    						JRM -- 3/28/07
  *
@@ -2886,7 +2886,7 @@ protect_entry(H5C_t * cache_ptr,
 /*-------------------------------------------------------------------------
  * Function:	protect_entry_ro()
  *
- * Purpose:	Do a read only protect the entry indicated by the type 
+ * Purpose:	Do a read only protect the entry indicated by the type
  * 		and index.
  *
  *		Do nothing if pass is FALSE on entry.
@@ -2897,7 +2897,7 @@ protect_entry(H5C_t * cache_ptr,
  *              4/1/07
  *
  * Modifications:
- *	
+ *
  *    - None.
  *
  *-------------------------------------------------------------------------
@@ -2925,8 +2925,8 @@ protect_entry_ro(H5C_t * cache_ptr,
         HDassert( entry_ptr->index == idx );
         HDassert( entry_ptr->type == type );
         HDassert( entry_ptr == entry_ptr->self );
-        HDassert( ( ! ( entry_ptr->is_protected ) ) || 
-		  ( ( entry_ptr->is_read_only ) && 
+        HDassert( ( ! ( entry_ptr->is_protected ) ) ||
+		  ( ( entry_ptr->is_read_only ) &&
 		    ( entry_ptr->ro_ref_count > 0 ) ) );
 
         cache_entry_ptr = H5C_protect(NULL, -1, -1, cache_ptr, &(types[type]),
@@ -3062,7 +3062,7 @@ unpin_entry(H5C_t * cache_ptr,
  *		JRM -- 3/31/06
  *		Update for pinned entries.
  *
- *		JRM -- 4/1/07 
+ *		JRM -- 4/1/07
  *		Updated for new multiple read protects.
  *
  *-------------------------------------------------------------------------
@@ -3160,7 +3160,7 @@ unprotect_entry(H5C_t * cache_ptr,
 		entry_ptr->ro_ref_count = 0;
 
 	    } else {
-            
+
 		entry_ptr->is_protected = FALSE;
 
 	    }
@@ -3264,14 +3264,14 @@ unprotect_entry_with_size_change(H5C_t * cache_ptr,
 	HDassert ( ( ! pin_flag_set ) || ( ! (entry_ptr->is_pinned) ) );
 	HDassert ( ( ! unpin_flag_set ) || ( entry_ptr->is_pinned ) );
 	HDassert ( ( ! size_changed_flag_set ) || ( new_size > 0 ) );
-	HDassert ( ( ! size_changed_flag_set ) || 
+	HDassert ( ( ! size_changed_flag_set ) ||
 		   ( type == VARIABLE_ENTRY_TYPE ) );
 
         entry_ptr->is_dirty = (entry_ptr->is_dirty || dirty_flag_set);
 
 	if ( size_changed_flag_set ) {
 
-            entry_ptr->is_dirty = TRUE;  
+            entry_ptr->is_dirty = TRUE;
 	    entry_ptr->size = new_size;
         }
 
@@ -3457,7 +3457,7 @@ row_major_scan_forward(H5C_t * cache_ptr,
 		     ( (idx + lag - 5) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx + lag - 5));
 
 		    protect_entry_ro(cache_ptr, type, (idx + lag - 5));
@@ -3468,7 +3468,7 @@ row_major_scan_forward(H5C_t * cache_ptr,
 		     ( (idx + lag - 6) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx + lag - 6));
 
 		    protect_entry_ro(cache_ptr, type, (idx + lag - 6));
@@ -3479,7 +3479,7 @@ row_major_scan_forward(H5C_t * cache_ptr,
 		     ( (idx + lag - 7) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx + lag - 7));
 
 		    protect_entry_ro(cache_ptr, type, (idx + lag - 7));
@@ -3490,7 +3490,7 @@ row_major_scan_forward(H5C_t * cache_ptr,
 		     ( (idx + lag - 7) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx + lag - 7));
 
 		    unprotect_entry(cache_ptr, type, (idx + lag - 7),
@@ -3502,7 +3502,7 @@ row_major_scan_forward(H5C_t * cache_ptr,
 		     ( (idx + lag - 8) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx + lag - 8));
 
 		    unprotect_entry(cache_ptr, type, (idx + lag - 8),
@@ -3514,7 +3514,7 @@ row_major_scan_forward(H5C_t * cache_ptr,
 		     ( (idx + lag - 9) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx + lag - 9));
 
 		    unprotect_entry(cache_ptr, type, (idx + lag - 9),
@@ -3874,7 +3874,7 @@ row_major_scan_backward(H5C_t * cache_ptr,
 		     ( (idx - lag + 5) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx - lag + 5));
 
 		    protect_entry_ro(cache_ptr, type, (idx - lag + 5));
@@ -3885,7 +3885,7 @@ row_major_scan_backward(H5C_t * cache_ptr,
 		     ( (idx - lag + 6) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx - lag + 6));
 
 		    protect_entry_ro(cache_ptr, type, (idx - lag + 6));
@@ -3896,7 +3896,7 @@ row_major_scan_backward(H5C_t * cache_ptr,
 		     ( (idx - lag + 7) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(p-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(p-ro, %d, %d) ", type,
 				  (idx - lag + 7));
 
 		    protect_entry_ro(cache_ptr, type, (idx - lag + 7));
@@ -3907,7 +3907,7 @@ row_major_scan_backward(H5C_t * cache_ptr,
 		     ( (idx - lag + 7) % 9 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx - lag + 7));
 
 		    unprotect_entry(cache_ptr, type, (idx - lag + 7),
@@ -3919,7 +3919,7 @@ row_major_scan_backward(H5C_t * cache_ptr,
 		     ( (idx - lag + 8) % 11 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx - lag + 8));
 
 		    unprotect_entry(cache_ptr, type, (idx - lag + 8),
@@ -3931,7 +3931,7 @@ row_major_scan_backward(H5C_t * cache_ptr,
 		     ( (idx - lag + 9) % 13 == 0 ) ) {
 
                     if ( verbose )
-                        HDfprintf(stdout, "(u-ro, %d, %d) ", type, 
+                        HDfprintf(stdout, "(u-ro, %d, %d) ", type,
 				  (idx - lag + 9));
 
 		    unprotect_entry(cache_ptr, type, (idx - lag + 9),
diff --git a/test/cache_common.h b/test/cache_common.h
index e1d33f2..f76f47c 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -46,7 +46,7 @@
 #define MONSTER_ENTRY_TYPE	8
 #define VARIABLE_ENTRY_TYPE	9
 
-#define NUMBER_OF_ENTRY_TYPES   10	
+#define NUMBER_OF_ENTRY_TYPES   10
 
 #define PICO_ENTRY_SIZE		(size_t)1
 #define NANO_ENTRY_SIZE		(size_t)4
@@ -124,7 +124,7 @@
 #define FLUSH_OP__MAX_OP	3
 
 #define MAX_FLUSH_OPS		10	/* Maximum number of flush operations
-					 * that can be associated with a 
+					 * that can be associated with a
 					 * cache entry.
 					 */
 
@@ -151,29 +151,29 @@ typedef struct flush_op
                                          * function implementing the flush
                                          * operation.
 					 */
-    hbool_t		flag;		/* boolean flag passed into the 
+    hbool_t		flag;		/* boolean flag passed into the
 					 * function implementing the flush
 					 * operation.  The meaning of the
 					 * flag is dependant upon the flush
 					 * operation:
 					 *
-					 * FLUSH_OP__DIRTY: TRUE iff the 
-					 *   target is pinned, and is to 
-					 *   be dirtied via the 
+					 * FLUSH_OP__DIRTY: TRUE iff the
+					 *   target is pinned, and is to
+					 *   be dirtied via the
 					 *   H5C_mark_pinned_entry_dirty()
 					 *   call.
 					 *
 					 * FLUSH_OP__RESIZE: TRUE iff the
-					 *   target is pinned, and is to 
-					 *   be resized via the 
+					 *   target is pinned, and is to
+					 *   be resized via the
 					 *   H5C_mark_pinned_entry_dirty()
 					 *   call.
 					 *
 					 * FLUSH_OP__RENAME: TRUE iff the
-					 *    target is to be renamed to 
+					 *    target is to be renamed to
 					 *    its main address.
 					 */
-    size_t		size;		/* New target size in the 
+    size_t		size;		/* New target size in the
 					 * FLUSH_OP__RENAME operation.
 					 * Unused elsewhere.
 					 */
@@ -224,7 +224,7 @@ typedef struct test_entry_t
     hbool_t		  is_protected;	/* entry should currently be on
 					 * the cache's protected list.
                                          */
-    hbool_t		  is_read_only; /* TRUE iff the entry should be 
+    hbool_t		  is_read_only; /* TRUE iff the entry should be
 					 * protected read only.
 					 */
     int			  ro_ref_count; /* Number of outstanding read only
@@ -250,14 +250,14 @@ typedef struct test_entry_t
 					 * entries pinned by this entry.
 					 */
     int			  num_flush_ops; /* integer field containing the
-					 * number of flush operations to 
-					 * be executed when the entry is 
+					 * number of flush operations to
+					 * be executed when the entry is
 					 * flushed.  This value must lie in
-					 * the closed interval 
+					 * the closed interval
 					 * [0, MAX_FLUSH_OPS].
 					 */
     struct flush_op	  flush_ops[MAX_FLUSH_OPS]; /* Array of instances
-					 * of struct flush_op detailing the 
+					 * of struct flush_op detailing the
 					 * flush operations (if any) that
 					 * are to be executed when the entry
 					 * is flushed from the cache.
@@ -265,14 +265,14 @@ typedef struct test_entry_t
 					 * num_flush_ops contains the number
 					 * of valid entries in this array.
 					 */
-    hbool_t		  flush_op_self_resize_in_progress; /* Boolean flag 
-					 * that is set to TRUE iff this 
+    hbool_t		  flush_op_self_resize_in_progress; /* Boolean flag
+					 * that is set to TRUE iff this
 					 * entry is being flushed, it has
 					 * been resized by a resize flush
 					 * op, and the flush function has
 					 * not yet returned,  This field is
-					 * used to turn off overactive santity 
-					 * checking code that would otherwise 
+					 * used to turn off overactive santity
+					 * checking code that would otherwise
 					 * cause a false test failure.
 					 */
     hbool_t		  loaded;       /* entry has been loaded since the
diff --git a/test/chunk_info.c b/test/chunk_info.c
index 48db292..68bf774 100644
--- a/test/chunk_info.c
+++ b/test/chunk_info.c
@@ -34,17 +34,17 @@
 
 int main( void )
 {
-    
+
     hid_t   fid;      /* file ID */
     hid_t   did;      /* dataset ID */
     hid_t   f_sid;    /* file space ID */
     hid_t   m_sid;    /* memory space ID */
     hid_t   pid;      /* property list ID */
     hsize_t start[2]; /* chunk location to start writing */
-    hsize_t dims[2]  = { 4, 4};       
+    hsize_t dims[2]  = { 4, 4};
     hsize_t chunk_dims[2] = { 2, 2 };
-    int     chunk_data[2][2] = { {1, 1}, {1, 1} }; 
-    int     buf[4][4];  
+    int     chunk_data[2][2] = { {1, 1}, {1, 1} };
+    int     buf[4][4];
     int     fillvalue = 0;
     int     i, j, ii, jj;
 
@@ -82,22 +82,22 @@ int main( void )
     /* iterate in dim 0 */
     for (j = 0; j < chunk_dims[0]; j++)
     {
-        
+
         /* reset start in dim 1 */
         start[1] = 0;
-        
+
         /* iterate in dim 1 */
         for (i = 0; i < chunk_dims[1]; i++)
         {
-            
+
             /* select file hyperslab to save a 2x2 chunk */
             if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, start, NULL, chunk_dims, NULL) < 0) TEST_ERROR;
-            
+
             /* write the data to the hyperslab. */
-            if (H5Dwrite(did, H5T_NATIVE_INT, m_sid, f_sid, H5P_DEFAULT, chunk_data) < 0) TEST_ERROR; 
-         
-            /* read back and display complete dataset 4x4 */   
-            if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR; 
+            if (H5Dwrite(did, H5T_NATIVE_INT, m_sid, f_sid, H5P_DEFAULT, chunk_data) < 0) TEST_ERROR;
+
+            /* read back and display complete dataset 4x4 */
+            if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) TEST_ERROR;
 
 
 #if defined (PRINT_DATA)
@@ -108,14 +108,14 @@ int main( void )
                 printf("\n");
             }
 #endif
-            
-            
+
+
             /* increment start in dim 1 */
             start[1] += 2;
-            
-            
+
+
         }
-        
+
         /* increment start in dim 0 */
         start[0] += 2;
     }
@@ -134,7 +134,7 @@ int main( void )
     if (H5Fclose(fid) < 0) TEST_ERROR
 
     PASSED();
-  
+
     puts("All chunk info tests passed.");
     return 0;
 
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index a03d37e..c6ba30b 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -935,7 +935,7 @@ initialize_stype2(unsigned char *buf, const size_t num)
  *
  * Purpose:	Initialize data buffer.
  *
- * Return:	Success:	
+ * Return:	Success:
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1019,7 +1019,7 @@ initialize_stype4(unsigned char *buf, const size_t num)
  *
  * Return:	Success:        datatype ID
  *
- *              Failure:        negative	
+ *              Failure:        negative
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1053,7 +1053,7 @@ create_stype1(void)
             H5Tinsert(tid, "k", HOFFSET(stype1, k), H5T_NATIVE_DOUBLE) < 0 ||
             H5Tinsert(tid, "l", HOFFSET(stype1, l), H5T_NATIVE_DOUBLE) < 0 ||
             H5Tinsert(tid, "m", HOFFSET(stype1, m), H5T_NATIVE_DOUBLE) < 0 ||
-            H5Tinsert(tid, "n", HOFFSET(stype1, n), H5T_NATIVE_DOUBLE) < 0) 
+            H5Tinsert(tid, "n", HOFFSET(stype1, n), H5T_NATIVE_DOUBLE) < 0)
         goto error;
 
     if(H5Tclose(array_dt1) < 0)
@@ -1075,7 +1075,7 @@ error:
  *
  * Return:	Success:        datatype ID
  *
- *              Failure:        negative	
+ *              Failure:        negative
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1134,7 +1134,7 @@ error:
  *
  * Return:	Success:        datatype ID
  *
- *              Failure:        negative	
+ *              Failure:        negative
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1177,7 +1177,7 @@ error:
  *
  * Return:	Success:        datatype ID
  *
- *              Failure:        negative	
+ *              Failure:        negative
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1239,7 +1239,7 @@ error:
  *
  * Return:	Success:        0
  *
- *              Failure:        negative	
+ *              Failure:        negative
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
@@ -1286,14 +1286,14 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
 	    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], 
+		   s_ptr->c[3], s_ptr->c[4], s_ptr->c[5], s_ptr->c[6], s_ptr->c[7],
                    s_ptr->d, s_ptr->e, s_ptr->f, s_ptr->g,s_ptr->h[0],s_ptr->h[1],s_ptr->h[2],
                    s_ptr->h[3],s_ptr->h[4],s_ptr->h[5],s_ptr->h[6],s_ptr->h[7],s_ptr->h[8],
                    s_ptr->h[9],s_ptr->h[10],s_ptr->h[11],s_ptr->h[12],s_ptr->h[13],s_ptr->h[14],
                    s_ptr->h[15], s_ptr->i,s_ptr->j,s_ptr->k,s_ptr->l,s_ptr->m,s_ptr->n);
 	    printf("    dst={a=%d, b=%d, c=[%d,%d,%d,%d,%d,%d,%d,%d], d=%d, e=%d, f=%f, g=%f, h=[%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f,%f], i=%f, j=%f, k=%f, l=%f, m=%f, n=%f}\n",
 		   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->c[3], d_ptr->c[4], d_ptr->c[5], d_ptr->c[6], d_ptr->c[7],
                    d_ptr->d, d_ptr->e, d_ptr->f, d_ptr->g,d_ptr->h[0],d_ptr->h[1],d_ptr->h[2],
                    d_ptr->h[3],d_ptr->h[4],d_ptr->h[5],d_ptr->h[6],d_ptr->h[7],d_ptr->h[8],
                    d_ptr->h[9],d_ptr->h[10],d_ptr->h[11],d_ptr->h[12],d_ptr->h[13],
@@ -1330,7 +1330,7 @@ error:
  *		Failure:	1
  *
  * Programmer:	Raymond Lu
- *              Friday, 15 June 2007 
+ *              Friday, 15 June 2007
  *
  * Modifications:
  *-------------------------------------------------------------------------
@@ -1338,7 +1338,7 @@ error:
 static int
 test_hdf5_src_subset(char *filename, hid_t fapl)
 {
-    hid_t   file;     
+    hid_t   file;
     hid_t   rew_tid, src_tid, dst_tid;
     hid_t   dataset;
     hid_t   space;
@@ -1415,7 +1415,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /*
      *######################################################################
-     * STEP 2. Rewrite the data with a subset of original data type. 
+     * STEP 2. Rewrite the data with a subset of original data type.
      */
     TESTING("rewriting data with a subset of original data type");
 
@@ -1463,7 +1463,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
         FAIL_STACK_ERROR
 
-    if(compare_data(orig, rbuf, TRUE) < 0) 
+    if(compare_data(orig, rbuf, TRUE) < 0)
         TEST_ERROR
 
     if(H5Dclose(dataset) < 0)
@@ -1476,7 +1476,7 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
         FAIL_STACK_ERROR
 
-    if(compare_data(orig, rbuf, TRUE) < 0) 
+    if(compare_data(orig, rbuf, TRUE) < 0)
         TEST_ERROR
 
     if(H5Dclose(dataset) < 0)
@@ -1527,15 +1527,15 @@ error:
  *                      TYPE4 D;               }
  *                      TYPE5 E;
  *                  };
- *              This optimization is for the Chicago company.  This test 
- *              is in opposite of test_hdf5_src_subset. 
+ *              This optimization is for the Chicago company.  This test
+ *              is in opposite of test_hdf5_src_subset.
  *
  * Return:	Success:	0
  *
  *		Failure:	1
  *
  * Programmer:	Raymond Lu
- *              Friday, 15 June 2007 
+ *              Friday, 15 June 2007
  *
  * Modifications:
  *-------------------------------------------------------------------------
@@ -1543,7 +1543,7 @@ error:
 static int
 test_hdf5_dst_subset(char *filename, hid_t fapl)
 {
-    hid_t   file;     
+    hid_t   file;
     hid_t   rew_tid, src_tid, dst_tid;
     hid_t   dataset;
     hid_t   space;
@@ -1619,7 +1619,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 
     /*
      *######################################################################
-     * STEP 2. Rewrite the data with a subset of original data type. 
+     * STEP 2. Rewrite the data with a subset of original data type.
      */
     TESTING("rewriting data with a subset of original data type");
 
@@ -1667,7 +1667,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
         goto error;
 
-    if(compare_data(orig, rbuf, FALSE) < 0) 
+    if(compare_data(orig, rbuf, FALSE) < 0)
         goto error;
 
     if(H5Dclose(dataset) < 0)
@@ -1680,7 +1680,7 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
         goto error;
 
-    if(compare_data(orig, rbuf, FALSE) < 0) 
+    if(compare_data(orig, rbuf, FALSE) < 0)
         goto error;
 
     if(H5Dclose(dataset) < 0)
@@ -1721,12 +1721,12 @@ error:
 /*-------------------------------------------------------------------------
  * 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
  *
- *              Failure:         1	
+ *              Failure:         1
  *
  * Programmer:  Raymond Lu
  *              Friday, 15 June 2007
diff --git a/test/dsets.c b/test/dsets.c
index d0b2098..b22ec27 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1874,7 +1874,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_filters(hid_t file, hid_t 
+test_filters(hid_t file, hid_t
 #ifndef H5_HAVE_FILTER_SZIP
 UNUSED
 #endif /* H5_HAVE_FILTER_SZIP */
@@ -5368,7 +5368,7 @@ test_set_local(hid_t fapl)
     /* Check that the values read are the modified version of what was written */
     for(i=0; i<dims[0]; i++) {
 	for(j=0; j<dims[1]; j++) {
-	    /* If the difference between two values is greater than 0.001%, they're 
+	    /* If the difference between two values is greater than 0.001%, they're
              * considered not equal. */
             if(!DBL_REL_EQUAL(points_dbl[i][j],check_dbl[i][j],0.00001)) {
 		H5_FAILED();
@@ -6606,7 +6606,7 @@ main(void)
             nerrors += (test_deprec(file) < 0			? 1 : 0);
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
             nerrors += (test_huge_chunks(my_fapl) < 0		? 1 : 0);
-            
+
             if(H5Fclose(file) < 0)
                 goto error;
         } /* end for */
diff --git a/test/dtransform.c b/test/dtransform.c
index b1bca24..c5a4fa8 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -236,7 +236,7 @@ int main(void)
     const char* polynomial = "(2+x)* ((x-8)/2)";
     /* inverses the utrans transform in init_test to get back original array */
     const char* utrans_inv = "(x/3)*4 - 100";
-    
+
     if((file_id = H5Fcreate("dtransform.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR;
 
     if((dxpl_id_c_to_f = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR;
@@ -311,7 +311,7 @@ int main(void)
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, long double, H5T_NATIVE_LDOUBLE, "ldouble", windchillFfloat, 1);
 #endif
 
-    if(test_copy(dxpl_id_c_to_f_copy, dxpl_id_polynomial_copy) < 0) TEST_ERROR; 
+    if(test_copy(dxpl_id_c_to_f_copy, dxpl_id_polynomial_copy) < 0) TEST_ERROR;
     if(test_trivial(dxpl_id_simple) < 0) TEST_ERROR;
     if(test_poly(dxpl_id_polynomial) < 0) TEST_ERROR;
     if(test_getset(dxpl_id_c_to_f) < 0) TEST_ERROR;
diff --git a/test/dtypes.c b/test/dtypes.c
index f7802ed..4009d8c 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -2308,7 +2308,7 @@ test_compound_13(void)
 
     TESTING("compound datatypes of boundary size with latest format");
 
-    /* Create some phony data. */   
+    /* Create some phony data. */
     for(u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++)
         data_out.x[u] = u;
     data_out.y = 99.99;
@@ -2338,7 +2338,7 @@ test_compound_13(void)
 
     /* Write some data. */
     if(H5Awrite(attid, typeid, &data_out) < 0) FAIL_STACK_ERROR
-    
+
     /* Release all resources. */
     if(H5Aclose(attid) < 0) FAIL_STACK_ERROR
     if(H5Tclose(array1_tid) < 0) FAIL_STACK_ERROR
@@ -4637,7 +4637,7 @@ test_latest(void)
     if(H5Oget_info_by_name(file, compnd_type, &oi, H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR
     new_dtype_oh_size = oi.hdr.space.total;
-    
+
     /* Check that the new format is smaller than the old format */
     if(old_dtype_oh_size <= new_dtype_oh_size)
         TEST_ERROR
diff --git a/test/enum.c b/test/enum.c
index e40965c..3196195 100644
--- a/test/enum.c
+++ b/test/enum.c
@@ -216,7 +216,7 @@ test_tr1(hid_t file)
     TESTING("O(1) conversions");
 
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "split")) {
 	if((cwg = H5Gcreate2(file, "test_tr1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
@@ -309,7 +309,7 @@ test_tr2(hid_t file)
     TESTING("O(log N) converions");
 
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "split")) {
 	if((cwg = H5Gcreate2(file, "test_tr2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
diff --git a/test/extend.c b/test/extend.c
index 2248b5d..f5b0f2e 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -254,7 +254,7 @@ main (void)
     const char *envval = NULL;
 
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "split")) {
 	h5_reset();
diff --git a/test/external.c b/test/external.c
index 6820543..8524e72 100644
--- a/test/external.c
+++ b/test/external.c
@@ -612,7 +612,7 @@ test_2 (hid_t fapl)
 	int temparray[10] = {0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f,0x0f0f0f0f};
 
     TESTING("read external dataset");
-    
+
     /* Write the data to external files directly */
     for (i=0; i<4; i++) {
 	for (j=0; j<25; j++) {
@@ -899,7 +899,7 @@ test_4 (hid_t fapl)
 	    goto error;
 
         PASSED();
-    } else 
+    } else
         SKIPPED();
 
     return 0;
diff --git a/test/fheap.c b/test/fheap.c
index 263d3a9..1dd39bc 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -15700,12 +15700,12 @@ main(void)
     if(envval == NULL)
         envval = "nomatch";
 
-    /* This test case with Direct driver has a poor performance on 
-     * NCSA copper, though it works.  Skip it if the express mode is set on 
-     * and worry about the performance later. 
+    /* This test case with Direct driver has a poor performance on
+     * NCSA copper, though it works.  Skip it if the express mode is set on
+     * and worry about the performance later.
      */
-    if((HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && 
-        HDstrcmp(envval, "family") && HDstrcmp(envval, "stdio")) && 
+    if((HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") &&
+        HDstrcmp(envval, "family") && HDstrcmp(envval, "stdio")) &&
         !(!HDstrcmp(envval, "direct") && (ExpressMode > 1)))
     {
 
diff --git a/test/fillval.c b/test/fillval.c
index e92872a..f0ee9ba 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -1529,7 +1529,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
     /* Create dataspace describing memory buffer */
     if((mspace = H5Screate_simple(5, hs_size, hs_size)) < 0) TEST_ERROR
 
-    /* Select elements within file dataspace */ 
+    /* Select elements within file dataspace */
     if(H5Sselect_hyperslab(fspace, H5S_SELECT_SET, hs_offset, hs_stride, hs_size, NULL) < 0) TEST_ERROR
 
     /* Write to all even data locations */
@@ -1721,7 +1721,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name,
 
     /* Verify the element read in is the value written out */
     if(verify_rtn((unsigned)__LINE__, hs_offset, val_rd, buf) < 0) TEST_ERROR
-    
+
     /* Set the element back to fillval */
     if(H5Dwrite(dset, dtype, mspace, fspace, H5P_DEFAULT, fillval) < 0) TEST_ERROR
 
@@ -2112,7 +2112,7 @@ main(int argc, char *argv[])
     const char  *envval = NULL;
 
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) {
         int	nerrors=0, argno, test_contig=1, test_chunk=1, test_compact=1;
diff --git a/test/flush1.c b/test/flush1.c
index 97ddf76..d9a55ed 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -52,7 +52,7 @@ static double	the_data[100][100];
  */
 static hid_t
 create_file(char* name, hid_t fapl)
-{ 
+{
     hid_t	file, dcpl, space, dset, groups, grp;
     hsize_t	ds_size[2] = {100, 100};
     hsize_t	ch_size[2] = {5, 5};
@@ -110,7 +110,7 @@ error:
  */
 static hid_t
 extend_file(hid_t file)
-{ 
+{
     hid_t	dcpl, space, dset;
     hsize_t	ds_size[2] = {100, 100};
     hsize_t	ch_size[2] = {5, 5};
@@ -162,7 +162,7 @@ error:
  * 		Sept. 26, 2006, expand test to check for failure if H5Fflush is not called.
  * 		Oct. 4 2006, expand test to check for partial failure in case file is flushed, but then
  * 				new datasets are created after the flush.
- * 		
+ *
  *
  *-------------------------------------------------------------------------
  */
@@ -178,7 +178,7 @@ main(void)
 
     TESTING("H5Fflush (part1)");
     envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL) 
+    if (envval == NULL)
         envval = "nomatch";
     if (HDstrcmp(envval, "split")) {
 	/* Create the file */
@@ -194,7 +194,7 @@ main(void)
 	if(H5Fflush(file, H5F_SCOPE_GLOBAL) < 0) goto error;
 	/* Add a bit to the file and don't flush the new part */
 	extend_file(file);
-	
+
 	/* Create the other file which will not be flushed */
 	h5_fixname(FILENAME[1], fapl, name, sizeof name);
 	file = create_file(name, fapl);
diff --git a/test/flush2.c b/test/flush2.c
index 5ec5300..0304406 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -50,7 +50,7 @@ static double	the_data[100][100];
  */
 static int
 check_dset(hid_t file, const char* name)
-{ 
+{
     hid_t	space, dset;
     hsize_t	ds_size[2] = {100, 100};
     double	error;
@@ -122,7 +122,7 @@ check_file(char* filename, hid_t fapl, int flag)
 	if(H5Gclose(grp) < 0) goto error;
     } /* end for */
 
-    /* Check to see if that last added dataset in the third file is accessible 
+    /* Check to see if that last added dataset in the third file is accessible
      * (it shouldn't be...but it might.  Flag an error in case it is for now */
     if(flag && check_dset(file, "dset2")) goto error;
 
@@ -180,8 +180,8 @@ main(void)
 	}
 	else
 	    PASSED();
-    
-	
+
+
 	/* Check the case where the file was not flushed.  This should give an error
 	 * so we turn off the error stack temporarily */
 	TESTING("H5Fflush (part2 without flush)");
@@ -229,7 +229,7 @@ main(void)
 	}
 	H5Eset_auto2(H5E_DEFAULT, func, NULL);
 
-	
+
 	h5_cleanup(FILENAME, fapl);
     }
     else
diff --git a/test/gen_udlinks.c b/test/gen_udlinks.c
index 08a25cc..a1312d2 100644
--- a/test/gen_udlinks.c
+++ b/test/gen_udlinks.c
@@ -22,9 +22,9 @@
  *  They will be named according to the platform and should
  *  be placed in the hdf5/test directory so that the links test can use them.
  *
- * Note: The be_extlink2.h5 is also used by external.c to test opening 
+ * Note: The be_extlink2.h5 is also used by external.c to test opening
  *  external link twice. -SLU 2007/11/7
- *  
+ *
  */
 
 #include "hdf5.h"
diff --git a/test/getname.c b/test/getname.c
index 954790f..2d19d33 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -2401,7 +2401,7 @@ test_obj_ref(hid_t fapl)
         FAIL_STACK_ERROR
     if(H5Dclose(dataset) < 0)
         FAIL_STACK_ERROR
-    
+
     /* Create a dataset(inside Group1) */
     if((dataset = H5Dcreate2(group, "Dataset1", H5T_STD_U32LE, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
@@ -2421,11 +2421,11 @@ test_obj_ref(hid_t fapl)
     /* Create another dataset(inside Group1) */
     if((dataset = H5Dcreate2(group, "Dataset2", H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
- 
+
     /* Close Dataset */
     if(H5Dclose(dataset) < 0)
         FAIL_STACK_ERROR
- 
+
     /* Create a datatype to refer to */
     if((tid1 = H5Tcreate(H5T_COMPOUND, sizeof(s1_t))) < 0)
         FAIL_STACK_ERROR
@@ -2448,19 +2448,19 @@ test_obj_ref(hid_t fapl)
 
     /* Create a new group in group1 */
     if((group2 = H5Gcreate2(group, "Group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
- 
+
     /* Create a hard link to group1 in group2 */
     if(H5Lcreate_hard(fid1, "/Group1", H5L_SAME_LOC, "/Group1/Group2/Link", H5P_DEFAULT, H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR
- 
+
     /* Create dataset in that group */
     if((dataset = H5Dcreate2(group2, "Dataset4", H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-  
+
     /* Close Dataset */
     if(H5Dclose(dataset) < 0)
         FAIL_STACK_ERROR
-  
+
     /* Close group */
     if(H5Gclose(group) < 0)
         FAIL_STACK_ERROR
@@ -2498,7 +2498,7 @@ test_obj_ref(hid_t fapl)
     /* Create reference to named datatype */
     if(H5Rcreate(&wbuf[3], fid1, "/Group1/Datatype1", H5R_OBJECT, -1) < 0)
         FAIL_STACK_ERROR
-    
+
     if(H5Rcreate(&wbuf[4], fid1, "/Group1/Group2/Dataset4", H5R_OBJECT, -1) < 0)
         FAIL_STACK_ERROR
     if(H5Rcreate(&wbuf[5], fid1, "/Group1/Group2", H5R_OBJECT, -1) < 0)
@@ -2514,7 +2514,7 @@ test_obj_ref(hid_t fapl)
     if(H5Dwrite(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0)
         FAIL_STACK_ERROR
 
-    TESTING("getting path to normal dataset in root group"); 
+    TESTING("getting path to normal dataset in root group");
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[0])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
@@ -2526,7 +2526,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to dataset in /Group1"); 
+    TESTING("getting path to dataset in /Group1");
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[1])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
@@ -2538,7 +2538,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to /Group1"); 
+    TESTING("getting path to /Group1");
     if((group = H5Rdereference(dataset, H5R_OBJECT, &wbuf[2])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(group, (char*)buf, sizeof(buf));
@@ -2550,7 +2550,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to datatype in /Group1"); 
+    TESTING("getting path to datatype in /Group1");
     if((tid1 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[3])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(tid1, (char*)buf, sizeof(buf));
@@ -2562,7 +2562,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to dataset in nested group"); 
+    TESTING("getting path to dataset in nested group");
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[4])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
@@ -2574,7 +2574,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to nested group"); 
+    TESTING("getting path to nested group");
     if((group = H5Rdereference(dataset, H5R_OBJECT, &wbuf[5])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(group, (char*)buf, sizeof(buf));
@@ -2586,7 +2586,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to dataset created via hard link"); 
+    TESTING("getting path to dataset created via hard link");
     if((dataset2 = H5Rdereference(dataset, H5R_OBJECT, &wbuf[6])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
@@ -2598,7 +2598,7 @@ test_obj_ref(hid_t fapl)
     PASSED()
 
     HDmemset(buf, 0, sizeof(buf));
-    TESTING("getting path to root group"); 
+    TESTING("getting path to root group");
     if((group = H5Rdereference(dataset, H5R_OBJECT, &wbuf[7])) < 0) FAIL_STACK_ERROR
     *buf = '\0';
     i = H5Iget_name(group, (char*)buf, sizeof(buf));
@@ -2629,8 +2629,8 @@ test_obj_ref(hid_t fapl)
         FAIL_STACK_ERROR
     if(H5Ldelete(fid1, "/Group1/Dataset2", H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR
- 
-    TESTING("getting path to dataset that has been unlinked"); 
+
+    TESTING("getting path to dataset that has been unlinked");
     *buf = '\0';
     i = H5Iget_name(dataset2, (char*)buf, sizeof(buf));
     if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
@@ -2639,15 +2639,15 @@ test_obj_ref(hid_t fapl)
     i = H5Rget_name(dataset, H5R_OBJECT, &wbuf[1], (char*)buf, sizeof(buf));
     if(i != 0) TEST_ERROR
     PASSED()
-    
+
     /* Close disk dataspace */
     if(H5Sclose(sid1) < 0)
         FAIL_STACK_ERROR
-    
+
     /* Close Dataset */
     if(H5Dclose(dataset) < 0)
         FAIL_STACK_ERROR
- 
+
     /* Close file */
     if(H5Fclose(fid1) < 0)
         FAIL_STACK_ERROR
@@ -2666,8 +2666,8 @@ test_reg_ref(hid_t fapl)
     char filename1[1024];
     hid_t	file_id;        /* file identifier */
     hid_t	dsetv_id;       /*dataset identifiers*/
-    hid_t	dsetr_id;      
-    hid_t	space_id, spacer_id;      
+    hid_t	dsetr_id;
+    hid_t	space_id, spacer_id;
     hsize_t	dims[2] = {2,9};
     hsize_t	dimsr[1] = {2};
     int		rank = 2;
@@ -2713,8 +2713,8 @@ test_reg_ref(hid_t fapl)
     /*
      * Create a reference to the hyperslab.
      */
-    start[0] = 0; 
-    start[1] = 3; 
+    start[0] = 0;
+    start[1] = 3;
     count[0] = 2;
     count[1] = 3;
     if((status = H5Sselect_hyperslab(space_id,H5S_SELECT_SET,start,NULL,count,NULL)) < 0)
@@ -2760,7 +2760,7 @@ test_reg_ref(hid_t fapl)
     TESTING("H5Rget_name to get name from region reference(hyperslab)");
     *buf1 = '\0';
     name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[0], (char*)buf1, NAME_BUF_SIZE);
-    if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR 
+    if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR
     PASSED()
 
     TESTING("H5Iget_name to get name from region reference(hyperslab)");
@@ -2770,7 +2770,7 @@ test_reg_ref(hid_t fapl)
 
     /* Get name of the dataset the first region reference points using H5Iget_name */
     *buf2 = '\0';
-    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, NAME_BUF_SIZE); 
+    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, NAME_BUF_SIZE);
     if(!((HDstrcmp(buf2, "/MATRIX") == 0) &&(name_size2 == 7))) TEST_ERROR
 
     if((status = H5Dclose(dsetv_id)) < 0) TEST_ERROR
@@ -2780,7 +2780,7 @@ test_reg_ref(hid_t fapl)
     /* Get name of the dataset the second region reference points to using H5Rget_name */
     TESTING("H5Rget_name to get name from region reference(pnt selec)");
     *buf1 = '\0';
-    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[1], (char*)buf1, NAME_BUF_SIZE);      
+    name_size1 = H5Rget_name(dsetr_id, H5R_DATASET_REGION, &ref_out[1], (char*)buf1, NAME_BUF_SIZE);
     if(!((HDstrcmp(buf1, "/MATRIX") == 0) &&(name_size1 == 7))) TEST_ERROR
     PASSED()
 
@@ -2791,7 +2791,7 @@ test_reg_ref(hid_t fapl)
 
     /* Get name of the dataset the first region reference points using H5Iget_name */
     *buf2 = '\0';
-    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, NAME_BUF_SIZE); 
+    name_size2 = H5Iget_name(dsetv_id, (char*)buf2, NAME_BUF_SIZE);
     if(!((HDstrcmp(buf2, "/MATRIX") == 0) &&(name_size2 == 7))) TEST_ERROR
 
     if((status = H5Dclose(dsetv_id)) < 0) TEST_ERROR
@@ -2802,7 +2802,7 @@ test_reg_ref(hid_t fapl)
 	TEST_ERROR
     if((status = H5Fclose(file_id)) < 0)
 	TEST_ERROR
-     
+
     return 0;
 
 error:
diff --git a/test/h5test.h b/test/h5test.h
index 4add74c..04c664e 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -120,12 +120,12 @@ extern MPI_Info h5_io_info_g;         /* MPI INFO object for IO */
 
 /*
  * The methods to compare the equality of floating-point values:
- *    1. XXX_ABS_EQUAL - check if the difference is smaller than the 
+ *    1. XXX_ABS_EQUAL - check if the difference is smaller than the
  *       Epsilon value.  The Epsilon values, FLT_EPSILON, DBL_EPSILON,
  *       and LDBL_EPSILON, are defined by compiler in float.h.
  *    2. XXX_REL_EQUAL - check if the relative difference is smaller than a
  *       predefined value M.  See if two values are relatively equal.
- *       It's the test's responsibility not to pass in the value 0, which 
+ *       It's the test's responsibility not to pass in the value 0, which
  *       may cause the equation to fail.
  */
 #define FLT_ABS_EQUAL(X,Y)	((float)fabs(X-Y)<FLT_EPSILON)
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 89dbc5c..194c0f6 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -666,7 +666,7 @@ test_multifill(size_t nx)
 	    sprintf(s, "bad dst[%lu].left", (unsigned long)i);
 	} else if (!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 
+             * 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);
diff --git a/test/links.c b/test/links.c
index 0d89fd2..3145c5e 100644
--- a/test/links.c
+++ b/test/links.c
@@ -65,13 +65,13 @@ const char *FILENAME[] = {
     "extlinks9",	/* 27: */
     "tmp/extlinks9",	/* 28: */
     "extlinks10",	/* 29: */ /* TESTS for windows */
-    "tmp/extlinks10",	/* 30: */ 
-    "tmp/extlinks11",	/* 31: */ 
-    "tmp/extlinks12",	/* 32: */ 
+    "tmp/extlinks10",	/* 30: */
+    "tmp/extlinks11",	/* 31: */
+    "tmp/extlinks12",	/* 32: */
     "extlinks13",	/* 33: */
-    "tmp/extlinks13",	/* 34: */ 
-    "tmp/extlinks14",	/* 35: */ 
-    "tmp/extlinks15",	/* 36: */ 
+    "tmp/extlinks13",	/* 34: */
+    "tmp/extlinks14",	/* 35: */
+    "tmp/extlinks15",	/* 36: */
     NULL
 };
 
@@ -1746,7 +1746,7 @@ external_link_root(hid_t fapl, hbool_t new_format)
     /* Close external object (lets first file close) */
     if(H5Gclose(gid) < 0) TEST_ERROR
 
-    /* Create a new object using H5Gcreate2 through the external link 
+    /* Create a new object using H5Gcreate2 through the external link
      * directly
      */
     if((gid = H5Gcreate2(fid, "ext_link/newer_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
@@ -1754,7 +1754,7 @@ external_link_root(hid_t fapl, hbool_t new_format)
     /* Close file and group */
     if(H5Gclose(gid) < 0) TEST_ERROR
     if(H5Fclose(fid) < 0) TEST_ERROR
-    
+
     /* Open first file again with read-only access and check on objects created */
     if((fid = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
 
@@ -2052,10 +2052,10 @@ external_link_mult(hid_t fapl, hbool_t new_format)
     if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
     if(H5Fclose(fid2) < 0) TEST_ERROR
 
-    /* Open the other with write access and delete the external link in it */  
+    /* Open the other with write access and delete the external link in it */
     if((fid2 = H5Fopen(filename3, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR
     if(H5Ldelete(fid2, "G/H/I", H5P_DEFAULT) < 0) TEST_ERROR
-      
+
     if(H5Fclose(fid2) < 0) TEST_ERROR
 
     /* Cleanup */
@@ -2192,7 +2192,7 @@ external_link_self(hid_t fapl, hbool_t new_format)
     if((fid=H5Fopen(filename2, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR
 
     if((gid = H5Gopen2(fid, "ext_link/B/C/Y/Z/end", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    
+
     /* Create object through external link */
     if((gid2 = H5Gcreate2(gid, "newer_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
@@ -2209,7 +2209,7 @@ external_link_self(hid_t fapl, hbool_t new_format)
     /* Cleanup */
     if(H5Gclose(gid) < 0) TEST_ERROR
     if(H5Fclose(fid) < 0) TEST_ERROR
-    
+
     PASSED();
     return 0;
 
@@ -2587,15 +2587,15 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_env: test 1
  *
- * Purpose:     
+ * Purpose:
  *		1. target link: "extlinks1"
  *		2. main file: "extlinks0"
  *		3. target file: "tmp/extlinks1"
  * 		4. The environment variable "HDF5_EXT_PREFIX" should be set to ".:tmp"
- *		Should be able to access the target file in tmp directory through searching 
+ *		Should be able to access the target file in tmp directory through searching
  *			the pathnames set in HDF5_EXT_PREFIX.
  *		This test will be skipped if HDF5_EXT_PREFIX is not set as expected.
- *		
+ *
  *
  * Return:      Success:        0
  *              Failure:        -1
@@ -2691,9 +2691,9 @@ external_link_env(hid_t fapl, hbool_t new_format)
  *		2. main file: "extlinks0"
  *		3. target file: "tmp/extlinks2"
  * 		4. Set up external link prefix via H5Pset_elink_prefix() to be "tmp"
- *		Should be able to access the target file in tmp directory via the prefix set 
+ *		Should be able to access the target file in tmp directory via the prefix set
  *		by H5Pset_elink_prefix()
- *		
+ *
  *
  * Return:      Success:        0
  *              Failure:        -1
@@ -2816,16 +2816,16 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
     /* set up name for external linked target file: "extlinks3" */
     h5_fixname(FILENAME[18], fapl, filename2, sizeof filename2);
     /* set up name for target file: "tmp/extlinks3" */
-    h5_fixname(FILENAME[19], fapl, filename3, sizeof filename3); 
+    h5_fixname(FILENAME[19], fapl, filename3, sizeof filename3);
 
     /* create tmp directory and get current working directory path */
     if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
         TEST_ERROR
 
-    /* 
-     * set up name for main file: 
+    /*
+     * set up name for main file:
      *	Linux: "/CWD/tmp/extlinks0"
-     *  Window: "<cur drive>:/CWD/tmp/extlinks0" 
+     *  Window: "<cur drive>:/CWD/tmp/extlinks0"
      */
     HDstrcpy(tmpname, cwdpath);
     HDstrcat(tmpname, "/");
@@ -2967,7 +2967,7 @@ external_link_rel_mainpath(hid_t fapl, hbool_t new_format)
  *		2. main file: Linux:"/CWD/tmp/extlinks0"; Window: "<cur drive>:/CWD/tmp/extlinks0"
  * 		2. target file: "extlinks5"
  *		Should be able to access the target file in the current working directory
- *		
+ *
  *
  * Return:      Success:        0
  *              Failure:        -1
@@ -3001,12 +3001,12 @@ external_link_cwd(hid_t fapl, hbool_t new_format)
 
     if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
         TEST_ERROR
- 
-    /* 
-     * set up name for main file: 
-     *	 Linux: "/CWD/tmp/extlinks0" 
+
+    /*
+     * set up name for main file:
+     *	 Linux: "/CWD/tmp/extlinks0"
      *   Windows: "<cur drive>:/CWD/tmp/extlinks0"
-     */ 
+     */
     HDstrcpy(tmpname, cwdpath);
     HDstrcat(tmpname, "/");
     HDstrcat(tmpname, FILENAME[13]);
@@ -3094,11 +3094,11 @@ external_link_abstar(hid_t fapl, hbool_t new_format)
 
      /* create tmp directory and get current working directory path */
     if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR 
-    
-    /* 
-     * set up name for external linked target file: 
-     *   Linux: "/CWD/tmp/extlinks6" 
+        TEST_ERROR
+
+    /*
+     * set up name for external linked target file:
+     *   Linux: "/CWD/tmp/extlinks6"
      *	 Windows: "<cur drive>:/CWD/tmp/extlinks6"
      */
     HDstrcpy(tmpname, cwdpath);
@@ -3195,9 +3195,9 @@ external_link_abstar_cur(hid_t fapl, hbool_t new_format)
     if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
         TEST_ERROR
 
-     /* 
-      * set up name for external linked target file: 
-      *   Linux: "/CWD/tmp/extlinks7" 
+     /*
+      * set up name for external linked target file:
+      *   Linux: "/CWD/tmp/extlinks7"
       *	  Windows: "<cur drive>:/CWD/tmp/extlinks7"
       */
     HDstrcpy(tmpname, cwdpath);
@@ -3310,9 +3310,9 @@ external_link_reltar(hid_t fapl, hbool_t new_format)
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     } H5E_END_TRY;
 
-    /* 
+    /*
      * Should be able to find the target file from:
-     * main file's current working directory + pathname of external linked targetfile 
+     * main file's current working directory + pathname of external linked targetfile
      */
     if (gid < 0) {
 	H5_FAILED();
@@ -3338,7 +3338,7 @@ external_link_reltar(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_chdir: test 9
  *
- * Purpose:     
+ * Purpose:
  *		1. target link: "extlinks9"
  *		2. main file: "extlinks0"
  *		3. target file" "tmp/extlinks9"
@@ -3405,8 +3405,8 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
     } H5E_END_TRY;
 
     if (HDchdir("..") < 0) TEST_ERROR
-    
-    /* 
+
+    /*
      * Should be able to find the target file from:
      * main file's current working directory + pathname of external linked targetfile
      */
@@ -3438,7 +3438,7 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_win1
  *
- * Purpose:     
+ * Purpose:
  *   		1. target link: "/CWD/tmp/extlinks10"
  *		2. main file: "extlinks0"
  *		3. target file: "extlinks10"
@@ -3474,8 +3474,8 @@ external_link_win1(hid_t fapl, hbool_t new_format)
     h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1);
 
     if (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL)
-        TEST_ERROR 
-    
+        TEST_ERROR
+
     /* set up name for target link: "/CWD/tmp/extlinks10" */
     HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */
     HDstrcat(tmpname, "/");
@@ -3531,7 +3531,7 @@ external_link_win1(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_win2
  *
- * Purpose:     
+ * Purpose:
  *   		1. target link: "/CWD/tmp/extlinks11"
  *		2. main file: "extlinks0"
  *		3. target file: "tmp/extlinks11"
@@ -3568,8 +3568,8 @@ external_link_win2(hid_t fapl, hbool_t new_format)
 
      /* create tmp directory and get current working directory path */
     if ((HDmkdir(TMPDIR, (mode_t)0755) < 0 && errno != EEXIST) || (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL))
-        TEST_ERROR 
-    
+        TEST_ERROR
+
     /* set up name for target link: "/CWD/tmp/extlinks11" */
     HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */
     HDstrcat(tmpname, "/");
@@ -3625,7 +3625,7 @@ external_link_win2(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_win3
  *
- * Purpose:     
+ * Purpose:
  *   		1. target link: "<cur drive>:tmp/extlinks12"
  *		2. main file: "extlinks0"
  *		3. target file: "tmp/extlinks12"
@@ -3717,7 +3717,7 @@ external_link_win3(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_win4
  *
- * Purpose:     
+ * Purpose:
  *   		1. target link: "<cur drive>:extlinks13"
  *		2. main file: "<cur-drive>:tmp/extlinks0"
  *		3. target file: tmp/extlinks13
@@ -3807,7 +3807,7 @@ external_link_win4(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_win5
  *
- * Purpose:     
+ * Purpose:
  *   		1. target link: "<cur drive+1>:tmp/extlinks14"
  *		2. main file: "/CWD/extlinks0"
  *		3. target file: "tmp/extlinks14"
@@ -3841,7 +3841,7 @@ external_link_win5(hid_t fapl, hbool_t new_format)
         TESTING("external links via main file's rel drive/abs path (windows)")
 
     if (HDgetcwd(cwdpath, NAME_BUF_SIZE)==NULL)
-        TEST_ERROR 
+        TEST_ERROR
     drive = HDgetdrive();
 
     /* set up name for main file: "/CWD/extlinks0" */
@@ -3903,7 +3903,7 @@ external_link_win5(hid_t fapl, hbool_t new_format)
 /*-------------------------------------------------------------------------
  * Function:    external_link_win6
  *
- * Purpose:     
+ * Purpose:
  *   		1. target link: "<cur drive+1>:tmp/extlinks15"
  *		2. main file: "extlinks0"
  *		3. target file: "tmp/extlinks15"
@@ -4888,8 +4888,8 @@ external_link_closing(hid_t fapl, hbool_t new_format)
     /* Test that getting info works */
     if(H5Lget_info(fid1, "elink/elink/elink/type1", &li, H5P_DEFAULT) < 0) TEST_ERROR
     if(H5Lget_info(fid1, "elink/elink/elink", &li, H5P_DEFAULT) < 0) TEST_ERROR
-    if(H5Oget_info_by_name(fid1, "elink/elink/elink/type1", &oi, H5P_DEFAULT) < 0) TEST_ERROR 
-    if(H5Oget_info_by_name(fid1, "elink/elink/elink", &oi, H5P_DEFAULT) < 0) TEST_ERROR 
+    if(H5Oget_info_by_name(fid1, "elink/elink/elink/type1", &oi, H5P_DEFAULT) < 0) TEST_ERROR
+    if(H5Oget_info_by_name(fid1, "elink/elink/elink", &oi, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Test move */
     if(H5Lmove(fid1, "elink/elink/elink/group1", fid1,
@@ -5654,7 +5654,7 @@ ud_link_reregister(hid_t fapl)
 
     if(H5Lunregister(UD_HARD_TYPE) < 0) FAIL_STACK_ERROR
     if(H5Lis_registered(UD_HARD_TYPE) != FALSE) FAIL_STACK_ERROR
-    
+
     PASSED();
     return 0;
 
@@ -6573,9 +6573,9 @@ lapl_nlinks(hid_t fapl, hbool_t new_format)
     if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0) TEST_ERROR
 
     nlinks = 20;
-    if(H5Pset_nlinks(gapl, nlinks) < 0) TEST_ERROR 
-    if(H5Pset_nlinks(tapl, nlinks) < 0) TEST_ERROR 
-    if(H5Pset_nlinks(dapl, nlinks) < 0) TEST_ERROR 
+    if(H5Pset_nlinks(gapl, nlinks) < 0) TEST_ERROR
+    if(H5Pset_nlinks(tapl, nlinks) < 0) TEST_ERROR
+    if(H5Pset_nlinks(dapl, nlinks) < 0) TEST_ERROR
 
     /* We should now be able to use these property lists to open each kind
      * of object.
@@ -6788,7 +6788,7 @@ build_visit_file(hid_t fapl)
     char *srcdir = getenv("srcdir");    /* where the src code is located */
 
     h5_fixname(FILENAME[9], fapl, filename, sizeof filename);
-    
+
     /* Create file for visiting */
     if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
 
@@ -9028,7 +9028,7 @@ HDfprintf(stderr, "op_data->curr = %Hd\n", op_data->curr);
     op_data->ncalled++;
 
     /* Get the link information directly to compare */
-    if(H5Lget_info(group_id, link_name, &my_info, H5P_DEFAULT) < 0) 
+    if(H5Lget_info(group_id, link_name, &my_info, H5P_DEFAULT) < 0)
         return(H5_ITER_ERROR);
 
     /* Check more things for link iteration (vs. group iteration) */
@@ -9513,7 +9513,7 @@ HDfprintf(stderr, "op_data->curr = %Hd\n", op_data->curr);
     op_data->ncalled++;
 
     /* Get the link information directly to compare */
-    if(H5Lget_info(group_id, link_name, &my_info, H5P_DEFAULT) < 0) 
+    if(H5Lget_info(group_id, link_name, &my_info, H5P_DEFAULT) < 0)
         return(H5_ITER_ERROR);
 
     /* Check more things for link iteration (vs. group iteration) */
@@ -11640,7 +11640,7 @@ main(void)
     const char  *envval = NULL;
 
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) {
         hid_t	fapl, fapl2;    /* File access property lists */
diff --git a/test/mount.c b/test/mount.c
index c86c56b..4a9592f 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -4225,7 +4225,7 @@ main(void)
     const char *envval = NULL;
 
     envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL) 
+    if (envval == NULL)
         envval = "nomatch";
     if (HDstrcmp(envval, "split") && HDstrcmp(envval, "multi")) {
 	h5_reset();
diff --git a/test/mtime.c b/test/mtime.c
index 395b065..741f09a 100644
--- a/test/mtime.c
+++ b/test/mtime.c
@@ -85,7 +85,7 @@ main(void)
     if(H5Fclose(file) < 0) TEST_ERROR;
 
     /*
-     * Open the file and get the modification time. We'll test the 
+     * Open the file and get the modification time. We'll test the
      * H5Oget_info() arguments too: being able to stat something without
      * knowing its name.
      */
diff --git a/test/ntypes.c b/test/ntypes.c
index 4bbbf01..342aa5e 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -89,7 +89,7 @@ test_atomic_dtype(hid_t file)
 
     TESTING("atomic datatype");
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "split") && HDstrcmp(envval, "multi")) {
 	/* Initialize the dataset */
@@ -1885,7 +1885,7 @@ test_refer_dtype(hid_t file)
     /* Output message about test being performed */
     TESTING("reference datatype");
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "multi")) {
         H5O_type_t          obj_type;       /* Object type */
diff --git a/test/objcopy.c b/test/objcopy.c
index 6459519..653da96 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -126,7 +126,7 @@ static struct {
 
 /* Local function prototypes */
 static int
-compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, 
+compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
             const void *buf1, const void *buf2, hid_t obj_owner);
 static int
 compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf);
@@ -220,14 +220,14 @@ addr_reset(void)
 
 
 /*-------------------------------------------------------------------------
- * Function:    attach_ref_attr 
+ * Function:    attach_ref_attr
  *
  * Purpose:     Create an attribute with object references
  *
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Peter Cao
- *              Friday, August 4, 2006 
+ *              Friday, August 4, 2006
  *
  * Modifications:
  *
@@ -281,7 +281,7 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    attach_reg_ref_attr 
+ * Function:    attach_reg_ref_attr
  *
  * Purpose:     Create an attribute with object references
  *
@@ -358,14 +358,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    create_reg_ref_dataset 
+ * Function:    create_reg_ref_dataset
  *
  * Purpose:     Create a dataset with region references
  *
  * Return:      Non-negative on success/Negative on failure
  *
  * Programmer:  Peter Cao
- *              Friday, August 4, 2006 
+ *              Friday, August 4, 2006
  *
  * Modifications:
  *
@@ -828,7 +828,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static int
-compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, 
+compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts,
         const void *buf1, const void *buf2, hid_t obj_owner)
 {
     size_t elmt_size;           /* Size of an element */
@@ -1340,7 +1340,7 @@ HDassert(0 && "Unknown type of object");
                 if(linfo.u.val_size != linfo2.u.val_size) TEST_ERROR
 
                 /* Compare link values */
-                if(linfo.type == H5L_TYPE_SOFT || 
+                if(linfo.type == H5L_TYPE_SOFT ||
                         (linfo.type >= H5L_TYPE_UD_MIN && linfo.type <= H5L_TYPE_MAX)) {
                     char linkval[NAME_BUF_SIZE];            /* Link value */
                     char linkval2[NAME_BUF_SIZE];           /* Link value */
@@ -1361,7 +1361,7 @@ HDassert(0 && "Unknown type of link");
     } /* end if */
 
     /* Check if the attributes are equal */
-    if(compare_std_attributes(gid, gid2, pid) != TRUE) TEST_ERROR 
+    if(compare_std_attributes(gid, gid2, pid) != TRUE) TEST_ERROR
 
     /* Groups should be the same. :-) */
     return TRUE;
@@ -4369,7 +4369,7 @@ error:
  *              Failure:        number of errors
  *
  * Programmer:  Peter Cao
- *              August 8, 2006 
+ *              August 8, 2006
  *
  * Modifications:
  *
@@ -4520,7 +4520,7 @@ test_copy_group_deep(hid_t fcpl_src, hid_t fcpl_dst, hid_t fapl)
     char objname[NAME_BUF_SIZE];                /* Sub-group & dataset name buffer */
     char src_filename[NAME_BUF_SIZE];
     char dst_filename[NAME_BUF_SIZE];
-    
+
     TESTING("H5Ocopy(): deep nested groups");
 
     /* set initial data values */
@@ -7151,7 +7151,7 @@ int
 main(void)
 {
     const char *envval;
-    
+
     /* Don't run this test using the core, split, or multi file drivers */
     envval = HDgetenv("HDF5_DRIVER");
     if(envval == NULL)
@@ -7181,7 +7181,7 @@ main(void)
         /* Create an FCPL with sharing enabled */
         if((fcpl_shared = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR
         if(H5Pset_shared_mesg_nindexes(fcpl_shared, 1) < 0) TEST_ERROR
-        if(H5Pset_shared_mesg_index(fcpl_shared, 0, H5O_SHMESG_ALL_FLAG, (size_t) 10) < 0) TEST_ERROR 
+        if(H5Pset_shared_mesg_index(fcpl_shared, 0, H5O_SHMESG_ALL_FLAG, (size_t) 10) < 0) TEST_ERROR
 
         /* Test in all configurations */
         for(configuration = 0; configuration <= MAX_CONFIGURATION; configuration++) {
@@ -7254,10 +7254,10 @@ main(void)
             nerrors += test_copy_group_empty(fcpl_src, fcpl_dst, my_fapl);
             nerrors += test_copy_root_group(fcpl_src, fcpl_dst, my_fapl);
             nerrors += test_copy_group(fcpl_src, fcpl_dst, my_fapl);
-            if (ExpressMode > 1 && !HDstrcmp(envval, "direct")) { 
-                /* This test case with Direct driver has a poor performance on 
-                 * NCSA copper, though it works.  Skip it for now and worry 
-                 * about the performance later. 
+            if (ExpressMode > 1 && !HDstrcmp(envval, "direct")) {
+                /* This test case with Direct driver has a poor performance on
+                 * NCSA copper, though it works.  Skip it for now and worry
+                 * about the performance later.
                  */
                 printf("***Express test mode on.  test_copy_group_deep is skipped");
                 SKIPPED();
@@ -7274,19 +7274,19 @@ main(void)
             nerrors += test_copy_path(fcpl_src, fcpl_dst, my_fapl);
             nerrors += test_copy_same_file_named_datatype(fcpl_src, my_fapl);
             nerrors += test_copy_old_layout(fcpl_dst, my_fapl);
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG,
                        FALSE, "H5Ocopy(): without attributes");
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, 0, TRUE, 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, 0, TRUE,
                        "H5Ocopy(): with missing groups");
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_EXPAND_SOFT_LINK_FLAG, 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_EXPAND_SOFT_LINK_FLAG,
                        FALSE, "H5Ocopy(): expand soft link");
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_SHALLOW_HIERARCHY_FLAG, 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_SHALLOW_HIERARCHY_FLAG,
                        FALSE, "H5Ocopy(): shallow group copy");
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_EXPAND_REFERENCE_FLAG, 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_EXPAND_REFERENCE_FLAG,
                        FALSE, "H5Ocopy(): expand object reference");
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_PRESERVE_NULL_FLAG, 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_PRESERVE_NULL_FLAG,
                        FALSE, "H5Ocopy(): preserve NULL messages");
-            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG | 
+            nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG |
                        H5O_COPY_PRESERVE_NULL_FLAG, TRUE, "H5Ocopy(): preserve NULL messages");
 
 /* TODO: not implemented
diff --git a/test/ohdr.c b/test/ohdr.c
index f4524c9..9f3a574 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -74,7 +74,7 @@ main(void)
     hbool_t     b;                      /* Index for "new format" loop */
     const char  *envval = NULL;
     herr_t      ret;                    /* Generic return value */
- 
+
     /* Reset library */
     h5_reset();
     fapl = h5_fileaccess();
@@ -181,7 +181,7 @@ main(void)
          */
         TESTING("close & re-open object header");
         envval = HDgetenv("HDF5_DRIVER");
-        if(envval == NULL) 
+        if(envval == NULL)
             envval = "nomatch";
         if(HDstrcmp(envval, "multi") && HDstrcmp(envval, "split") && HDstrcmp(envval, "family")) {
             if(H5O_close(&oh_loc) < 0)
@@ -270,7 +270,7 @@ main(void)
         /* Test reading datasets with undefined object header messages */
         HDputs("Accessing objects with unknown header messages:");
         envval = HDgetenv("HDF5_DRIVER");
-        if(envval == NULL) 
+        if(envval == NULL)
             envval = "nomatch";
         if(HDstrcmp(envval, "multi") && HDstrcmp(envval, "split") && HDstrcmp(envval, "family")) {
             hid_t file2;                    /* File ID for 'bogus' object file */
diff --git a/test/reserved.c b/test/reserved.c
index 583fd64..a6e8882 100755
--- a/test/reserved.c
+++ b/test/reserved.c
@@ -430,7 +430,7 @@ main(void)
     const char *envval = NULL;
 
     envval = HDgetenv("HDF5_DRIVER");
-    if (envval == NULL) 
+    if (envval == NULL)
         envval = "nomatch";
 /* QAK: should be able to use the core driver? */
     if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) {
diff --git a/test/tattr.c b/test/tattr.c
index edaebf0..162c188 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -998,7 +998,7 @@ test_attr_scalar_read(hid_t fapl)
     if(!FLT_ABS_EQUAL(rdata, attr_data5))
 	printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
 	    "H5Aread", attr_data5, rdata, (int)__LINE__, __FILE__);
- 
+
     /* Get the attribute's dataspace */
     sid = H5Aget_space(attr);
     CHECK(sid, FAIL, "H5Aget_space");
@@ -1786,7 +1786,7 @@ test_attr_duplicate_ids(hid_t fapl)
 {
     hid_t		fid1;		/* HDF5 File IDs		*/
     hid_t		dataset;	/* Dataset ID			*/
-    hid_t		gid1, gid2;	/* Group ID			*/ 
+    hid_t		gid1, gid2;	/* Group ID			*/
     hid_t		sid1,sid2;	/* Dataspace ID			*/
     hid_t		attr, attr2;	    /* Attribute ID		*/
     hsize_t		dims1[] = {SPACE1_DIM1, SPACE1_DIM2, SPACE1_DIM3};
@@ -1811,7 +1811,7 @@ test_attr_duplicate_ids(hid_t fapl)
     CHECK(sid1, FAIL, "H5Screate_simple");
 
     /* Create a dataset */
-    dataset = H5Dcreate2(fid1, DSET1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, 
+    dataset = H5Dcreate2(fid1, DSET1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate2");
 
@@ -1824,7 +1824,7 @@ test_attr_duplicate_ids(hid_t fapl)
     CHECK(attr, FAIL, "H5Acreate2");
 
     /* Open the attribute just created and get a second ID */
-    attr2 = H5Aopen(dataset, ATTR1_NAME, H5P_DEFAULT); 
+    attr2 = H5Aopen(dataset, ATTR1_NAME, H5P_DEFAULT);
     CHECK(attr2, FAIL, "H5Aopen");
 
     /* Close attribute */
@@ -1844,7 +1844,7 @@ test_attr_duplicate_ids(hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*-----------------------------------------------------------------------------------
-     *        Reopen the file and verify the fill value for attribute.  Also write 
+     *        Reopen the file and verify the fill value for attribute.  Also write
      *        some real data.
      */
 
@@ -1951,7 +1951,7 @@ test_attr_duplicate_ids(hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*-----------------------------------------------------------------------------------
-     *        Verify that the attribute being pointed to by different paths shares 
+     *        Verify that the attribute being pointed to by different paths shares
      *        the same data.
      */
     /* Open file */
@@ -1963,7 +1963,7 @@ test_attr_duplicate_ids(hid_t fapl)
     CHECK(gid1, FAIL, "H5Gcreate2");
 
     /* Create hard link to the first group */
-    ret = H5Lcreate_hard(gid1, GROUP1_NAME, H5L_SAME_LOC, GROUP2_NAME, H5P_DEFAULT, 
+    ret = H5Lcreate_hard(gid1, GROUP1_NAME, H5L_SAME_LOC, GROUP2_NAME, H5P_DEFAULT,
         H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Lcreate_hard");
 
@@ -3003,7 +3003,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
 {
     hid_t	fid;		/* HDF5 File ID			*/
     hid_t	dataset;	/* Dataset ID			*/
-    hid_t	gid1, gid2;	/* Group ID			*/ 
+    hid_t	gid1, gid2;	/* Group ID			*/
     hid_t	sid, sid2;	/* Dataspace ID			*/
     hid_t	attr, attr2, add_attr;	/* Attribute ID			*/
     hid_t	dcpl;	        /* Dataset creation property list ID */
@@ -3096,7 +3096,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
 
     /* Open the attribute just created and get a second ID */
-    attr2 = H5Aopen(dataset, attrname, H5P_DEFAULT); 
+    attr2 = H5Aopen(dataset, attrname, H5P_DEFAULT);
     CHECK(attr2, FAIL, "H5Aopen");
 
     /* Close attribute */
@@ -3105,7 +3105,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
 
     ret = H5Aclose(attr2);
     CHECK(ret, FAIL, "H5Aclose");
- 
+
     /* Close Dataset */
     ret = H5Dclose(dataset);
     CHECK(ret, FAIL, "H5Dclose");
@@ -3115,7 +3115,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*-----------------------------------------------------------------------------------
-     *        Reopen the file and verify the fill value for attribute.  Also write 
+     *        Reopen the file and verify the fill value for attribute.  Also write
      *        some real data.
      */
     /* Open file */
@@ -3141,7 +3141,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     /* Verify values read in */
     for(i = 0; i < ATTR1_DIM1; i++)
         if(0 != read_data1[i])
-            TestErrPrintf("%d: attribute data different: read_data1[%d]=%d\n", __LINE__, 
+            TestErrPrintf("%d: attribute data different: read_data1[%d]=%d\n", __LINE__,
                 i, read_data1[i]);
 
     /* Open attribute for the second time */
@@ -3230,7 +3230,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
 
     /*-----------------------------------------------------------------------------------
      *        Open the attribute by index.  Verify the data is shared when the attribute
-     *        is opened twice. 
+     *        is opened twice.
      */
     /* Open file */
     fid = H5Fopen(FILENAME, H5F_ACC_RDWR, fapl);
@@ -3245,12 +3245,12 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
 
     /* Open first attribute for the dataset */
-    attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4, 
+    attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Aopen");
 
     /* Open attribute for the second time */
-    attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4, 
+    attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Aopen");
 
@@ -3264,7 +3264,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
 
     /* Verify values read in */
     if(read_scalar != scalar_data)
-        TestErrPrintf("%d: attribute data different: read_scalar=%d, scalar_data=%d\n", 
+        TestErrPrintf("%d: attribute data different: read_scalar=%d, scalar_data=%d\n",
             __LINE__, read_scalar, scalar_data);
 
     /* Close attribute */
@@ -3283,7 +3283,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*-----------------------------------------------------------------------------------
-     *        Open one attribute.  As it remains open, delete some attributes.  The 
+     *        Open one attribute.  As it remains open, delete some attributes.  The
      *        attribute storage should switch from dense to compact.  Then open the
      *        same attribute for the second time and verify that the attribute data
      *        is shared.
@@ -3301,13 +3301,13 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
 
     /* Open attribute of the dataset for the first time */
-    attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2, 
+    attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Aopen");
 
     /* Delete a few attributes until the storage switches to compact */
     for(u = max_compact; u >= min_dense - 1; u--) {
-        ret = H5Adelete_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u, 
+        ret = H5Adelete_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u,
             H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Adelete_by_idx");
     }
@@ -3317,7 +3317,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
 
     /* Open attribute for the second time */
-    attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2, 
+    attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Aopen");
 
@@ -3331,7 +3331,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
 
     /* Verify values read in */
     if(read_scalar != scalar_data)
-        TestErrPrintf("%d: attribute data different: read_scalar=%d, scalar_data=%d\n", 
+        TestErrPrintf("%d: attribute data different: read_scalar=%d, scalar_data=%d\n",
             __LINE__, read_scalar, scalar_data);
 
     /* Close attribute */
@@ -3350,7 +3350,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*-----------------------------------------------------------------------------------
-     *        Open one attribute.  As it remains open, create some attributes.  The 
+     *        Open one attribute.  As it remains open, create some attributes.  The
      *        attribute storage should switch from compact to dense.  Then open the
      *        same attribute for the second time and verify that the attribute data
      *        is shared.
@@ -3368,7 +3368,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
 
     /* Open attribute of the dataset for the first time */
-    attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3, 
+    attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Aopen");
 
@@ -3393,7 +3393,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
 
     /* Open attribute for the second time */
-    attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3, 
+    attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3,
         H5P_DEFAULT, H5P_DEFAULT);
     CHECK(attr, FAIL, "H5Aopen");
 
@@ -3407,7 +3407,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
 
     /* Verify values read in */
     if(read_scalar != scalar_data)
-        TestErrPrintf("%d: attribute data different: read_scalar=%d, scalar_data=%d\n", 
+        TestErrPrintf("%d: attribute data different: read_scalar=%d, scalar_data=%d\n",
             __LINE__, read_scalar, scalar_data);
 
     /* Close attribute */
@@ -3426,7 +3426,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Fclose");
 
     /*-----------------------------------------------------------------------------------
-     *        Verify that the attribute being pointed to by different paths shares 
+     *        Verify that the attribute being pointed to by different paths shares
      *        the same data.
      */
     /* Open file */
@@ -3438,7 +3438,7 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(gid1, FAIL, "H5Gcreate2");
 
     /* Create hard link to the first group */
-    ret = H5Lcreate_hard(gid1, GROUP1_NAME, H5L_SAME_LOC, GROUP2_NAME, H5P_DEFAULT, 
+    ret = H5Lcreate_hard(gid1, GROUP1_NAME, H5L_SAME_LOC, GROUP2_NAME, H5P_DEFAULT,
         H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Lcreate_hard");
 
@@ -9500,7 +9500,7 @@ test_attr_bug1(hid_t fcpl, hid_t fapl)
 
     ret = H5Gclose(gid);
     CHECK(ret, FAIL, "H5Gclose");
-    
+
     ret = H5Fclose(fid);
     CHECK(ret, FAIL, "H5Fclose");
 
@@ -9523,7 +9523,7 @@ test_attr_bug1(hid_t fcpl, hid_t fapl)
     /* Create attribute on first group */
     aid = H5Acreate2(gid, ATTR7_NAME, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(aid, FAIL, "H5Acreate2");
-    
+
     ret = H5Aclose(aid);
     CHECK(ret, FAIL, "H5Aclose");
 
@@ -9556,7 +9556,7 @@ test_attr_bug1(hid_t fcpl, hid_t fapl)
     /* Create another attribute on first group */
     aid = H5Acreate2(gid, ATTR8_NAME, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(aid, FAIL, "H5Acreate2");
-    
+
     ret = H5Aclose(aid);
     CHECK(ret, FAIL, "H5Aclose");
 
@@ -9582,7 +9582,7 @@ test_attr_bug1(hid_t fcpl, hid_t fapl)
     /* Re-create first attribute */
     aid = H5Acreate2(gid, ATTR7_NAME, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(aid, FAIL, "H5Acreate2");
-    
+
     ret = H5Aclose(aid);
     CHECK(ret, FAIL, "H5Aclose");
 
@@ -9593,7 +9593,7 @@ test_attr_bug1(hid_t fcpl, hid_t fapl)
     /* Re-create second attribute */
     aid = H5Acreate2(gid, ATTR8_NAME, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(aid, FAIL, "H5Acreate2");
-    
+
     ret = H5Aclose(aid);
     CHECK(ret, FAIL, "H5Aclose");
 
diff --git a/test/tcoords.c b/test/tcoords.c
index 998a598..abe63dd 100644
--- a/test/tcoords.c
+++ b/test/tcoords.c
@@ -18,7 +18,7 @@
 * Test program:	 tcoords
 *
 * Test the element coordinates for dataspace selection.  For
-* chunked dataset, when the hyperslab selection of some 
+* chunked dataset, when the hyperslab selection of some
 * dimensions is full, the library optimize it by "flattenning"
 * the fully selected dimensions.  This program tests if the
 * coordinates of selected elements are correctly calculated.
@@ -40,9 +40,9 @@ int da_buffer[2][3][6][2];
 
 /***********************************************************
 **
-** test_singleEnd_selElements(): Test element selection of only 
+** test_singleEnd_selElements(): Test element selection of only
 ** one block.
-** 
+**
 *************************************************************/
 static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
 {
@@ -53,7 +53,7 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     int i, j, k;
     hsize_t da_dims[4] = { 2, 3, 6, 2 };
     hsize_t da_chunksize[4] = { 1, 3, 3, 2 };
-    
+
     /* For testing the full selection in the fastest-growing end */
     int mem1_buffer[1][1][6][2];
     hsize_t mem1_dims[4] = { 1, 1, 6, 2 };
@@ -139,7 +139,7 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
     ret = H5Dclose(did);
     CHECK(ret, FAIL, "H5Dclose");
 
-  
+
     /* ****** Case 1: ******
      * Testing the full selection in the fastest-growing end */
     did = H5Dopen2(file, dset_name, H5P_DEFAULT);
@@ -251,7 +251,7 @@ static void test_singleEnd_selElements(hid_t file, hbool_t is_chunked)
 **
 ** test_singleEnd_selHyperslab(): Test full hyperslab selection
 ** of only one block.
-** 
+**
 *************************************************************/
 static void test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked)
 {
@@ -397,9 +397,9 @@ static void test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked)
 
 /***********************************************************
 **
-** test_multiple_end(): Test full hyperslab selection of 
+** test_multiple_end(): Test full hyperslab selection of
 ** multiple blocks.
-** 
+**
 *************************************************************/
 static void test_multiple_ends(hid_t file, hbool_t is_chunked)
 {
@@ -479,7 +479,7 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
                 for(l=0; l<4; l++)
                     for(m=0; m<2; m++)
                         for(n=0; n<3; n++)
-                            for(p=0; p<6; p++) {                
+                            for(p=0; p<6; p++) {
                                 data_buf[i][j][k][l][m][n][p][0] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p;
                                 data_buf[i][j][k][l][m][n][p][1] = i*1000000 + j*100000 + k*10000 + l*1000 + m*100 + n*10 + p + 1;
                             }
@@ -620,7 +620,7 @@ static void test_multiple_ends(hid_t file, hbool_t is_chunked)
 
 
     /* ****** Case 5: ******
-     * Testing the full selections in the fastest-growing end and the slowest-growing end, 
+     * Testing the full selections in the fastest-growing end and the slowest-growing end,
      * and also in the middle dimensions */
     did = H5Dopen2(file, dset_name, H5P_DEFAULT);
     CHECK(did, FAIL, "H5Dopen");
diff --git a/test/th5o.c b/test/th5o.c
index e6071e9..6091776 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -229,7 +229,7 @@ test_h5o_close(void)
     ret = H5Fclose(fid);
     CHECK(ret, FAIL, "H5Fclose");
 }
-   
+
 
 /****************************************************************
 **
@@ -834,7 +834,7 @@ test_h5o_link(void)
         /* Read the data back */
         ret = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
         CHECK(ret, FAIL, "H5Dread");
-        
+
         /* Verify the data */
         for(i = 0; i < TEST6_DIM1; i++)
             for(j = 0; j < TEST6_DIM2; j++)
@@ -878,7 +878,7 @@ test_h5o_link(void)
         for(i = 0; i < TEST6_DIM1; i++)
             for(j = 0; j < TEST6_DIM2; j++)
                 VERIFY(wdata[i][j], rdata[i][j], "H5Dread");
-            
+
         /* Close open IDs */
         ret = H5Dclose(dset_id);
         CHECK(ret, FAIL, "H5Dclose");
diff --git a/test/tmisc.c b/test/tmisc.c
index 7543ceb..746af5d 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -3989,7 +3989,7 @@ test_misc23(void)
 
     status = H5Tcommit2(group_id, "B13/C12/dtype", tmp_id, create_id, H5P_DEFAULT, access_id);
     CHECK(status, FAIL, "H5Tcommit2");
- 
+
     status = H5Tclose(tmp_id);
     CHECK(status, FAIL, "H5Tclose");
 
diff --git a/test/tsohm.c b/test/tsohm.c
index e213d25..a586717 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -1072,7 +1072,7 @@ static void sohm_attr_helper(hid_t fcpl_id)
 
     attr_id = H5Acreate2(group_id, "attribute", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT);
     CHECK_I(attr_id, "H5Acreate2");
-    
+
     /* Open the attribute to get another handle */
     attr_id2 = H5Aopen(group_id, "attribute", H5P_DEFAULT);
     CHECK_I(attr_id2, "H5Aopen");
@@ -1177,7 +1177,7 @@ static void test_sohm_attrs(void)
 
     sohm_attr_helper(fcpl_id);
 
-    
+
     /* Run test with all three kinds of message shared */
     ret = H5Pset_shared_mesg_index(fcpl_id, 0, H5O_SHMESG_SDSPACE_FLAG | H5O_SHMESG_DTYPE_FLAG | H5O_SHMESG_ATTR_FLAG, 2);
     CHECK_I(ret, "H5Pset_shared_mesg_nindexes");
@@ -1545,7 +1545,7 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size
             /* Get the file's size now */
             if(x == 0)
                 ret_sizes->first_dset = h5_get_file_size(FILENAME);
-            else 
+            else
                 ret_sizes->second_dset = h5_get_file_size(FILENAME);
 
             file_id = H5Fopen(FILENAME, H5F_ACC_RDWR, H5P_DEFAULT);
@@ -1978,7 +1978,7 @@ static void size2_verify(void)
  *              function size2_helper.  The test measures the size of the
  *              file at various points.  Once all of the files have been
  *              generated, the test compares the measured sizes of the files.
- *              
+ *
  *
  * Programmer:  James Laird
  *              Friday, November 17, 2006
@@ -1998,7 +1998,7 @@ static void test_sohm_size2(int close_reopen)
     /* Sizes for files that don't share all kinds of messages */
     size2_helper_struct share_some_med, share_some_btree;
     /* Sizes for files that share different sizes of messages */
-    size2_helper_struct share_some_toobig_index, share_tiny_index, type_space_index; 
+    size2_helper_struct share_some_toobig_index, share_tiny_index, type_space_index;
     herr_t      ret;
 
     if(close_reopen == 0)
@@ -2619,7 +2619,7 @@ static void delete_helper_write(hid_t file_id, hid_t *dspace_id, hid_t *dcpl_id,
     CHECK_I(attr_id, "H5Acreate2");
 
     /* Write to attribute */
-    ret = H5Awrite(attr_id, H5T_NATIVE_CHAR, &wdata); 
+    ret = H5Awrite(attr_id, H5T_NATIVE_CHAR, &wdata);
     CHECK_I(ret, "H5Awrite");
 
     ret = H5Aclose(attr_id);
@@ -3134,7 +3134,7 @@ static void test_sohm_extlink_helper(hid_t src_fcpl_id, hid_t dst_fcpl_id)
     dset_id = H5Dcreate2(src_file_id, "ext_link/dataset", H5T_NATIVE_FLOAT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK_I(dset_id, "H5Dcreate2");
 
-    /* Close the dataset and both files to make sure everything gets flushed 
+    /* Close the dataset and both files to make sure everything gets flushed
      * out of memory
      */
     ret = H5Dclose(dset_id);
@@ -3785,7 +3785,7 @@ test_sohm_extend_dset(void)
 
 
 /****************************************************************
-** 
+**
 **  test_sohm(): Main Shared Object Header Message testing routine.
 **
 ****************************************************************/
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index 7659a3e..b3d056f 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -169,10 +169,10 @@ void *tts_error_thread(void UNUSED *arg)
     int ret;
 
     /* preserve previous error stack handler */
-    H5Eget_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data); 
+    H5Eget_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data);
 
     /* set each thread's error stack handler */
-    H5Eset_auto2(H5E_DEFAULT, error_callback, NULL); 
+    H5Eset_auto2(H5E_DEFAULT, error_callback, NULL);
 
     /* define dataspace for dataset */
     dimsf[0] = 1;
@@ -198,7 +198,7 @@ void *tts_error_thread(void UNUSED *arg)
     assert(ret >= 0);
 
     /* turn our error stack handler off */
-    H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data); 
+    H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data);
 
     return NULL;
 }
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 1ea0eaa..867d8d5 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -30,7 +30,7 @@
 
 /* 1-D dataset with fixed dimensions */
 #define SPACE1_RANK	1
-#define SPACE1_DIM1     4 
+#define SPACE1_DIM1     4
 
 /* 2-D dataset with fixed dimensions */
 #define SPACE2_RANK	2
@@ -42,7 +42,7 @@
 #define SPACE3_DIM1     128
 #define L1_INCM         16
 #define L2_INCM         8
-#define L3_INCM         3 
+#define L3_INCM         3
 
 /* 1-D dataset with fixed dimensions */
 #define SPACE4_RANK	1
@@ -1159,7 +1159,7 @@ test_vltypes_compound_vlen_vlen(void)
 **  test_vltypes_compound_vlstr(): Test VL datatype code.
 **      Tests VL datatypes of compound datatypes with VL string.
 **      Dataset is extensible chunked, and data is rewritten with
-**      shorter VL data. 
+**      shorter VL data.
 **
 ****************************************************************/
 static void
@@ -2387,7 +2387,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
 
 /****************************************************************
 **
-**  test_vltypes_fill_value(): Test fill value for VL data.  
+**  test_vltypes_fill_value(): Test fill value for VL data.
 **  One tests data space isn't allocated; another tests data
 **  space is allocated.
 **
@@ -2431,7 +2431,7 @@ test_vltypes_fill_value(void)
     hsize_t large_select_count[] = {SPACE4_DIM_LARGE / 2};       /* Count of large non-contiguous element selection */
     hsize_t select_block[] = {1};       /* Block size of non-contiguous element selection */
     hid_t dcpl_id, xfer_pid;
-    hid_t dset_id; 
+    hid_t dset_id;
     hsize_t small_dims[] = {SPACE4_DIM_SMALL};
     hsize_t large_dims[] = {SPACE4_DIM_LARGE};
     size_t dset_elmts;                  /* Number of elements in a particular dataset */
diff --git a/test/vfd.c b/test/vfd.c
index b5ca096..8e0f02c 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -156,7 +156,7 @@ test_direct(void)
     size_t	fbsize;
     size_t	cbsize;
     int		*points, *check, *p1, *p2;
-    int		wdata2[DSET2_DIM] = {11,12,13,14}; 
+    int		wdata2[DSET2_DIM] = {11,12,13,14};
     int		rdata2[DSET2_DIM];
     int		i, j, n;
 #endif /*H5_HAVE_DIRECT*/
@@ -183,7 +183,7 @@ test_direct(void)
 
     if(H5Pset_alignment(fapl, (hsize_t)THRESHOLD, (hsize_t)FBSIZE) < 0)
 	TEST_ERROR;
-	
+
     H5E_BEGIN_TRY {
         file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
     } H5E_END_TRY;
@@ -351,7 +351,7 @@ error:
  *              Added test for H5Fget_filesize.
  *
  *              Raymond Lu, 2006-11-30
- *              Enabled the driver to read an existing file depending on 
+ *              Enabled the driver to read an existing file depending on
  *              the setting of the backing_store and file open flags.
  *-------------------------------------------------------------------------
  */
@@ -408,7 +408,7 @@ test_core(void)
         TEST_ERROR;
 
 
-    /* Open the file with backing store off for read and write.  
+    /* Open the file with backing store off for read and write.
      * Changes won't be saved in file. */
     if(H5Pset_fapl_core(fapl, (size_t)CORE_INCREMENT, FALSE) < 0)
         TEST_ERROR;
@@ -468,7 +468,7 @@ test_core(void)
     if(H5Fclose(file) < 0)
         TEST_ERROR;
 
-    /* Open the file with backing store on for read and write.  
+    /* Open the file with backing store on for read and write.
      * Changes will be saved in file. */
     if(H5Pset_fapl_core(fapl, (size_t)CORE_INCREMENT, TRUE) < 0)
         TEST_ERROR;
@@ -943,7 +943,7 @@ test_multi(void)
     sprintf(sv[H5FD_MEM_BTREE],  "%%s-%c.h5", 'b');
     memb_name[H5FD_MEM_BTREE] = sv[H5FD_MEM_BTREE];
     memb_addr[H5FD_MEM_BTREE] = HADDR_MAX/4;
- 
+
     sprintf(sv[H5FD_MEM_DRAW], "%%s-%c.h5", 'r');
     memb_name[H5FD_MEM_DRAW] = sv[H5FD_MEM_DRAW];
     memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index dc047ed..215761b 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -98,8 +98,8 @@ long local_pins		   = 0;
  *		value must be positive, and may not be larger than len.
  *
  *		The field exists to allow us change the sizes of entries
- *		in the cache without upsetting the server.  This value 
- *		is only used locally, and is never sent to the server.  
+ *		in the cache without upsetting the server.  This value
+ *		is only used locally, and is never sent to the server.
  *
  *	ver:	Version number of the entry.  This number is initialize
  *		to zero, and incremented each time the entry is modified.
@@ -363,7 +363,7 @@ void pin_protected_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
                          int32_t idx, hbool_t global);
 void rename_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
                   int32_t old_idx, int32_t new_idx);
-void resize_entry(H5C_t * cache_ptr, H5F_t * file_ptr, 
+void resize_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
 		  int32_t idx, size_t  new_size);
 hbool_t setup_cache_for_test(hid_t * fid_ptr, H5F_t ** file_ptr_ptr,
                              H5C_t ** cache_ptr_ptr);
@@ -1421,7 +1421,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
                 HDfprintf(stdout,
                   "%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n",
                          world_mpi_rank, fcn_name,
-                         mssg_ptr->src, 
+                         mssg_ptr->src,
 			target_index,
 			data[target_index].base_addr);
             }
@@ -2092,8 +2092,8 @@ load_datum(H5F_t UNUSED *f,
  * 		JRM -- 7/11/06
  * 		Modified function to return the local_len field instead
  * 		of the len field.  These two fields usually contain the
- * 		same value, but if the size of an entry is changed, we 
- * 		store the altered size in local_len without changing 
+ * 		same value, but if the size of an entry is changed, we
+ * 		store the altered size in local_len without changing
  * 		len.  Note that local_len must be positive, and may
  * 		not exceed len.
  *
@@ -2179,7 +2179,7 @@ expunge_entry(H5C_t * cache_ptr,
 
     if ( nerrors == 0 ) {
 
-        result = H5AC_expunge_entry(file_ptr, -1, &(types[0]), 
+        result = H5AC_expunge_entry(file_ptr, -1, &(types[0]),
 			            entry_ptr->header.addr);
 
         if ( result < 0 ) {
@@ -2683,7 +2683,7 @@ lock_and_unlock_random_entry(H5C_t * cache_ptr,
  * Modifications:
  *
  * 		JRM -- 7/11/06
- * 		Modified asserts to handle the new local_len field in 
+ * 		Modified asserts to handle the new local_len field in
  * 		datum.
  *
  *****************************************************************************/
@@ -2989,7 +2989,7 @@ pin_protected_entry(H5C_t * cache_ptr,
 
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, 
+	        HDfprintf(stdout,
 			  "%d:%s: Error in H5AC_pin_protected entry().\n",
 	                  world_mpi_rank, fcn_name);
             }
@@ -3004,7 +3004,7 @@ pin_protected_entry(H5C_t * cache_ptr,
 	} else {
 
 	    entry_ptr->local_pinned = TRUE;
- 
+
 	    local_pins++;
 
 	}
@@ -3034,7 +3034,7 @@ pin_protected_entry(H5C_t * cache_ptr,
  *
  * Modifications:
  *
- *              7/11/06 -- JRM 
+ *              7/11/06 -- JRM
  *              Added support for the phony_len field in datum.
  *
  *****************************************************************************/
@@ -3168,14 +3168,14 @@ resize_entry(H5C_t * cache_ptr,
         HDassert( ((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE );
         HDassert( !(entry_ptr->header.is_protected) );
         HDassert( !(entry_ptr->locked) );
-	HDassert( ( entry_ptr->global_pinned ) && 
+	HDassert( ( entry_ptr->global_pinned ) &&
 		  ( ! entry_ptr->local_pinned ) );
 	HDassert( ( entry_ptr->header.size == entry_ptr->len ) ||
 	          ( entry_ptr->header.size == entry_ptr->local_len ) );
 	HDassert( new_size > 0 );
 	HDassert( new_size <= entry_ptr->len );
 
-	result = H5AC_resize_pinned_entry(file_ptr, (void *)entry_ptr, 
+	result = H5AC_resize_pinned_entry(file_ptr, (void *)entry_ptr,
 			                  new_size);
 
         if ( result < 0 ) {
@@ -3740,7 +3740,7 @@ unpin_entry(H5C_t * cache_ptr,
 
 	    if ( dirty ) {
 
-		mark_pinned_entry_dirty(cache_ptr, file_ptr, idx, FALSE, 
+		mark_pinned_entry_dirty(cache_ptr, file_ptr, idx, FALSE,
 				        (size_t)0);
 
 	    }
@@ -4813,7 +4813,7 @@ smoke_check_4(void)
 
 		/* Insert some entries pinned, and then unpin them
 		 * immediately.  We have tested pinned entries elsewhere,
-		 * so it should be sufficient to verify that the 
+		 * so it should be sufficient to verify that the
 		 * entries are in fact pinned (which unpin_entry() should do).
 		 */
                 insert_entry(cache_ptr, file_ptr, i, H5C__PIN_ENTRY_FLAG);
@@ -5035,7 +5035,7 @@ smoke_check_4(void)
  * Modifications:
  *
  *		JRM -- 7/12/06
- *		Added test code for H5AC_expunge_entry() and 
+ *		Added test code for H5AC_expunge_entry() and
  *		H5AC_resize_pinned_entry().
  *
  *****************************************************************************/
@@ -5237,7 +5237,7 @@ smoke_check_5(void)
  *              H5AC level, so all calls have to go through H5AC.  Thus it
  *              is more convenient to test trace file capabilities in the
  *              parallel cache test which works at the H5AC level, instead
- *              of in the serial test code which does everything at the 
+ *              of in the serial test code which does everything at the
  *              H5C level.
  *
  *              The function must test trace file output in the following
@@ -5267,9 +5267,9 @@ smoke_check_5(void)
  * Modifications:
  *
  *		JRM -- 7/11/06
- *		Updated fro H5AC_expunge_entry() and 
+ *		Updated fro H5AC_expunge_entry() and
  *		H5AC_resize_pinned_entry().
- *	
+ *
  *****************************************************************************/
 
 hbool_t
@@ -5365,12 +5365,12 @@ trace_file_check(void)
 
             config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
 
-            if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config) 
+            if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 		nerrors++;
-	        HDfprintf(stdout, 
-                        "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n", 
+	        HDfprintf(stdout,
+                        "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
 
             } else {
@@ -5378,11 +5378,11 @@ trace_file_check(void)
                 config.open_trace_file = TRUE;
 		strcpy(config.trace_file_name, "t_cache_trace.txt");
 
-                if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config) 
+                if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config)
                      != SUCCEED ) {
 
 		    nerrors++;
-	            HDfprintf(stdout, 
+	            HDfprintf(stdout,
                          "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
                           world_mpi_rank, fcn_name);
                 }
@@ -5419,7 +5419,7 @@ trace_file_check(void)
         if ( H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0 ) {
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", 
+	        HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n",
                           world_mpi_rank, fcn_name);
             }
         }
@@ -5428,12 +5428,12 @@ trace_file_check(void)
 
             config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
 
-            if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config) 
+            if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 		nerrors++;
-	        HDfprintf(stdout, 
-                        "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n", 
+	        HDfprintf(stdout,
+                        "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
 
             } else {
@@ -5442,11 +5442,11 @@ trace_file_check(void)
                 config.close_trace_file = TRUE;
 		config.trace_file_name[0] = '\0';
 
-                if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config) 
+                if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config)
                      != SUCCEED ) {
 
 		    nerrors++;
-	            HDfprintf(stdout, 
+	            HDfprintf(stdout,
                          "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
                           world_mpi_rank, fcn_name);
                 }
@@ -5465,7 +5465,7 @@ trace_file_check(void)
             }
         }
 
-        /* verify that all instance of datum are back where the started 
+        /* verify that all instance of datum are back where the started
          * and are clean.
          */
 
@@ -5493,22 +5493,22 @@ trace_file_check(void)
 
                 nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", 
+                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n",
                               world_mpi_rank, fcn_name);
                 }
             }
         }
 
         if ( nerrors == 0 ) {
-	
-	    sprintf(trace_file_name, "t_cache_trace.txt.%d", 
+
+	    sprintf(trace_file_name, "t_cache_trace.txt.%d",
 		    (int)file_mpi_rank);
 
 	    if ( (trace_file_ptr = HDfopen(trace_file_name, "r")) == NULL ) {
 
                 nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, "%d:%s: HDfopen failed.\n", 
+                    HDfprintf(stdout, "%d:%s: HDfopen failed.\n",
                               world_mpi_rank, fcn_name);
                 }
             }
@@ -5544,7 +5544,7 @@ trace_file_check(void)
 
 	        nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
 			      "%d:%s: Unexpected data in trace file line %d.\n",
                               world_mpi_rank, fcn_name, i);
 		    HDfprintf(stdout, "%d:%s: expected = \"%s\" %d\n",
@@ -5785,10 +5785,10 @@ main(int argc, char **argv)
 #endif
 #if 1
     smoke_check_5();
-#endif   
+#endif
 #if 1
     trace_file_check();
-#endif   
+#endif
 
 finish:
     /* make sure all processes are finished before final report, cleanup
diff --git a/testpar/t_cache2.c b/testpar/t_cache2.c
index e8ad9cb..75c7ef9 100644
--- a/testpar/t_cache2.c
+++ b/testpar/t_cache2.c
@@ -54,11 +54,11 @@ hid_t noblock_dxpl_id=(-1);
 const char *FILENAME[NFILENAME]={"Cache2TestDummy", NULL};
 char    filenames[NFILENAME][PATH_MAX];
 hid_t   fapl;                           /* file access property list */
-haddr_t max_addr = 0;			/* used to store the end of 
+haddr_t max_addr = 0;			/* used to store the end of
 					 * the address space used by
 					 * the data array (see below).
 					 */
-hbool_t callbacks_verbose = FALSE;	/* flag used to control whether 
+hbool_t callbacks_verbose = FALSE;	/* flag used to control whether
 					 * the callback functions are in
 					 * verbose mode.
 					 */
@@ -109,8 +109,8 @@ long local_pins		   = 0;
  *		value must be positive, and may not be larger than len.
  *
  *		The field exists to allow us change the sizes of entries
- *		in the cache without upsetting the server.  This value 
- *		is only used locally, and is never sent to the server.  
+ *		in the cache without upsetting the server.  This value
+ *		is only used locally, and is never sent to the server.
  *
  *	ver:	Version number of the entry.  This number is initialize
  *		to zero, and incremented each time the entry is modified.
@@ -396,7 +396,7 @@ void pin_protected_entry(H5C2_t * cache_ptr, H5F_t * file_ptr,
                          int32_t idx, hbool_t global);
 void rename_entry(H5C2_t * cache_ptr, H5F_t * file_ptr,
                   int32_t old_idx, int32_t new_idx);
-void resize_entry(H5C2_t * cache_ptr, H5F_t * file_ptr, 
+void resize_entry(H5C2_t * cache_ptr, H5F_t * file_ptr,
 		  int32_t idx, size_t  new_size);
 hbool_t setup_cache_for_test(hid_t * fid_ptr, H5F_t ** file_ptr_ptr,
                              H5C2_t ** cache_ptr_ptr);
@@ -1457,7 +1457,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
                 HDfprintf(stdout,
                   "%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n",
                          world_mpi_rank, fcn_name,
-                         mssg_ptr->src, 
+                         mssg_ptr->src,
 			target_index,
 			data[target_index].base_addr);
             }
@@ -1696,7 +1696,7 @@ serve_write_request(struct mssg_t * mssg_ptr)
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 datum_clear_dirty_bits(UNUSED haddr_t addr,
                        UNUSED size_t len,
                        void * thing)
@@ -1712,7 +1712,7 @@ datum_clear_dirty_bits(UNUSED haddr_t addr,
 
     if ( callbacks_verbose ) {
 
-        HDfprintf(stdout, 
+        HDfprintf(stdout,
 		  "%d: clear_dirty_bits() idx = %d, addr = %ld, len = %d.\n",
 		  world_mpi_rank, idx, (long)addr, (int)len);
 	fflush(stdout);
@@ -1788,9 +1788,9 @@ datum_deserialize(haddr_t addr,
 
     if ( callbacks_verbose ) {
 
-        HDfprintf(stdout, 
+        HDfprintf(stdout,
 	  "%d: deserialize() idx = %d, addr = %ld, len = %d, is_dirty = %d.\n",
-	  world_mpi_rank, idx, (long)addr, (int)len, 
+	  world_mpi_rank, idx, (long)addr, (int)len,
 	  (int)(entry_ptr->header.is_dirty));
 	fflush(stdout);
     }
@@ -1921,8 +1921,8 @@ datum_deserialize(haddr_t addr,
  * Function:	datum_image_len
  *
  * 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 
+ * 		The helper functions verify that the correct version of
+ * 		deserialize is being called, and then call deserialize
  * 		proper.
  *
  * Return:	SUCCEED
@@ -1937,7 +1937,7 @@ datum_deserialize(haddr_t addr,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 datum_image_len(void *thing,
                 size_t *image_len_ptr)
 {
@@ -1962,9 +1962,9 @@ datum_image_len(void *thing,
 
     if ( callbacks_verbose ) {
 
-        HDfprintf(stdout, 
+        HDfprintf(stdout,
 		  "%d: image_len() idx = %d, addr = %ld, len = %d.\n",
-		  world_mpi_rank, idx, (long)(entry_ptr->base_addr), 
+		  world_mpi_rank, idx, (long)(entry_ptr->base_addr),
 		  (int)(entry_ptr->local_len));
 	fflush(stdout);
     }
@@ -1995,7 +1995,7 @@ datum_image_len(void *thing,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 datum_serialize(const H5F_t UNUSED *f,
                 hid_t UNUSED dxpl_id,
                 haddr_t UNUSED addr,
@@ -2035,7 +2035,7 @@ datum_serialize(const H5F_t UNUSED *f,
 
     if ( callbacks_verbose ) {
 
-        HDfprintf(stdout, 
+        HDfprintf(stdout,
 		  "%d: serialize() idx = %d, addr = %ld, len = %d.\n",
 		  world_mpi_rank, idx, (long)addr, (int)len);
 	fflush(stdout);
@@ -2133,12 +2133,12 @@ datum_serialize(const H5F_t UNUSED *f,
 /*-------------------------------------------------------------------------
  * Function:	datum_free_icr
  *
- * 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 
+ * 		In the context of this test bed, we use it to do
  * 		do all the processing we used to do on a destroy.
- * 		
+ *
  * Return:	SUCCEED
  *
  * Programmer:	John Mainzer
@@ -2151,7 +2151,7 @@ datum_serialize(const H5F_t UNUSED *f,
  *-------------------------------------------------------------------------
  */
 
-herr_t 
+herr_t
 datum_free_icr(UNUSED haddr_t addr,
                UNUSED size_t len,
                void * thing)
@@ -2172,9 +2172,9 @@ datum_free_icr(UNUSED haddr_t addr,
 
     if ( callbacks_verbose ) {
 
-        HDfprintf(stdout, 
+        HDfprintf(stdout,
 	  "%d: free_icr() idx = %d, addr = %ld, len = %d, dirty = %d.\n",
-		  world_mpi_rank, idx, (long)addr, (int)len, 
+		  world_mpi_rank, idx, (long)addr, (int)len,
 		  (int)(entry_ptr->dirty));
 	fflush(stdout);
     }
@@ -2244,7 +2244,7 @@ expunge_entry(H5C2_t * cache_ptr,
 
     if ( nerrors == 0 ) {
 
-        result = H5AC2_expunge_entry(file_ptr, -1, &(types[0]), 
+        result = H5AC2_expunge_entry(file_ptr, -1, &(types[0]),
 			            entry_ptr->header.addr);
 
         if ( result < 0 ) {
@@ -2333,7 +2333,7 @@ insert_entry(H5C2_t * cache_ptr,
         (entry_ptr->ver)++;
         entry_ptr->dirty = TRUE;
 
-        result = H5AC2_set(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]), 
+        result = H5AC2_set(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]),
                            entry_ptr->base_addr, entry_ptr->local_len,
                           (void *)(&(entry_ptr->header)), flags);
 
@@ -2749,7 +2749,7 @@ lock_and_unlock_random_entry(H5C2_t * cache_ptr,
  * Modifications:
  *
  * 		JRM -- 7/11/06
- * 		Modified asserts to handle the new local_len field in 
+ * 		Modified asserts to handle the new local_len field in
  * 		datum.
  *
  *****************************************************************************/
@@ -2773,7 +2773,7 @@ lock_entry(H5C2_t * cache_ptr,
 
 	HDassert( ! (entry_ptr->locked) );
 
-        cache_entry_ptr = H5AC2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT, 
+        cache_entry_ptr = H5AC2_protect(file_ptr, H5P_DATASET_XFER_DEFAULT,
                                         &(types[0]), entry_ptr->base_addr,
                                         entry_ptr->local_len, NULL, H5AC2_WRITE);
 
@@ -3053,7 +3053,7 @@ pin_protected_entry(H5C2_t * cache_ptr,
 
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, 
+	        HDfprintf(stdout,
 			  "%d:%s: Error in H5AC2_pin_protected entry().\n",
 	                  world_mpi_rank, fcn_name);
             }
@@ -3068,7 +3068,7 @@ pin_protected_entry(H5C2_t * cache_ptr,
 	} else {
 
 	    entry_ptr->local_pinned = TRUE;
- 
+
 	    local_pins++;
 
 	}
@@ -3098,7 +3098,7 @@ pin_protected_entry(H5C2_t * cache_ptr,
  *
  * Modifications:
  *
- *              7/11/06 -- JRM 
+ *              7/11/06 -- JRM
  *              Added support for the phony_len field in datum.
  *
  *****************************************************************************/
@@ -3232,7 +3232,7 @@ resize_entry(H5C2_t * cache_ptr,
         HDassert( ((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE );
         HDassert( !(entry_ptr->header.is_protected) );
         HDassert( !(entry_ptr->locked) );
-	HDassert( ( entry_ptr->global_pinned ) && 
+	HDassert( ( entry_ptr->global_pinned ) &&
 		  ( ! entry_ptr->local_pinned ) );
 	HDassert( ( entry_ptr->header.size == entry_ptr->len ) ||
 	          ( entry_ptr->header.size == entry_ptr->local_len ) );
@@ -3330,7 +3330,7 @@ setup_cache_for_test(hid_t * fid_ptr,
     }
 
     if ( file_ptr == NULL ) {
-        
+
         if ( verbose ) {
 	    HDfprintf(stdout, "%d:%s: Can't get file_ptr.\n",
                       world_mpi_rank, fcn_name);
@@ -3377,7 +3377,7 @@ setup_cache_for_test(hid_t * fid_ptr,
 
             config.rpt_fcn_enabled = TRUE;
 
-            if ( H5AC2_set_cache_auto_resize_config(file_ptr, &config) 
+            if ( H5AC2_set_cache_auto_resize_config(file_ptr, &config)
 		 != SUCCEED ) {
 
 	        HDfprintf(stdout,
@@ -3852,7 +3852,7 @@ unpin_entry(H5C2_t * cache_ptr,
 
 	    if ( dirty ) {
 
-		mark_pinned_entry_dirty(cache_ptr, file_ptr, idx, FALSE, 
+		mark_pinned_entry_dirty(cache_ptr, file_ptr, idx, FALSE,
 				        (size_t)0);
 
 	    }
@@ -5000,7 +5000,7 @@ smoke_check_4(void)
 
 		/* Insert some entries pinned, and then unpin them
 		 * immediately.  We have tested pinned entries elsewhere,
-		 * so it should be sufficient to verify that the 
+		 * so it should be sufficient to verify that the
 		 * entries are in fact pinned (which unpin_entry() should do).
 		 */
                 insert_entry(cache_ptr, file_ptr, i, H5C2__PIN_ENTRY_FLAG);
@@ -5222,7 +5222,7 @@ smoke_check_4(void)
  * Modifications:
  *
  *		JRM -- 7/12/06
- *		Added test code for H5AC2_expunge_entry() and 
+ *		Added test code for H5AC2_expunge_entry() and
  *		H5AC2_resize_pinned_entry().
  *
  *****************************************************************************/
@@ -5529,7 +5529,7 @@ smoke_check_5(void)
  *              H5AC2 level, so all calls have to go through H5AC2.  Thus it
  *              is more convenient to test trace file capabilities in the
  *              parallel cache test which works at the H5AC2 level, instead
- *              of in the serial test code which does everything at the 
+ *              of in the serial test code which does everything at the
  *              H5C2 level.
  *
  *              The function must test trace file output in the following
@@ -5559,13 +5559,13 @@ smoke_check_5(void)
  * Modifications:
  *
  *		JRM -- 7/11/06
- *		Updated for H5AC2_expunge_entry() and 
+ *		Updated for H5AC2_expunge_entry() and
  *		H5AC2_resize_pinned_entry().
  *
  *		JRM -- 2/14/08
  *		Updated for changes in H5AC2_set_cache_auto_resize_config
  *		to support the new flash cache size increment code.
- *	
+ *
  *****************************************************************************/
 
 hbool_t
@@ -5661,12 +5661,12 @@ trace_file_check(void)
 
             config.version = H5AC2__CURR_CACHE_CONFIG_VERSION;
 
-            if ( H5AC2_get_cache_auto_resize_config(cache_ptr, &config) 
+            if ( H5AC2_get_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 		nerrors++;
-	        HDfprintf(stdout, 
-                        "%d:%s: H5AC2_get_cache_auto_resize_config() failed.\n", 
+	        HDfprintf(stdout,
+                        "%d:%s: H5AC2_get_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
 
             } else {
@@ -5674,11 +5674,11 @@ trace_file_check(void)
                 config.open_trace_file = TRUE;
 		strcpy(config.trace_file_name, "t_cache2_trace.txt");
 
-                if ( H5AC2_set_cache_auto_resize_config(file_ptr, &config) 
+                if ( H5AC2_set_cache_auto_resize_config(file_ptr, &config)
 			!= SUCCEED ) {
 
 		    nerrors++;
-	            HDfprintf(stdout, 
+	            HDfprintf(stdout,
                          "%d:%s: H5AC2_set_cache_auto_resize_config() failed.\n",
                           world_mpi_rank, fcn_name);
                 }
@@ -5715,7 +5715,7 @@ trace_file_check(void)
         if ( H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0 ) {
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n", 
+	        HDfprintf(stdout, "%d:%s: H5Fflush() failed.\n",
                           world_mpi_rank, fcn_name);
             }
         }
@@ -5724,12 +5724,12 @@ trace_file_check(void)
 
             config.version = H5AC2__CURR_CACHE_CONFIG_VERSION;
 
-            if ( H5AC2_get_cache_auto_resize_config(cache_ptr, &config) 
+            if ( H5AC2_get_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 		nerrors++;
-	        HDfprintf(stdout, 
-                        "%d:%s: H5AC2_get_cache_auto_resize_config() failed.\n", 
+	        HDfprintf(stdout,
+                        "%d:%s: H5AC2_get_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
 
             } else {
@@ -5738,11 +5738,11 @@ trace_file_check(void)
                 config.close_trace_file = TRUE;
 		config.trace_file_name[0] = '\0';
 
-                if ( H5AC2_set_cache_auto_resize_config(file_ptr, &config) 
+                if ( H5AC2_set_cache_auto_resize_config(file_ptr, &config)
 			!= SUCCEED ) {
 
 		    nerrors++;
-	            HDfprintf(stdout, 
+	            HDfprintf(stdout,
                         "%d:%s: H5AC2_set_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
                 }
@@ -5761,7 +5761,7 @@ trace_file_check(void)
             }
         }
 
-        /* verify that all instance of datum are back where the started 
+        /* verify that all instance of datum are back where the started
          * and are clean.
          */
 
@@ -5789,22 +5789,22 @@ trace_file_check(void)
 
                 nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n", 
+                    HDfprintf(stdout, "%d:%s: send_mssg() failed on done.\n",
                               world_mpi_rank, fcn_name);
                 }
             }
         }
 
         if ( nerrors == 0 ) {
-	
-	    sprintf(trace_file_name, "t_cache2_trace.txt.%d", 
+
+	    sprintf(trace_file_name, "t_cache2_trace.txt.%d",
 		    (int)file_mpi_rank);
 
 	    if ( (trace_file_ptr = HDfopen(trace_file_name, "r")) == NULL ) {
 
                 nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, "%d:%s: HDfopen failed.\n", 
+                    HDfprintf(stdout, "%d:%s: HDfopen failed.\n",
                               world_mpi_rank, fcn_name);
                 }
             }
@@ -5840,7 +5840,7 @@ trace_file_check(void)
 
 	        nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
 			      "%d:%s: Unexpected data in trace file line %d.\n",
                               world_mpi_rank, fcn_name, i);
 		    HDfprintf(stdout, "%d:%s: expected = \"%s\" %d\n",
@@ -6081,10 +6081,10 @@ main(int argc, char **argv)
 #endif
 #if 1
     smoke_check_5();
-#endif   
+#endif
 #if 1
     trace_file_check();
-#endif   
+#endif
 
 finish:
     /* make sure all processes are finished before final report, cleanup
diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c
index 8f4fdf2..f49cef8 100644
--- a/testpar/t_coll_chunk.c
+++ b/testpar/t_coll_chunk.c
@@ -36,7 +36,7 @@ static void coll_chunktest(const char* filename,int chunk_factor,int select_fact
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk1
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with a single chunk
  *
  * Return:	Success:	0
@@ -53,7 +53,7 @@ static void coll_chunktest(const char* filename,int chunk_factor,int select_fact
 
 /* ------------------------------------------------------------------------
  *  Descriptions for the selection: One big singluar selection inside one chunk
- *  Two dimensions, 
+ *  Two dimensions,
  *
  *  dim1       = SPACE_DIM1(5760)*mpi_size
  *  dim2       = SPACE_DIM2(3)
@@ -83,7 +83,7 @@ coll_chunk1(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk2
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular DISJOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular DISJOINT
                 selection with a single chunk
  *
  * Return:	Success:	0
@@ -100,7 +100,7 @@ coll_chunk1(void)
 
  /* ------------------------------------------------------------------------
  *  Descriptions for the selection: many disjoint selections inside one chunk
- *  Two dimensions, 
+ *  Two dimensions,
  *
  *  dim1       = SPACE_DIM1*mpi_size(5760)
  *  dim2       = SPACE_DIM2(3)
@@ -112,7 +112,7 @@ coll_chunk1(void)
  *  count1     = SPACE_DIM2/stride(3/3 = 1)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 void
@@ -130,7 +130,7 @@ coll_chunk2(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk3
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -159,7 +159,7 @@ coll_chunk2(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -181,7 +181,7 @@ coll_chunk3(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk4
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -210,7 +210,7 @@ coll_chunk3(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -231,7 +231,7 @@ coll_chunk4(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk4
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -260,7 +260,7 @@ coll_chunk4(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -281,7 +281,7 @@ coll_chunk5(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk6
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -310,7 +310,7 @@ coll_chunk5(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -331,7 +331,7 @@ coll_chunk6(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk7
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -360,7 +360,7 @@ coll_chunk6(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -381,7 +381,7 @@ coll_chunk7(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk8
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -410,7 +410,7 @@ coll_chunk7(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -431,7 +431,7 @@ coll_chunk8(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk9
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -460,7 +460,7 @@ coll_chunk8(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -481,7 +481,7 @@ coll_chunk9(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_chunk10
  *
- * Purpose:	Wrapper to test the collective chunk IO for regular JOINT 
+ * Purpose:	Wrapper to test the collective chunk IO for regular JOINT
                 selection with at least number of 2*mpi_size chunks
  *
  * Return:	Success:	0
@@ -510,7 +510,7 @@ coll_chunk9(void)
  *  count1     = SPACE_DIM2(3)
  *  start0     = mpi_rank*SPACE_DIM1
  *  start1     = 0
- *  
+ *
  * ------------------------------------------------------------------------
  */
 
@@ -535,7 +535,7 @@ coll_chunk10(void)
  * Purpose:     The real testing routine for regular selection of collective
                 chunking storage
                 testing both write and read,
-		If anything fails, it may be read or write. There is no 
+		If anything fails, it may be read or write. There is no
 		separation test between read and write.
  *
  * Return:	Success:	0
@@ -614,7 +614,7 @@ coll_chunktest(const char* filename,
   chunk_dims[0] = dims[0]/chunk_factor;
 
   /* to decrease the testing time, maintain bigger chunk size */
- 
+
   (chunk_factor == 1) ? (chunk_dims[1] = SPACE_DIM2) : (chunk_dims[1] = SPACE_DIM2/2);
   status = H5Pset_chunk(crp_plist, 2, chunk_dims);
   VRFY((status >= 0),"chunk creation property list succeeded");
@@ -676,8 +676,8 @@ coll_chunktest(const char* filename,
 	break;
 	default:
 	;
-   } 
-   
+   }
+
 #ifdef H5_HAVE_INSTRUMENTED_LIBRARY
   if(facc_type == FACC_MPIO) {
       switch(api_option) {
@@ -689,35 +689,35 @@ coll_chunktest(const char* filename,
             break;
 
             case API_MULTI_HARD:
-               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;
                status = H5Pinsert2(xfer_plist, H5D_XFER_COLL_CHUNK_MULTI_HARD_NAME, H5D_XFER_COLL_CHUNK_SIZE, &prop_value,
                            NULL, NULL, NULL, NULL, NULL, NULL);
                VRFY((status >= 0),"testing property list inserted succeeded");
             break;
 
             case API_LINK_TRUE:
-               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;
                status = H5Pinsert2(xfer_plist, H5D_XFER_COLL_CHUNK_LINK_NUM_TRUE_NAME, H5D_XFER_COLL_CHUNK_SIZE, &prop_value,
                            NULL, NULL, NULL, NULL, NULL, NULL);
                VRFY((status >= 0),"testing property list inserted succeeded");
             break;
 
             case API_LINK_FALSE:
-               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;
                status = H5Pinsert2(xfer_plist, H5D_XFER_COLL_CHUNK_LINK_NUM_FALSE_NAME, H5D_XFER_COLL_CHUNK_SIZE, &prop_value,
                            NULL, NULL, NULL, NULL, NULL, NULL);
                VRFY((status >= 0),"testing property list inserted succeeded");
             break;
 
             case API_MULTI_COLL:
-               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;
                status = H5Pinsert2(xfer_plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, H5D_XFER_COLL_CHUNK_SIZE, &prop_value,
                            NULL, NULL, NULL, NULL, NULL, NULL);
                VRFY((status >= 0),"testing property list inserted succeeded");
             break;
 
             case API_MULTI_IND:
-               prop_value = H5D_XFER_COLL_CHUNK_DEF;   
+               prop_value = H5D_XFER_COLL_CHUNK_DEF;
                status = H5Pinsert2(xfer_plist, H5D_XFER_COLL_CHUNK_MULTI_RATIO_IND_NAME, H5D_XFER_COLL_CHUNK_SIZE, &prop_value,
                            NULL, NULL, NULL, NULL, NULL, NULL);
                VRFY((status >= 0),"testing property list inserted succeeded");
@@ -725,10 +725,10 @@ coll_chunktest(const char* filename,
 
             default:
                 ;
-       } 
+       }
    }
 #endif
-  
+
   /* write data collectively */
   status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, file_dataspace,
 		    xfer_plist, data_array1);
@@ -769,7 +769,7 @@ coll_chunktest(const char* filename,
             break;
             default:
             ;
-       } 
+       }
    }
 #endif
 
@@ -787,7 +787,7 @@ coll_chunktest(const char* filename,
 
   if (data_array1) HDfree(data_array1);
 
-  
+
   /* Use collective read to verify the correctness of collective write. */
 
   /* allocate memory for data buffer */
@@ -864,12 +864,12 @@ coll_chunktest(const char* filename,
 
 /* Set up the selection */
 static void
-ccslab_set(int mpi_rank, 
-	   int mpi_size, 
-	   hsize_t start[], 
+ccslab_set(int mpi_rank,
+	   int mpi_size,
+	   hsize_t start[],
 	   hsize_t count[],
-	   hsize_t stride[], 
-	   hsize_t block[], 
+	   hsize_t stride[],
+	   hsize_t block[],
 	   int mode)
 {
 
@@ -918,7 +918,7 @@ ccslab_set(int mpi_rank,
     case BYROW_SELECTUNBALANCE:
       /* The first one-third of the number of processes only
          select top half of the domain, The rest will select the bottom
-         half of the domain. */   
+         half of the domain. */
 
         block[0]  = 1;
 	count[0]  = 2;
@@ -928,9 +928,9 @@ ccslab_set(int mpi_rank,
         start[1]  = 0;
         stride[1] = 1;
 	if((mpi_rank *3)<(mpi_size*2)) start[0]  = mpi_rank;
-	else start[0] = 1 + SPACE_DIM1*mpi_size/2 + (mpi_rank-2*mpi_size/3);      
+	else start[0] = 1 + SPACE_DIM1*mpi_size/2 + (mpi_rank-2*mpi_size/3);
         break;
-         
+
     case BYROW_SELECTINCHUNK:
       /* Each process will only select one chunk */
 
@@ -972,10 +972,10 @@ ccslab_set(int mpi_rank,
  * Assume dimension rank is 2.
  */
 static void
-ccdataset_fill(hsize_t start[], 
+ccdataset_fill(hsize_t start[],
 	       hsize_t stride[],
-	       hsize_t count[], 
-	       hsize_t block[], 
+	       hsize_t count[],
+	       hsize_t block[],
 	       DATATYPE * dataset)
 {
     DATATYPE *dataptr = dataset;
@@ -1007,8 +1007,8 @@ ccdataset_fill(hsize_t start[],
  * Print the first block of the content of the dataset.
  */
 static void
-ccdataset_print(hsize_t start[], 
-		hsize_t block[], 
+ccdataset_print(hsize_t start[],
+		hsize_t block[],
 		DATATYPE * dataset)
 
 {
@@ -1038,11 +1038,11 @@ ccdataset_print(hsize_t start[],
  * Print the content of the dataset.
  */
 static int
-ccdataset_vrfy(hsize_t start[], 
-	       hsize_t count[], 
-	       hsize_t stride[], 
-	       hsize_t block[], 
-	       DATATYPE *dataset, 
+ccdataset_vrfy(hsize_t start[],
+	       hsize_t count[],
+	       hsize_t stride[],
+	       hsize_t block[],
+	       DATATYPE *dataset,
 	       DATATYPE *original)
 {
     hsize_t i, j,k1,k2;
diff --git a/testpar/t_dset.c b/testpar/t_dset.c
index ce4742b..21e25b6 100644
--- a/testpar/t_dset.c
+++ b/testpar/t_dset.c
@@ -827,7 +827,7 @@ dataset_writeAll(void)
       VRFY((ret>= 0),"set independent IO collectively succeeded");
     }
 
-  
+
 
     /* write data collectively */
     MESG("writeAll with scalar dataspace");
diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c
index e2d39c3..aa642b4 100644
--- a/testpar/t_filter_read.c
+++ b/testpar/t_filter_read.c
@@ -15,7 +15,7 @@
 
 /*
  * This verifies the correctness of parallel reading of a dataset that has been
- * written serially using filters. 
+ * written serially using filters.
  *
  * Created by: Christian Chilan
  * Date: 2007/05/15
@@ -31,11 +31,11 @@
 static int mpi_size, mpi_rank;
 
 /* Chunk sizes */
-#define CHUNK_DIM1       7 
+#define CHUNK_DIM1       7
 #define CHUNK_DIM2       27
 
 /* Sizes of the vertical hyperslabs. Total dataset size is
-   {HS_DIM1, HS_DIM2 * mpi_size } */  
+   {HS_DIM1, HS_DIM2 * mpi_size } */
 #define HS_DIM1       200
 #define HS_DIM2       100
 
@@ -44,16 +44,16 @@ static int mpi_size, mpi_rank;
  * Function:	filter_read_internal
  *
  * Purpose:     Tests parallel reading of a 2D dataset written serially using
- *              filters. During the parallel reading phase, the dataset is 
- *              divided evenly among the processors in vertical hyperslabs. 
+ *              filters. During the parallel reading phase, the dataset is
+ *              divided evenly among the processors in vertical hyperslabs.
  *
- * Programmer:  Christian Chilan 
- *              Tuesday, May 15, 2007 
+ * Programmer:  Christian Chilan
+ *              Tuesday, May 15, 2007
  *
  *-------------------------------------------------------------------------
  */
-static void 
-filter_read_internal(const char *filename, hid_t dcpl, 
+static void
+filter_read_internal(const char *filename, hid_t dcpl,
                      hsize_t *dset_size)
 {
     hid_t		file, dataset;        /* HDF5 IDs */
@@ -65,14 +65,14 @@ filter_read_internal(const char *filename, hid_t dcpl,
     size_t		i, j;        /* Local index variables */
     char                name[32] = "dataset";
     herr_t              hrc;         /* Error status */
-    int                 *points = NULL; /* Writing buffer for entire dataset */ 
+    int                 *points = NULL; /* Writing buffer for entire dataset */
     int                 *check = NULL; /* Reading buffer for selected hyperslab */
 
     /* set up MPI parameters */
     MPI_Comm_size(MPI_COMM_WORLD,&mpi_size);
     MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
 
-    /* set sizes for dataset and hyperslabs */ 
+    /* set sizes for dataset and hyperslabs */
     hs_size[0] = size[0] = HS_DIM1;
     hs_size[1] = HS_DIM2;
 
@@ -80,7 +80,7 @@ filter_read_internal(const char *filename, hid_t dcpl,
 
     hs_offset[0] = 0;
     hs_offset[1] = hs_size[1] * mpi_rank;
-    
+
     /* Create the data space */
     sid = H5Screate_simple(2, size, NULL);
     VRFY(sid>=0, "H5Screate_simple");
@@ -89,7 +89,7 @@ filter_read_internal(const char *filename, hid_t dcpl,
     points = (int *)HDmalloc(size[0] * size[1] * sizeof(int));
     VRFY(points!=NULL, "HDmalloc");
 
-    check = (int *)HDmalloc(hs_size[0] * hs_size[1] * sizeof(int)); 
+    check = (int *)HDmalloc(hs_size[0] * hs_size[1] * sizeof(int));
     VRFY(check!=NULL, "HDmalloc");
 
     /* Initialize writing buffer with random data */
@@ -124,7 +124,7 @@ filter_read_internal(const char *filename, hid_t dcpl,
 
     MPI_Barrier(MPI_COMM_WORLD);
 
-    /* Parallel read phase */ 
+    /* Parallel read phase */
     /* Set up MPIO file access property lists */
     access_plist  = H5Pcreate(H5P_FILE_ACCESS);
     VRFY((access_plist >= 0), "H5Pcreate");
@@ -144,7 +144,7 @@ filter_read_internal(const char *filename, hid_t dcpl,
 
     memspace = H5Screate_simple(2, hs_size, NULL);
     VRFY(memspace>=0, "H5Screate_simple");
- 
+
     hrc = H5Dread (dataset, H5T_NATIVE_INT, memspace, sid, H5P_DEFAULT, check);
     VRFY(hrc>=0, "H5Dread");
 
@@ -179,13 +179,13 @@ filter_read_internal(const char *filename, hid_t dcpl,
 
     hrc = H5Sclose (memspace);
     VRFY(hrc>=0, "H5Sclose");
-    
+
     hrc = H5Pclose (access_plist);
     VRFY(hrc>=0, "H5Pclose");
-    
+
     hrc = H5Fclose (file);
     VRFY(hrc>=0, "H5Fclose");
-   
+
     free(points);
     free(check);
 
@@ -194,10 +194,10 @@ filter_read_internal(const char *filename, hid_t dcpl,
 
 
 /*-------------------------------------------------------------------------
- * Function:    test_filter_read	
+ * Function:    test_filter_read
  *
  * Purpose:	Tests parallel reading of datasets written serially using
- *              several (combinations of) filters. 
+ *              several (combinations of) filters.
  *
  * Programmer:	Christian Chilan
  *              Tuesday, May 15, 2007
@@ -247,16 +247,16 @@ test_filter_read(void)
      *----------------------------------------------------------
      */
     dc = H5Pcreate(H5P_DATASET_CREATE);
-    VRFY(dc>=0,"H5Pcreate"); 
+    VRFY(dc>=0,"H5Pcreate");
 
     hrc = H5Pset_chunk (dc, 2, chunk_size);
-    VRFY(hrc>=0,"H5Pset_chunk"); 
+    VRFY(hrc>=0,"H5Pset_chunk");
 
     filter_read_internal(filename,dc,&null_size);
 
     /* Clean up objects used for this test */
     hrc = H5Pclose (dc);
-    VRFY(hrc>=0,"H5Pclose"); 
+    VRFY(hrc>=0,"H5Pclose");
 
     /*----------------------------------------------------------
      * STEP 1: Test Fletcher32 Checksum by itself.
@@ -265,13 +265,13 @@ test_filter_read(void)
 #ifdef H5_HAVE_FILTER_FLETCHER32
 
     dc = H5Pcreate(H5P_DATASET_CREATE);
-    VRFY(dc>=0,"H5Pset_filter"); 
-   
+    VRFY(dc>=0,"H5Pset_filter");
+
     hrc = H5Pset_chunk (dc, 2, chunk_size);
-    VRFY(hrc>=0,"H5Pset_filter"); 
-   
+    VRFY(hrc>=0,"H5Pset_filter");
+
     hrc = H5Pset_filter (dc,H5Z_FILTER_FLETCHER32,0,0,NULL);
-    VRFY(hrc>=0,"H5Pset_filter"); 
+    VRFY(hrc>=0,"H5Pset_filter");
 
     filter_read_internal(filename,dc,&fletcher32_size);
     VRFY(fletcher32_size > null_size,"Size after checksumming is incorrect.");
@@ -296,7 +296,7 @@ test_filter_read(void)
 
     hrc = H5Pset_deflate (dc, 6);
     VRFY(hrc>=0, "H5Pset_deflate");
- 
+
     filter_read_internal(filename,dc,&deflate_size);
 
     /* Clean up objects used for this test */
@@ -344,7 +344,7 @@ test_filter_read(void)
 
     filter_read_internal(filename,dc,&shuffle_size);
     VRFY(shuffle_size==null_size,"Shuffled size not the same as uncompressed size.");
-    
+
     /* Clean up objects used for this test */
     hrc = H5Pclose (dc);
     VRFY(hrc>=0, "H5Pclose");
@@ -362,13 +362,13 @@ test_filter_read(void)
 
     hrc = H5Pset_chunk (dc, 2, chunk_size);
     VRFY(hrc>=0, "H5Pset_chunk");
- 
+
     hrc = H5Pset_fletcher32 (dc);
     VRFY(hrc>=0, "H5Pset_fletcher32");
- 
+
     hrc = H5Pset_shuffle (dc);
     VRFY(hrc>=0, "H5Pset_shuffle");
-    
+
     hrc = H5Pset_deflate (dc, 6);
     VRFY(hrc>=0, "H5Pset_deflate");
 
@@ -381,7 +381,7 @@ test_filter_read(void)
     /* Testing shuffle+deflate+checksum filters (checksum last) */
     dc = H5Pcreate(H5P_DATASET_CREATE);
     VRFY(dc>=0, "H5Pcreate");
-    
+
     hrc = H5Pset_chunk (dc, 2, chunk_size);
     VRFY(hrc>=0, "H5Pset_chunk");
 
@@ -408,7 +408,7 @@ test_filter_read(void)
      */
 #if defined H5_HAVE_FILTER_SZIP && defined H5_HAVE_FILTER_SHUFFLE && defined H5_HAVE_FILTER_FLETCHER32
 
-    /* Testing shuffle+szip(with encoder)+checksum filters(checksum first) */ 
+    /* Testing shuffle+szip(with encoder)+checksum filters(checksum first) */
     dc = H5Pcreate(H5P_DATASET_CREATE);
     VRFY(dc>=0, "H5Pcreate");
 
@@ -433,7 +433,7 @@ test_filter_read(void)
     hrc = H5Pclose (dc);
     VRFY(hrc>=0, "H5Pclose");
 
-    /* Testing shuffle+szip(with encoder)+checksum filters(checksum last) */ 
+    /* Testing shuffle+szip(with encoder)+checksum filters(checksum last) */
     /* Make sure encoding is enabled */
     if(h5_szip_can_encode() == 1) {
 	dc = H5Pcreate(H5P_DATASET_CREATE);
diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c
index 2559d3e..da48378 100644
--- a/testpar/t_mdset.c
+++ b/testpar/t_mdset.c
@@ -368,7 +368,7 @@ void null_dataset(void)
      VRFY((ret>= 0),"set independent IO collectively succeeded");
     }
 
- 
+
     dataset = H5Dopen2(iof, dname, H5P_DEFAULT);
     VRFY((dataset >= 0), "H5Dopen2 succeeded");
 
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index f68c92b..14ba6c6 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -379,10 +379,10 @@ test_mpio_gb_file(char *filename)
 	mrc = MPI_Barrier(MPI_COMM_WORLD);
 	VRFY((mrc==MPI_SUCCESS), "Sync before leaving test");
 
-        /* 
-         * Check if MPI_File_get_size works correctly.  Some systems (only SGI Altix 
+        /*
+         * Check if MPI_File_get_size works correctly.  Some systems (only SGI Altix
          * Propack 4 so far) return wrong file size.  It can be avoided by reconfiguring
-         * with "--disable-mpi-size".  
+         * with "--disable-mpi-size".
          */
 #ifdef H5_HAVE_MPI_GET_SIZE
 	printf("Test if MPI_File_get_size works correctly with %s\n", filename);
@@ -396,7 +396,7 @@ test_mpio_gb_file(char *filename)
 
             mrc=stat(filename, &stat_buf);
 	    VRFY((mrc==0), "");
-           
+
             /* Hopefully this casting is safe */
             if(size != (MPI_Offset)(stat_buf.st_size)) {
                 printf("Warning: MPI_File_get_size doesn't return correct file size.  To avoid using it in the library, reconfigure and rebuild the library with --disable-mpi-size.\n");
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index e8f3f6c..55a6020 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -51,12 +51,12 @@ static double	the_data[100][100];
  *-------------------------------------------------------------------------
  */
 hid_t create_file(char* name, hid_t fapl)
-{ 
+{
     hid_t	file, dcpl, space, dset, groups, grp, plist;
     hsize_t	ds_size[2] = {100, 100};
     hsize_t	ch_size[2] = {5, 5};
     hsize_t	i, j;
- 
+
 
 
     if((file=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) goto error;
@@ -70,8 +70,8 @@ hid_t create_file(char* name, hid_t fapl)
 
     plist = H5Pcreate(H5P_DATASET_XFER);
     H5Pset_dxpl_mpio(plist, H5FD_MPIO_COLLECTIVE);
-    
-    
+
+
     /* Write some data */
     for(i = 0; i < ds_size[0]; i++) {
 	/*
@@ -113,7 +113,7 @@ error:
  * Modifications:
  * 		Leon Arber
  * 		Sept. 26, 2006, expand test to check for failure if H5Fflush is not called.
- * 		
+ *
  *
  *-------------------------------------------------------------------------
  */
@@ -130,15 +130,15 @@ main(int argc, char* argv[])
 
     MPI_Init(&argc, &argv);
     MPI_Comm_size(comm, &mpi_size);
-    MPI_Comm_rank(comm, &mpi_rank);  
+    MPI_Comm_rank(comm, &mpi_rank);
 
     fapl = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_mpio(fapl, comm, info);
 
-    if(mpi_rank == 0) 
+    if(mpi_rank == 0)
 	TESTING("H5Fflush (part1)");
     envval = HDgetenv("HDF5_DRIVER");
-    if(envval == NULL) 
+    if(envval == NULL)
         envval = "nomatch";
     if(HDstrcmp(envval, "split")) {
 	/* Create the file */
@@ -152,7 +152,7 @@ main(int argc, char* argv[])
 	file2 = create_file(name, fapl);
 
 
-	if(mpi_rank == 0) 
+	if(mpi_rank == 0)
 	    PASSED();
 	fflush(stdout);
 	fflush(stderr);
@@ -162,7 +162,7 @@ main(int argc, char* argv[])
         SKIPPED();
         puts("    Test not compatible with current Virtual File Driver");
     }
- 
+
     /*
      * Some systems like Linux with mpich, if you just _exit without MPI_Finalize
      * called, it would terminate but left the launching process waiting forever.
@@ -173,7 +173,7 @@ main(int argc, char* argv[])
      * Note that MPIO VFD returns the address of the file-handle in the VFD struct
      * because MPI_File_close wants to modify the file-handle variable.
      */
-     
+
     /* close file1 */
     if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0){
 	printf("H5Fget_vfd_handle for file1 failed\n");
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index 4ca6a96..82c112f 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -144,7 +144,7 @@ main(int argc, char* argv[])
 
     MPI_Init(&argc, &argv);
     MPI_Comm_size(comm, &mpi_size);
-    MPI_Comm_rank(comm, &mpi_rank);  
+    MPI_Comm_rank(comm, &mpi_rank);
 
     fapl1 = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_mpio(fapl1, comm, info);
@@ -152,10 +152,10 @@ main(int argc, char* argv[])
     fapl2 = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_mpio(fapl2, comm, info);
 
-    
+
     if(mpi_rank == 0)
 	TESTING("H5Fflush (part2 with flush)");
-    
+
     /* Don't run this test using the core or split file drivers */
     envval = HDgetenv("HDF5_DRIVER");
     if (envval == NULL)
@@ -168,14 +168,14 @@ main(int argc, char* argv[])
 	    H5_FAILED()
 	    goto error;
 	}
-	else if(mpi_rank == 0) 
+	else if(mpi_rank == 0)
 	{
 	    PASSED()
 	}
-	
+
 	/* Check the case where the file was not flushed.  This should give an error
 	 * so we turn off the error stack temporarily */
-	if(mpi_rank == 0) 
+	if(mpi_rank == 0)
 	    TESTING("H5Fflush (part2 without flush)");
 	H5Eget_auto2(H5E_DEFAULT,&func,NULL);
 	H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
@@ -183,7 +183,7 @@ main(int argc, char* argv[])
 	h5_fixname(FILENAME[1], fapl2, name, sizeof name);
 	if(check_file(name, fapl2))
 	{
-	    if(mpi_rank == 0) 
+	    if(mpi_rank == 0)
 	    {
 		PASSED()
 	    }
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 71d526b..800ad41 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -46,7 +46,7 @@ static void coll_read_test(int chunk_factor);
 /*-------------------------------------------------------------------------
  * Function:	coll_irregular_cont_write
  *
- * Purpose:	Wrapper to test the collectively irregular hyperslab write in 
+ * Purpose:	Wrapper to test the collectively irregular hyperslab write in
                 contiguous storage
  *
  * Return:	Success:	0
@@ -73,7 +73,7 @@ coll_irregular_cont_write(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_irregular_cont_read
  *
- * Purpose:	Wrapper to test the collectively irregular hyperslab read in 
+ * Purpose:	Wrapper to test the collectively irregular hyperslab read in
                 contiguous storage
  *
  * Return:	Success:	0
@@ -99,7 +99,7 @@ coll_irregular_cont_read(void)
 /*-------------------------------------------------------------------------
  * Function:	coll_irregular_simple_chunk_write
  *
- * Purpose:	Wrapper to test the collectively irregular hyperslab write in 
+ * Purpose:	Wrapper to test the collectively irregular hyperslab write in
                 chunk storage(1 chunk)
  *
  * Return:	Success:	0
@@ -207,7 +207,7 @@ coll_irregular_complex_chunk_read(void)
  * Purpose:	To test the collectively irregular hyperslab write in chunk
                 storage
  *  Input:      number of chunks on each dimension
-                if number is equal to 0, contiguous storage  
+                if number is equal to 0, contiguous storage
  * Return:	Success:	0
  *
  *		Failure:	-1
@@ -283,7 +283,7 @@ void coll_write_test(int chunk_factor)
   mdim[1]  = MSPACE_DIM2*mpi_size;
   fsdim[0] = FSPACE_DIM1;
   fsdim[1] = FSPACE_DIM2*mpi_size;
-  
+
   vector = (int*)HDmalloc(sizeof(int)*mdim1[0]*mpi_size);
   matrix_out  = (int*)HDmalloc(sizeof(int)*mdim[0]*mdim[1]*mpi_size);
   matrix_out1 = (int*)HDmalloc(sizeof(int)*mdim[0]*mdim[1]*mpi_size);
@@ -342,7 +342,7 @@ void coll_write_test(int chunk_factor)
   /* The First selection for FILE
    *
    *  block (3,2)
-   *  stride(4,3) 
+   *  stride(4,3)
    *  count (1,768/mpi_size)
    *  start (0,1+768*3*mpi_rank/mpi_size)
    *
@@ -361,10 +361,10 @@ void coll_write_test(int chunk_factor)
   VRFY((ret >= 0),"hyperslab selection succeeded");
 
   /* The Second selection for FILE
-   *  
+   *
    *  block  (3,768)
    *  stride (1,1)
-   *  count  (1,1) 
+   *  count  (1,1)
    *  start  (4,768*mpi_rank/mpi_size)
    *
    */
@@ -460,11 +460,11 @@ void coll_write_test(int chunk_factor)
    * Open the file.
    */
 
-  /*** 
-       
-       For testing collective hyperslab selection write 
+  /***
+
+       For testing collective hyperslab selection write
        In this test, we are using independent read to check
-       the correctedness of collective write compared with 
+       the correctedness of collective write compared with
        independent write,
 
        In order to throughly test this feature, we choose
@@ -502,7 +502,7 @@ void coll_write_test(int chunk_factor)
   /* The First selection for FILE to read
    *
    *  block (1,1)
-   *  stride(1.1) 
+   *  stride(1.1)
    *  count (3,768/mpi_size)
    *  start (1,2+768*mpi_rank/mpi_size)
    *
@@ -528,7 +528,7 @@ void coll_write_test(int chunk_factor)
   /* The Second selection for FILE to read
    *
    *  block (1,1)
-   *  stride(1.1) 
+   *  stride(1.1)
    *  count (3,1536/mpi_size)
    *  start (2,4+1536*mpi_rank/mpi_size)
    *
@@ -566,7 +566,7 @@ void coll_write_test(int chunk_factor)
    * Only the starting point is different.
    * The first selection
    *  block (1,1)
-   *  stride(1.1) 
+   *  stride(1.1)
    *  count (3,768/mpi_size)
    *  start (0,768*mpi_rank/mpi_size)
    *
@@ -591,7 +591,7 @@ void coll_write_test(int chunk_factor)
    * Only the starting point is different.
    * The second selection
    *  block (1,1)
-   *  stride(1,1) 
+   *  stride(1,1)
    *  count (3,1536/mpi_size)
    *  start (1,2+1536*mpi_rank/mpi_size)
    *
@@ -622,7 +622,7 @@ void coll_write_test(int chunk_factor)
 		H5P_DEFAULT, matrix_out);
   VRFY((ret >= 0),"H5D independent read succeed");
 
-  
+
   ret = H5Dread(dataseti, H5T_NATIVE_INT, mspaceid, fspaceid,
 		H5P_DEFAULT, matrix_out1);
   VRFY((ret >= 0),"H5D independent read succeed");
@@ -633,7 +633,7 @@ void coll_write_test(int chunk_factor)
          if(matrix_out[i]!=matrix_out1[i]) ret = -1;
       if(ret < 0) break;
     }
-  
+
   VRFY((ret >= 0),"H5D irregular collective write succeed");
 
   /*
@@ -676,7 +676,7 @@ void coll_write_test(int chunk_factor)
  * Purpose:	To test the collectively irregular hyperslab read in chunk
                 storage
  * Input:       number of chunks on each dimension
-                if number is equal to 0, contiguous storage  
+                if number is equal to 0, contiguous storage
  * Return:	Success:	0
  *
  *		Failure:	-1
@@ -685,8 +685,8 @@ void coll_write_test(int chunk_factor)
  *		Dec 2nd, 2004
  *
  * Modifications: Oct 18th, 2005
- * Note:        This test must be used with the correpsonding 
-                coll_write_test.        
+ * Note:        This test must be used with the correpsonding
+                coll_write_test.
  *-------------------------------------------------------------------------
  */
 void coll_read_test(int chunk_factor)
@@ -706,7 +706,7 @@ void coll_read_test(int chunk_factor)
 						  dataset on the disk */
 
 #endif
-  hsize_t mdim[2];  
+  hsize_t mdim[2];
   hsize_t  start[2];  /* Start of hyperslab */
   hsize_t  stride[2]; /* Stride of hyperslab */
   hsize_t  count[2];  /* Block count */
@@ -739,7 +739,7 @@ void coll_read_test(int chunk_factor)
 
 
   /* Initialize the buffer */
-   
+
   mdim[0] = MSPACE_DIM1;
   mdim[1] = MSPACE_DIM2*mpi_size;
   matrix_out =(int*)HDmalloc(sizeof(int)*MSPACE_DIM1*MSPACE_DIM2*mpi_size);
@@ -772,7 +772,7 @@ void coll_read_test(int chunk_factor)
   /* The First selection for FILE to read
    *
    *  block (1,1)
-   *  stride(1.1) 
+   *  stride(1.1)
    *  count (3,768/mpi_size)
    *  start (1,2+768*mpi_rank/mpi_size)
    *
@@ -792,7 +792,7 @@ void coll_read_test(int chunk_factor)
   /* The Second selection for FILE to read
    *
    *  block (1,1)
-   *  stride(1.1) 
+   *  stride(1.1)
    *  count (3,1536/mpi_size)
    *  start (2,4+1536*mpi_rank/mpi_size)
    *
@@ -821,7 +821,7 @@ void coll_read_test(int chunk_factor)
    * Only the starting point is different.
    * The first selection
    *  block (1,1)
-   *  stride(1.1) 
+   *  stride(1.1)
    *  count (3,768/mpi_size)
    *  start (0,768*mpi_rank/mpi_size)
    *
@@ -844,7 +844,7 @@ void coll_read_test(int chunk_factor)
    * Only the starting point is different.
    * The second selection
    *  block (1,1)
-   *  stride(1,1) 
+   *  stride(1,1)
    *  count (3,1536/mpi_size)
    *  start (1,2+1536*mpi_rank/mpi_size)
    *
diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index 2760a8b..114ef49 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -399,7 +399,7 @@ int main(int argc, char **argv)
 	    "collective group and dataset write", &collngroups_params);
     AddTest("ingrpr", independent_group_read, NULL,
 	    "independent group and dataset read", &collngroups_params);
-				 AddTest("bigdset", big_dataset, NULL, 
+				 AddTest("bigdset", big_dataset, NULL,
             "big dataset test", PARATESTFILE);
     AddTest("fill", dataset_fillvalue, NULL,
 	    "dataset fill value", PARATESTFILE);
@@ -436,8 +436,8 @@ int main(int argc, char **argv)
     AddTest((mpi_size < 3)? "-cchunk10" : "cchunk10",
 	coll_chunk10,NULL,
 	"multiple chunk collective IO transferring to independent IO",PARATESTFILE);
-          
-         
+
+
 
 /* irregular collective IO tests*/
     AddTest("ccontw",
diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c
index a4d1675..e487f2e 100644
--- a/tools/h5copy/h5copy.c
+++ b/tools/h5copy/h5copy.c
@@ -55,7 +55,7 @@ static void
 leave(int ret)
 {
  h5tools_close();
- 
+
  exit(ret);
 }
 
@@ -118,8 +118,8 @@ usage: h5copy [OPTIONS] [OBJECTS...]\n\
  * soft     H5O_COPY_EXPAND_SOFT_LINK_FLAG:  Expand soft links into new objects
  * ext      H5O_COPY_EXPAND_EXT_LINK_FLAG: Expand external links into new objects
  * ref      H5O_COPY_EXPAND_OBJ_REFERENCE_FLAG: Copy objects that are pointed by references
- * noattr   H5O_COPY_WITHOUT_ATTR_FLAG Copy object without copying attributes 
- * allflags Switches all flags from the default to the non-default setting 
+ * noattr   H5O_COPY_WITHOUT_ATTR_FLAG Copy object without copying attributes
+ * allflags Switches all flags from the default to the non-default setting
  *
  * Return: Success:    SUCCEED
  *         Failure:    FAIL
@@ -139,7 +139,7 @@ static int parse_flag(const char* str_flag, unsigned *flag)
  if (strcmp(str_flag,"shallow")==0)
  {
   fla = H5O_COPY_SHALLOW_HIERARCHY_FLAG;
- } 
+ }
  else  if (strcmp(str_flag,"soft")==0)
  {
   fla = H5O_COPY_EXPAND_SOFT_LINK_FLAG;
@@ -214,14 +214,14 @@ main (int argc, const char *argv[])
  } /* end if */
 
  /* parse command line options */
- while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) 
+ while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
  {
-  switch ((char)opt) 
+  switch ((char)opt)
   {
   case 'd':
    oname_dst = strdup(opt_arg);
    break;
-   
+
   case 'f':
    /* validate flag */
    if (parse_flag(opt_arg,&flag)<0)
@@ -272,28 +272,28 @@ main (int argc, const char *argv[])
  * check for missing file/object names
  *-------------------------------------------------------------------------*/
 
- if (fname_src==NULL) 
+ if (fname_src==NULL)
  {
   error_msg(progname, "Input file name missing\n");
   usage();
   leave(EXIT_FAILURE);
  }
 
- if (fname_dst==NULL) 
+ if (fname_dst==NULL)
  {
   error_msg(progname, "Output file name missing\n");
   usage();
   leave(EXIT_FAILURE);
  }
 
- if (oname_src==NULL) 
+ if (oname_src==NULL)
  {
   error_msg(progname, "Source object name missing\n");
   usage();
   leave(EXIT_FAILURE);
  }
 
- if (oname_dst==NULL) 
+ if (oname_dst==NULL)
  {
   error_msg(progname, "Destination object name missing\n");
   usage();
@@ -304,7 +304,7 @@ main (int argc, const char *argv[])
 /*-------------------------------------------------------------------------
  * open input file
  *-------------------------------------------------------------------------*/
- 
+
   fid_src = h5tools_fopen(fname_src, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, 0);
 
 /*-------------------------------------------------------------------------
@@ -342,11 +342,11 @@ main (int argc, const char *argv[])
    free(fname_dst);
   leave(EXIT_FAILURE);
  }
-  
+
 /*-------------------------------------------------------------------------
  * print some info
  *-------------------------------------------------------------------------*/
- 
+
  if (verbose)
  {
   printf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n",
@@ -358,19 +358,19 @@ main (int argc, const char *argv[])
    printf("Using %s flag\n", str_flag);
  }
 
- 
+
 /*-------------------------------------------------------------------------
  * create property lists for copy
  *-------------------------------------------------------------------------*/
- 
+
  /* create property to pass copy options */
- if ( (ocpl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) 
+ if ( (ocpl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0)
   goto error;
 
  /* set options for object copy */
  if (flag)
  {
-  if ( H5Pset_copy_object(ocpl_id, flag) < 0) 
+  if ( H5Pset_copy_object(ocpl_id, flag) < 0)
    goto error;
  }
 
@@ -404,7 +404,7 @@ main (int argc, const char *argv[])
               ocpl_id,          /* Object copy property list */
               lcpl_id)<0)       /* Link creation property list */
               goto error;
- 
+
  /* close propertis */
  if(H5Pclose(ocpl_id)<0)
   goto error;
@@ -427,7 +427,7 @@ main (int argc, const char *argv[])
   free(oname_src);
 
  h5tools_close();
- 
+
  return 0;
 
 error:
@@ -448,7 +448,7 @@ error:
   free(oname_src);
 
  h5tools_close();
- 
+
  return 1;
 }
 
diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c
index 52467d7..7842b38 100644
--- a/tools/h5copy/h5copygentest.c
+++ b/tools/h5copy/h5copygentest.c
@@ -218,7 +218,7 @@ static void gent_named_vl(hid_t loc_id)
 {
     hid_t   sid, did, tid;
     hsize_t dims[1] = {2};
-    hvl_t   buf[2];                        
+    hvl_t   buf[2];
 
     /* allocate and initialize VL dataset to write */
     buf[0].len = 1;
@@ -264,7 +264,7 @@ static void gent_nested_vl(hid_t loc_id)
     hid_t   sid, did, tid1, tid2;
     hsize_t dims[1] = {2};
     hvl_t   buf[2];
-    hvl_t   *tvl;                                 
+    hvl_t   *tvl;
 
     /* allocate and initialize VL dataset to write */
     buf[0].len = 1;
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 05111a9..fc073a9 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -54,24 +54,24 @@ static struct long_options l_opts[] = {
  *-------------------------------------------------------------------------
  */
 
-void parse_command_line(int argc, 
-                        const char* argv[], 
-                        const char** fname1, 
+void parse_command_line(int argc,
+                        const char* argv[],
+                        const char** fname1,
                         const char** fname2,
-                        const char** objname1, 
-                        const char** objname2, 
+                        const char** objname1,
+                        const char** objname2,
                         diff_opt_t* options)
 {
-    
+
     int opt;
 
     /* process the command-line */
     memset(options, 0, sizeof (diff_opt_t));
-    
+
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) 
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
     {
-        switch ((char)opt) 
+        switch ((char)opt)
         {
         default:
             usage();
@@ -97,7 +97,7 @@ void parse_command_line(int argc,
             break;
         case 'd':
             options->d=1;
-            
+
             if ( check_d_input( opt_arg )==-1)
             {
                 printf("<-d %s> is not a valid option\n", opt_arg );
@@ -108,7 +108,7 @@ void parse_command_line(int argc,
             break;
 
         case 'p':
-            
+
             options->p=1;
             if ( check_p_input( opt_arg )==-1)
             {
@@ -120,7 +120,7 @@ void parse_command_line(int argc,
             break;
 
         case 'n':
-            
+
             options->n=1;
             if ( check_n_input( opt_arg )==-1)
             {
@@ -129,13 +129,13 @@ void parse_command_line(int argc,
                 h5diff_exit(EXIT_FAILURE);
             }
             options->count = atol( opt_arg );
-            
+
             break;
         }
     }
-    
+
     /* check for file names to be processed */
-    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) 
+    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL)
     {
         error_msg(progname, "missing file names\n");
         usage();
@@ -152,7 +152,7 @@ void parse_command_line(int argc,
         return;
     }
 
-    if ( argv[ opt_ind + 3 ] != NULL) 
+    if ( argv[ opt_ind + 3 ] != NULL)
     {
         *objname2 = argv[ opt_ind + 3 ];
     }
@@ -161,7 +161,7 @@ void parse_command_line(int argc,
         *objname2 = *objname1;
     }
 
-   
+
 }
 
 /*-------------------------------------------------------------------------
@@ -176,14 +176,14 @@ void parse_command_line(int argc,
  {
      if (options->m_quiet || options->err_stat || options->m_contents)
          return;
-     
+
      if (options->cmn_objs==0)
      {
          printf("No common objects found. Files are not comparable.\n");
          if (!options->m_verbose)
              printf("Use -v for a list of objects.\n");
      }
-     
+
      if (options->not_cmp==1)
      {
          printf("--------------------------------\n");
@@ -192,7 +192,7 @@ void parse_command_line(int argc,
          if (!options->m_verbose)
              printf("Use -v for a list of objects.\n");
      }
-     
+
  }
 
 /*-------------------------------------------------------------------------
@@ -216,7 +216,7 @@ int check_n_input( const char *str )
 {
     unsigned i;
     char c;
-    
+
     for ( i = 0; i < strlen(str); i++)
     {
         c = str[i];
@@ -250,18 +250,18 @@ int check_n_input( const char *str )
 int check_p_input( const char *str )
 {
     double x;
-    
+
     /*
     the atof return value on a hexadecimal input is different
     on some systems; we do a character check for this
     */
     if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
         return -1;
-    
+
     x=atof(str);
     if (x<=0)
         return -1;
-    
+
     return 1;
 }
 
@@ -283,18 +283,18 @@ int check_p_input( const char *str )
 int check_d_input( const char *str )
 {
     double x;
-    
+
     /*
     the atof return value on a hexadecimal input is different
     on some systems; we do a character check for this
     */
     if (strlen(str)>2 && str[0]=='0' && str[1]=='x')
         return -1;
-    
+
     x=atof(str);
     if (x <=0)
         return -1;
-    
+
     return 1;
 }
 
@@ -329,7 +329,7 @@ void usage(void)
  printf("   -n C, --count=C         Print differences up to C number\n");
  printf("   -d D, --delta=D         Print difference when greater than limit D\n");
  printf("   -p R, --relative=R      Print difference when greater than relative limit R\n");
- 
+
 
  printf("\n");
 
@@ -356,7 +356,7 @@ void usage(void)
  printf("   when the -c flag is present, (contents mode) the objects in file1\n");
  printf("   must match exactly the objects in file2\n");
  printf("\n");
-   
+
  printf(" The compare criteria is:\n");
  printf("   1) datasets: numerical array differences 2) groups: name string difference\n");
  printf("   3) datatypes: the return value of H5Tequal 2) links: name string difference\n");
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 6d1a508..d0e095d 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -53,19 +53,19 @@
  *  "Some objects are not comparable"
  *
  * February 2007
- *  Added comparison for dataset regions. 
+ *  Added comparison for dataset regions.
  *  Added support for reading and comparing by hyperslabs for large files.
  *  Inclusion of a relative error formula to compare floating
- *   point numbers in order to deal with floating point uncertainty. 
+ *   point numbers in order to deal with floating point uncertainty.
  *  Printing of dataset dimensions along with dataset name
- *   
+ *
  *  November 19, 2007
  *    adopted the syntax h5diff  [OPTIONS]  file1 file2  [obj1[obj2]]
  *
- * Aug 2008 
+ * Aug 2008
  *    Added a "contents" mode check.
  *    If this mode is present, objects in both files must match (must be exactly the same)
- *    If this does not happen, the tool returns an error code of 1 
+ *    If this does not happen, the tool returns an error code of 1
  *    (instead of the success code of 0)
  *
  *-------------------------------------------------------------------------
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index e1a554e..7d9add7 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -95,27 +95,27 @@ static int write_dset(hid_t loc_id,int rank,hsize_t *dims,const char *name,hid_t
  *-------------------------------------------------------------------------
  */
 
-int main(void) 
+int main(void)
 {
     if (test_basic(FILE1, FILE2, FILE11) < 0 )
         goto out;
 
     test_types (FILE3);
     test_datatypes(FILE4);
-    
+
     /* generate 2 files, the second call creates a similar file with differences */
     test_attributes(FILE5,0);
     test_attributes(FILE6,1);
-    
+
     /* generate 2 files, the second call creates a similar file with differences */
     test_datasets(FILE7,0);
     test_datasets(FILE8,1);
-    
+
     /* generate 2 files, the second call creates a similar file with differences */
     test_hyperslab(FILE9,0);
     test_hyperslab(FILE10,1);
     return 0;
-    
+
 out:
     return 1;
 }
@@ -146,12 +146,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
 	fprintf(stderr, "empty file (%s) close failed.\n", fname3);
         goto out;
     }
-    
+
    /*-------------------------------------------------------------------------
     * create two files
     *-------------------------------------------------------------------------
     */
-    
+
     if (( fid1 = H5Fcreate (fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 )
         goto out;
     if (( fid2 = H5Fcreate (fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0 )
@@ -179,15 +179,15 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     {
         double data1[3][2] = {{1,1},  {1,1},       {0,0}};
         double data2[3][2] = {{0,1.1},{1.01,1.001},{0,1}};
-        double data3[3][2] = {{100,100},{100,100},{100,100}}; 
+        double data3[3][2] = {{100,100},{100,100},{100,100}};
         double data4[3][2] = {{105,120},{160,95},{80,40}};
-        
+
         write_dset(gid1,2,dims2,"dset1",H5T_NATIVE_DOUBLE,data1);
         write_dset(gid2,2,dims2,"dset2",H5T_NATIVE_DOUBLE,data2);
         write_dset(gid1,2,dims2,"dset3",H5T_NATIVE_DOUBLE,data3);
         write_dset(gid2,2,dims2,"dset4",H5T_NATIVE_DOUBLE,data4);
         write_dset(gid2,2,dims2,"dset1",H5T_NATIVE_DOUBLE,data2);
-        
+
     }
    /*-------------------------------------------------------------------------
     * relative error, compare divide by zero, both zero
@@ -195,12 +195,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        int data5[3][2] = {{100,100},{100,0},{0,100}}; 
+        int data5[3][2] = {{100,100},{100,0},{0,100}};
         int data6[3][2] = {{120,80}, {0,100},{0,50}};
-        
+
         write_dset(gid1,2,dims2,"dset5",H5T_NATIVE_INT,data5);
         write_dset(gid1,2,dims2,"dset6",H5T_NATIVE_INT,data6);
-       
+
     }
 
    /*-------------------------------------------------------------------------
@@ -209,12 +209,12 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        unsigned long_long data7[3][2] = {{100,100},{100,0},{0,100}}; 
+        unsigned long_long data7[3][2] = {{100,100},{100,0},{0,100}};
         unsigned long_long data8[3][2] = {{120,80}, {0,100},{0,50}};
-        
+
         write_dset(gid1,2,dims2,"dset7",H5T_NATIVE_ULLONG,data7);
         write_dset(gid1,2,dims2,"dset8",H5T_NATIVE_ULLONG,data8);
-       
+
     }
 
    /*-------------------------------------------------------------------------
@@ -231,14 +231,14 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
     *-------------------------------------------------------------------------
     */
     {
-        double data9[3][2] = {{100,100},{100,0},{0,100}}; 
+        double data9[3][2] = {{100,100},{100,0},{0,100}};
         double data10[3][2] ={{120,80}, {0,100},{0,50}};
-              
+
         write_dset(gid1,2,dims2,"dset9",H5T_NATIVE_DOUBLE,data9);
         write_dset(gid1,2,dims2,"dset10",H5T_NATIVE_DOUBLE,data10);
-        
+
     }
-    
+
 
    /*-------------------------------------------------------------------------
     * test floating point comparison
@@ -250,15 +250,15 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         float  data12[3][2] ={{0.00000f,0.00002f},{0.000009f,0.00001f},{0.00000f,0.00001f}};
         double data13[3][2] ={{0.000000000,0.000000001},{0.000000001, 0.000000000},{0.000000001,0.000000001}};
         double data14[3][2] ={{0.000000000,0.000000002},{0.0000000009,0.000000001},{0.000000000,0.000000001}};
-        
+
         write_dset(gid1,2,dims2,"fp1",H5T_NATIVE_FLOAT,data11);
         write_dset(gid1,2,dims2,"fp2",H5T_NATIVE_FLOAT,data12);
         write_dset(gid1,2,dims2,"d1",H5T_NATIVE_DOUBLE,data13);
         write_dset(gid1,2,dims2,"d2",H5T_NATIVE_DOUBLE,data14);
-        
+
     }
-    
-     
+
+
    /*-------------------------------------------------------------------------
     * NaNs in H5T_NATIVE_FLOAT
     *-------------------------------------------------------------------------
@@ -286,7 +286,7 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         write_dset(gid1,1,dims1,"fp16",H5T_NATIVE_FLOAT,data16);
 
     }
-       
+
    /*-------------------------------------------------------------------------
     * NaNs in H5T_NATIVE_DOUBLE
     *-------------------------------------------------------------------------
@@ -314,8 +314,8 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3)
         write_dset(gid1,1,dims1,"fp18",H5T_NATIVE_DOUBLE,data18);
 
     }
- 
-    
+
+
    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
@@ -450,7 +450,7 @@ TOOLTEST h5diff_23.txt file3.h5 file3.h5 -v g1 g1
 TOOLTEST h5diff_24.txt file3.h5 file3.h5 -v t1 t1
 
 # 2.5
-TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1 
+TOOLTEST h5diff_25.txt file3.h5 file3.h5 -v l1 l1
 
 # 2.6
 TOOLTEST h5diff_26.txt file3.h5 file3.h5 -v g1 g2
@@ -2508,12 +2508,12 @@ void gen_datareg(hid_t fid,
  * Function: test_hyperslab
  *
  * Purpose: test diff by hyperslabs. create a dataset with 1GB dimensions
- *  by iterating trough 1KB hyperslabs 
+ *  by iterating trough 1KB hyperslabs
  *
  *-------------------------------------------------------------------------
  */
 static
-int test_hyperslab(const char *fname, 
+int test_hyperslab(const char *fname,
                    int make_diffs /* flag to modify data buffers */)
 {
  hid_t   did=-1;
@@ -2533,7 +2533,7 @@ int test_hyperslab(const char *fname,
  int     i, j, s;
  char    c;
 
- /* create */ 
+ /* create */
  fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
  if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
   goto out;
@@ -2545,13 +2545,13 @@ int test_hyperslab(const char *fname,
   goto out;
  if((did = H5Dcreate2(fid, "big", H5T_NATIVE_CHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
   goto out;
- if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0) 
+ if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
   goto out;
- if((tid = H5Dget_type(did)) < 0) 
+ if((tid = H5Dget_type(did)) < 0)
   goto out;
  if((size = H5Tget_size(tid)) <= 0)
   goto out;
- 
+
  /* create a evenly divided buffer from 0 to 127  */
  buf = (char *)HDmalloc((size_t)(nelmts * size));
  s = 1024 * 1024 / 127;
@@ -2567,15 +2567,15 @@ int test_hyperslab(const char *fname,
   /* make a different hyperslab at this position */
   if(make_diffs && i == 512 * 512)
    HDmemset(buf, 0, nelmts);
-  
+
   hs_start[0] = i * GBLL/(1024*1024);
-  if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0) 
+  if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0)
    goto out;
 
   /* write only one hyperslab */
   if ( i==512*512)
   {
-   if (H5Dwrite (did,H5T_NATIVE_CHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0) 
+   if (H5Dwrite (did,H5T_NATIVE_CHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
     goto out;
   }
 
@@ -2626,30 +2626,30 @@ int write_attr(hid_t loc_id,
 {
     hid_t   aid=-1;
     hid_t   sid=-1;
-    
+
     /* create a space  */
     if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
         goto out;
-    
+
     /* create the attribute */
     if((aid = H5Acreate2(loc_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* write */
     if(buf)
     {
         if(H5Awrite(aid, tid, buf) < 0)
             goto out;
     }
-        
+
     /* close */
     H5Aclose(aid);
     H5Sclose(sid);
-        
+
     return SUCCEED;
-        
+
 out:
-    
+
     H5Aclose(aid);
     H5Sclose(sid);
     return FAIL;
diff --git a/tools/h5dump/binread.c b/tools/h5dump/binread.c
index ab10af0..5abb9af 100644
--- a/tools/h5dump/binread.c
+++ b/tools/h5dump/binread.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* 
+/*
  This program reads binary output from h5dump (-b option).
  To use change the following 3 symbols accordingly.
  For example, to read 2 elements of a float type , define
@@ -82,7 +82,7 @@ main (int argc, const char *argv[])
  {
   numread = fread( buf, sizeof( TYPE ), nelmts, stream );
   printf( "Number of items read = %d\n", numread );
-  
+
   for (i = 0; i < nelmts; i++)
   {
    printf(FORMAT,buf[i]);
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 2e03a25..8ace682 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1233,7 +1233,7 @@ dump_dataspace(hid_t space)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t    
+static herr_t
 dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *info, void UNUSED *_op_data)
 {
     hid_t       attr_id;
@@ -1390,7 +1390,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED
     hid_t       obj;
     char       *obj_path = NULL;    /* Full path of object */
     herr_t      ret = SUCCEED;
-   
+
     /* Build the object's path name */
     obj_path = HDmalloc(HDstrlen(prefix) + HDstrlen(name) + 2);
     HDassert(obj_path);
@@ -1409,33 +1409,33 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED
             goto done;
         } /* end if */
 
-        switch(oinfo.type) 
+        switch(oinfo.type)
         {
         case H5O_TYPE_GROUP:
-            if((obj = H5Gopen2(group, name, H5P_DEFAULT)) < 0) 
+            if((obj = H5Gopen2(group, name, H5P_DEFAULT)) < 0)
             {
                 error_msg(progname, "unable to dump group \"%s\"\n", name);
                 d_status = EXIT_FAILURE;
                 ret = FAIL;
-            } 
-            else 
+            }
+            else
             {
                 char *old_prefix; /* Pointer to previous prefix */
-                
+
                 /* Keep copy of prefix before iterating into group */
                 old_prefix = HDstrdup(prefix);
                 HDassert(old_prefix);
-                
+
                 /* Append group name to prefix */
                 add_prefix(&prefix, &prefix_len, name);
-                
+
                 /* Iterate into group */
                  dump_function_table->dump_group_function(obj, name);
-              
+
                 /* Restore old prefix name */
                 HDstrcpy(prefix, old_prefix);
                 HDfree(old_prefix);
-                
+
                 /* Close group */
                 H5Gclose(obj);
             }
@@ -1775,11 +1775,11 @@ done:
  *
  * Programmer:  Ruey-Hsia Li
  *
- * Modifications: 
+ * Modifications:
  *  Pedro Vicente, March 27, 2006
  *   added display of attributes
  *  Pedro Vicente, October 4, 2007, added parameters to H5Aiterate2() to allow for
- *   other iteration orders 
+ *   other iteration orders
  *
  *-------------------------------------------------------------------------
  */
@@ -1789,21 +1789,21 @@ dump_named_datatype(hid_t tid, const char *name)
 
     unsigned  attr_crt_order_flags;
     hid_t     tcpl_id;  /* datatype creation property list ID */
-    
-    
+
+
     if ((tcpl_id = H5Tget_create_plist(tid)) < 0)
     {
         error_msg(progname, "error in getting creation property list ID\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     /* query the creation properties for attributes */
-    if (H5Pget_attr_creation_order(tcpl_id, &attr_crt_order_flags) < 0) 
+    if (H5Pget_attr_creation_order(tcpl_id, &attr_crt_order_flags) < 0)
     {
         error_msg(progname, "error in getting creation properties\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     if(H5Pclose(tcpl_id) < 0) {
         error_msg(progname, "error in closing creation property list ID\n");
         d_status = EXIT_FAILURE;
@@ -1827,7 +1827,7 @@ dump_named_datatype(hid_t tid, const char *name)
 
     /* attribute iteration: if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
       in the datatype's create property list for attributes, then, sort by creation order, otherwise by name */
-    
+
     if( (sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED))
         H5Aiterate2(tid, sort_by, sort_order, NULL, dump_attr_cb, NULL);
     else
@@ -1872,21 +1872,21 @@ dump_group(hid_t gid, const char *name)
         error_msg(progname, "error in getting group creation property list ID\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     /* query the group creation properties for attributes */
-    if (H5Pget_attr_creation_order(gcpl_id, &attr_crt_order_flags) < 0) 
+    if (H5Pget_attr_creation_order(gcpl_id, &attr_crt_order_flags) < 0)
     {
         error_msg(progname, "error in getting group creation properties\n");
         d_status = EXIT_FAILURE;
     }
 
     /* query the group creation properties */
-    if(H5Pget_link_creation_order(gcpl_id, &crt_order_flags) < 0) 
+    if(H5Pget_link_creation_order(gcpl_id, &crt_order_flags) < 0)
     {
         error_msg(progname, "error in getting group creation properties\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     if(H5Pclose(gcpl_id) < 0) {
         error_msg(progname, "error in closing group creation property list ID\n");
         d_status = EXIT_FAILURE;
@@ -1906,7 +1906,7 @@ dump_group(hid_t gid, const char *name)
 
     if(!HDstrcmp(name, "/") && unamedtype) {
         unsigned u;             /* Local index variable */
-        
+
         /* dump unamed type in root group */
         for(u = 0; u < type_table->nobjs; u++)
             if(!type_table->objs[u].recorded) {
@@ -1923,51 +1923,51 @@ dump_group(hid_t gid, const char *name)
 
     if(oinfo.rc > 1) {
         obj_t  *found_obj;    /* Found object */
-        
+
         found_obj = search_obj(group_table, oinfo.addr);
-        
+
         if (found_obj == NULL) {
             indentation(indent);
             error_msg(progname, "internal error (file %s:line %d)\n",
                 __FILE__, __LINE__);
             d_status = EXIT_FAILURE;
-        } 
+        }
         else if (found_obj->displayed) {
             indentation(indent);
             printf("%s \"%s\"\n", HARDLINK, found_obj->objname);
-        } 
+        }
         else {
             found_obj->displayed = TRUE;
             /* attribute iteration: if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
                in the group for attributes, then, sort by creation order, otherwise by name */
-            
+
             if((sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED))
                 H5Aiterate2(gid, sort_by, sort_order, NULL, dump_attr_cb, NULL);
             else
                 H5Aiterate2(gid, H5_INDEX_NAME, sort_order, NULL, dump_attr_cb, NULL);
-            
+
             /* if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
                in the group, then, sort by creation order, otherwise by name */
-            
+
             if((sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
                 H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
             else
                 H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL);
 
         }
-    } 
+    }
 
 
-    else 
+    else
     {
 
         /* attribute iteration: if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
            in the group for attributes, then, sort by creation order, otherwise by name */
-            
+
         if((sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED))
             H5Aiterate2(gid, sort_by, sort_order, NULL, dump_attr_cb, NULL);
         else
-            H5Aiterate2(gid, H5_INDEX_NAME, sort_order, NULL, dump_attr_cb, NULL); 
+            H5Aiterate2(gid, H5_INDEX_NAME, sort_order, NULL, dump_attr_cb, NULL);
 
          /* if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
             in the group, then, sort by creation order, otherwise by name */
@@ -1975,11 +1975,11 @@ dump_group(hid_t gid, const char *name)
         if((sort_by == H5_INDEX_CRT_ORDER) && (crt_order_flags & H5P_CRT_ORDER_TRACKED))
             H5Literate(gid, sort_by, sort_order, NULL, dump_all_cb, NULL);
         else
-            H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL); 
+            H5Literate(gid, H5_INDEX_NAME, sort_order, NULL, dump_all_cb, NULL);
+
 
-        
     }
-    
+
     indent -= COL;
     indentation(indent);
     end_obj(dump_header_format->groupend, dump_header_format->groupblockend);
@@ -1995,10 +1995,10 @@ dump_group(hid_t gid, const char *name)
  *
  * Programmer:  Ruey-Hsia Li
  *
- * Modifications: 
+ * Modifications:
  *  Pedro Vicente, 2004, added dataset creation property list display
  *  Pedro Vicente, October 4, 2007, added parameters to H5Aiterate2() to allow for
- *   other  iteration orders 
+ *   other  iteration orders
  *
  *-------------------------------------------------------------------------
  */
@@ -2015,9 +2015,9 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
         error_msg(progname, "error in getting creation property list ID\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     /* query the creation properties for attributes */
-    if (H5Pget_attr_creation_order(dcpl_id, &attr_crt_order_flags) < 0) 
+    if (H5Pget_attr_creation_order(dcpl_id, &attr_crt_order_flags) < 0)
     {
         error_msg(progname, "error in getting creation properties\n");
         d_status = EXIT_FAILURE;
@@ -2037,7 +2037,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     if(display_oid)
         dump_oid(did);
 
-    if(display_dcpl) 
+    if(display_dcpl)
         dump_dcpl(dcpl_id, type, did);
 
     if(display_data)
@@ -2068,15 +2068,15 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
 
     if ( !bin_output )
     {
-        
+
         /* attribute iteration: if there is a request to do H5_INDEX_CRT_ORDER and tracking order is set
         in the group for attributes, then, sort by creation order, otherwise by name */
-        
+
         if( (sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED))
             H5Aiterate2(did, sort_by, sort_order, NULL, dump_attr_cb, NULL);
         else
             H5Aiterate2(did, H5_INDEX_NAME, sort_order, NULL, dump_attr_cb, NULL);
-        
+
     }
 
     indent -= COL;
@@ -2218,11 +2218,11 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     outputformat->pindex=display_index;
 
     /* do not print indices for regions */
-    if(obj_data == DATASET_DATA) 
+    if(obj_data == DATASET_DATA)
     {
         hid_t f_type = H5Dget_type(obj_id);
-        
-        if (H5Tequal(f_type, H5T_STD_REF_DSETREG)) 
+
+        if (H5Tequal(f_type, H5T_STD_REF_DSETREG))
         {
             outputformat->pindex = 0;
         }
@@ -2540,7 +2540,7 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
             hid_t tid = H5Dget_type( obj_id );
             size_t datum_size = H5Tget_size( tid );
             hsize_t dims[H5S_MAX_RANK];
-            int ndims = H5Sget_simple_extent_dims( sid, dims, NULL);  
+            int ndims = H5Sget_simple_extent_dims( sid, dims, NULL);
             hsize_t nelmts = 1;
             hsize_t size;
             double ratio = 0;
@@ -2548,13 +2548,13 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
             int ok = 0;
 
             /* only print the compression ratio for these filters */
-            for ( i = 0; i < nfilters; i++) 
+            for ( i = 0; i < nfilters; i++)
             {
                 cd_nelmts = NELMTS(cd_values);
                 filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
                     cd_values, sizeof(f_name), f_name, NULL);
-                
-                switch (filtn) 
+
+                switch (filtn)
                 {
                 case H5Z_FILTER_DEFLATE:
                 case H5Z_FILTER_SZIP:
@@ -2564,10 +2564,10 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
                     break;
                 }
             }
-            
+
             if (ndims && ok )
             {
-                
+
                 for (i = 0; i < ndims; i++)
                 {
                     nelmts *= dims[i];
@@ -2580,9 +2580,9 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
 
                 if (b!=0)
                     ratio = (double) a / (double) b;
-              
+
                 HDfprintf(stdout, "SIZE %Hu (%.3f:1 COMPRESSION)\n ", storage_size, ratio);
-                
+
             }
             else
                 HDfprintf(stdout, "SIZE %Hu\n ", storage_size);
@@ -2590,7 +2590,7 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
 
             H5Sclose(sid);
             H5Tclose(tid);
-            
+
         }
         else
         {
@@ -2668,15 +2668,15 @@ dump_dcpl(hid_t dcpl_id,hid_t type_id, hid_t obj_id)
     * FILTERS
     *-------------------------------------------------------------------------
     */
-    
+
 
     indentation(indent + COL);
     printf("%s %s\n", FILTERS, BEGIN);
     indent += COL;
 
-    if (nfilters) 
+    if (nfilters)
     {
-        for (i=0; i<nfilters; i++) 
+        for (i=0; i<nfilters; i++)
         {
             cd_nelmts = NELMTS(cd_values);
             filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
@@ -2935,8 +2935,8 @@ dump_fcpl(hid_t fid)
     else
         HDstrcpy(dname,"Unknown driver");
 
-    /* Take out this because the driver used can be different from the 
-     * standard output. */  
+    /* Take out this because the driver used can be different from the
+     * standard output. */
     /*indentation(indent + COL);
     printf("%s %s\n","FILE_DRIVER", dname);*/
     indentation(indent + COL);
@@ -3072,11 +3072,11 @@ set_binary_form(const char *form)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    set_sort_by 
+ * Function:    set_sort_by
  *
  * Purpose: set the "by" form of sorting by translating from a string input
  *          parameter to a H5_index_t return value
- *          current sort values are [creation_order | name] 
+ *          current sort values are [creation_order | name]
  *
  * Return: H5_index_t form of sort or H5_INDEX_UNKNOWN if none found
  *
@@ -3103,11 +3103,11 @@ set_sort_by(const char *form)
 
 
 /*-------------------------------------------------------------------------
- * Function:    set_sort_order  
+ * Function:    set_sort_order
  *
  * Purpose: set the order of sorting by translating from a string input
  *          parameter to a H5_iter_order_t return value
- *          current order values are [ascending | descending ] 
+ *          current order values are [ascending | descending ]
  *
  * Return: H5_iter_order_t form of order or H5_ITER_UNKNOWN if none found
  *
@@ -3295,7 +3295,7 @@ parse_subset_params(char *dset)
  *
  *  Pedro Vicente, May 8, 2008
  *   added a flag PE that prints/not prints error messages
- *   added for cases of external links not found, to avoid printing of 
+ *   added for cases of external links not found, to avoid printing of
  *    objects not found, since external links are dumped on a trial error basis
  *
  *-------------------------------------------------------------------------
@@ -3307,7 +3307,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe)
     hid_t            dsetid;
     struct subset_t *sset = (struct subset_t *)data;
 
-    if((dsetid = H5Dopen2(fid, dset, H5P_DEFAULT)) < 0) 
+    if((dsetid = H5Dopen2(fid, dset, H5P_DEFAULT)) < 0)
     {
         if (pe)
         {
@@ -3319,7 +3319,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe)
                 dump_header_format->datasetblockend);
             d_status = EXIT_FAILURE;
         }
-        
+
         return;
     } /* end if */
 
@@ -3374,36 +3374,36 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe)
         }
     }
 
-    
+
    /*-------------------------------------------------------------------------
     * check for block overlap
     *-------------------------------------------------------------------------
     */
 
-    if(sset) 
+    if(sset)
     {
         hid_t sid = H5Dget_space(dsetid);
         unsigned int ndims = H5Sget_simple_extent_ndims(sid);
         unsigned int i;
-        
+
         for ( i = 0; i < ndims; i++)
         {
             if ( sset->count[i] > 1 )
             {
-                
+
                 if ( sset->stride[i] < sset->block[i] )
                 {
                     error_msg(progname, "wrong subset selection; blocks overlap\n");
                     d_status = EXIT_FAILURE;
                     return;
-                    
-                }                                
-                
+
+                }
+
             }
-            
-        } 
+
+        }
         H5Sclose(sid);
-        
+
     }
 
     H5Oget_info(dsetid, &oinfo);
@@ -3446,14 +3446,14 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe)
  * Programmer:  Bill Wendling
  *              Tuesday, 9. January 2001
  *
- * Modifications: 
+ * Modifications:
  *
  * Pedro Vicente, September 26, 2007
  *  handle creation order
  *
  * Pedro Vicente, May 8, 2008
  *   added a flag PE that prints/not prints error messages
- *   added for cases of external links not found, to avoid printing of 
+ *   added for cases of external links not found, to avoid printing of
  *    objects not found, since external links are dumped on a trial error basis
  *
  *-------------------------------------------------------------------------
@@ -3462,9 +3462,9 @@ static void
 handle_groups(hid_t fid, const char *group, void UNUSED * data, int pe)
 {
     hid_t      gid;
-   
-    
-    if((gid = H5Gopen2(fid, group, H5P_DEFAULT)) < 0) 
+
+
+    if((gid = H5Gopen2(fid, group, H5P_DEFAULT)) < 0)
     {
         if ( pe )
         {
@@ -3474,22 +3474,22 @@ handle_groups(hid_t fid, const char *group, void UNUSED * data, int pe)
             end_obj(dump_header_format->groupend, dump_header_format->groupblockend);
             d_status = EXIT_FAILURE;
         }
-        
-    } 
-    else 
+
+    }
+    else
     {
         size_t new_len = HDstrlen(group) + 1;
-        
-        if(prefix_len <= new_len) 
+
+        if(prefix_len <= new_len)
         {
             prefix_len = new_len;
             prefix = HDrealloc(prefix, prefix_len);
         } /* end if */
-        
+
         HDstrcpy(prefix, group);
-          
+
         dump_group(gid, group);
-       
+
         if(H5Gclose(gid) < 0)
             d_status = EXIT_FAILURE;
     } /* end else */
@@ -3596,7 +3596,7 @@ handle_links(hid_t fid, const char *links, void UNUSED * data, int pe)
  *
  *  Pedro Vicente, May 8, 2008
  *   added a flag PE that prints/not prints error messages
- *   added for cases of external links not found, to avoid printing of 
+ *   added for cases of external links not found, to avoid printing of
  *    objects not found, since external links are dumped on a trial error basis
  *
  *-------------------------------------------------------------------------
@@ -3606,12 +3606,12 @@ handle_datatypes(hid_t fid, const char *type, void UNUSED * data, int pe)
 {
     hid_t       type_id;
 
-    if((type_id = H5Topen2(fid, type, H5P_DEFAULT)) < 0) 
+    if((type_id = H5Topen2(fid, type, H5P_DEFAULT)) < 0)
     {
         /* check if type is unamed datatype */
         unsigned idx = 0;
 
-        while(idx < type_table->nobjs ) 
+        while(idx < type_table->nobjs )
         {
             char name[128];
 
@@ -3626,7 +3626,7 @@ handle_datatypes(hid_t fid, const char *type, void UNUSED * data, int pe)
             idx++;
         } /* end while */
 
-        if(idx == type_table->nobjs) 
+        if(idx == type_table->nobjs)
         {
             if ( pe )
             {
@@ -3639,9 +3639,9 @@ handle_datatypes(hid_t fid, const char *type, void UNUSED * data, int pe)
                     dump_header_format->datatypeblockend);
                 d_status = EXIT_FAILURE;
             }
-            
-        } 
-        else 
+
+        }
+        else
         {
             hid_t dsetid = H5Dopen2(fid, type_table->objs[idx].objname, H5P_DEFAULT);
             type_id = H5Dget_type(dsetid);
@@ -3649,8 +3649,8 @@ handle_datatypes(hid_t fid, const char *type, void UNUSED * data, int pe)
             H5Tclose(type_id);
             H5Dclose(dsetid);
         }
-    } 
-    else 
+    }
+    else
     {
         dump_named_datatype(type_id, type);
 
@@ -3811,7 +3811,7 @@ parse_start:
             break;
 
         case 'o':
-         
+
          if (bin_form > 0 )
          {
           if (set_output_file(opt_arg, 1) < 0){
@@ -3826,14 +3826,14 @@ parse_start:
            leave(EXIT_FAILURE);
           }
          }
-      
+
          usingdasho = TRUE;
          last_was_dset = FALSE;
          outfname = opt_arg;
          break;
 
        case 'b':
-            
+
         if ( ( bin_form = set_binary_form(opt_arg)) < 0){
          /* failed to set binary form */
          usage(progname);
@@ -3846,10 +3846,10 @@ parse_start:
           usage(progname);
           leave(EXIT_FAILURE);
          }
-         
+
          last_was_dset = FALSE;
         }
-        
+
         break;
 
        case 'q':
@@ -3864,14 +3864,14 @@ parse_start:
            break;
 
        case 'z':
-          
+
            if ( ( sort_order = set_sort_order(opt_arg)) < 0)
            {
                /* failed to set "sort order" form */
                usage(progname);
                leave(EXIT_FAILURE);
            }
-           
+
            break;
 
         /** begin XML parameters **/
@@ -4224,29 +4224,29 @@ main(int argc, const char *argv[])
             dump_fcpl(fid);
     }
 
-    if(display_all) 
+    if(display_all)
     {
-        if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) 
+        if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
         {
             error_msg(progname, "unable to open root group\n");
             d_status = EXIT_FAILURE;
-        } 
-        else 
+        }
+        else
         {
-     
+
             dump_function_table->dump_group_function(gid, "/" );
-     
+
         }
 
-        if(H5Gclose(gid) < 0) 
+        if(H5Gclose(gid) < 0)
         {
             error_msg(progname, "unable to close root group\n");
             d_status = EXIT_FAILURE;
         }
 
-        
-    } 
-    else 
+
+    }
+    else
     {
         /* Note: this option is not supported for XML */
         if(doxml) {
@@ -5477,7 +5477,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
  *
  * Modifications:
  *  Pedro Vicente, October 9, 2007
- *   added parameters to H5A(L)iterate to allow for other iteration orders 
+ *   added parameters to H5A(L)iterate to allow for other iteration orders
  *
  *-------------------------------------------------------------------------
  */
@@ -5503,21 +5503,21 @@ xml_dump_group(hid_t gid, const char *name)
         error_msg(progname, "error in getting group creation property list ID\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     /* query the group creation properties for attributes */
-    if (H5Pget_attr_creation_order(gcpl_id, &attr_crt_order_flags) < 0) 
+    if (H5Pget_attr_creation_order(gcpl_id, &attr_crt_order_flags) < 0)
     {
         error_msg(progname, "error in getting group creation properties\n");
         d_status = EXIT_FAILURE;
     }
 
     /* query the group creation properties */
-    if(H5Pget_link_creation_order(gcpl_id, &crt_order_flags) < 0) 
+    if(H5Pget_link_creation_order(gcpl_id, &crt_order_flags) < 0)
     {
         error_msg(progname, "error in getting group creation properties\n");
         d_status = EXIT_FAILURE;
     }
-    
+
     if(H5Pclose(gcpl_id) < 0) {
         error_msg(progname, "error in closing group creation property list ID\n");
         d_status = EXIT_FAILURE;
@@ -5613,7 +5613,7 @@ xml_dump_group(hid_t gid, const char *name)
                 found_obj->displayed = TRUE;
 
                 /* 1.  do all the attributes of the group */
-               
+
                 if((sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED))
                     H5Aiterate2(gid, sort_by, sort_order, NULL, dump_function_table->dump_attribute_function, NULL);
                 else
@@ -5677,7 +5677,7 @@ xml_dump_group(hid_t gid, const char *name)
         free(parentxid);
 
         /* 1.  do all the attributes of the group */
-        
+
         if((sort_by == H5_INDEX_CRT_ORDER) && (attr_crt_order_flags & H5P_CRT_ORDER_TRACKED))
             H5Aiterate2(gid, sort_by, sort_order, NULL, dump_function_table->dump_attribute_function, NULL);
         else
@@ -6140,7 +6140,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    xml_dump_dataset 
+ * Function:    xml_dump_dataset
  *
  * Purpose:     Dump a description of an HDF5 dataset in XML.
  *
@@ -6150,7 +6150,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
  *
  * Modifications:
  *  Pedro Vicente, October 9, 2007
- *   added parameters to H5Aiterate2 to allow for other iteration orders 
+ *   added parameters to H5Aiterate2 to allow for other iteration orders
  *
  *-------------------------------------------------------------------------
  */
@@ -6639,7 +6639,7 @@ h5_fileaccess(void)
             return -1;
     } else if (!HDstrcmp(name, "direct")) {
         /* Substitute Direct I/O driver with sec2 driver temporarily because
-         * some output has sec2 driver as the standard. */  
+         * some output has sec2 driver as the standard. */
         if (H5Pset_fapl_sec2(fapl)<0) return -1;
     } else {
         /* Unknown driver */
@@ -6700,7 +6700,7 @@ add_prefix(char **prfx, size_t *prfx_len, const char *name)
  * made by: PVN
  *
  * Purpose:     Dump an external link
- *  Since external links are soft links, they are dumped on a trial error 
+ *  Since external links are soft links, they are dumped on a trial error
  *   basis, attempting to dump as a dataset, as a group and as a named datatype
  *   Error messages are supressed
  *
@@ -6710,33 +6710,33 @@ add_prefix(char **prfx, size_t *prfx_len, const char *name)
 static int dump_extlink(const char *filename, const char *targname)
 {
     hid_t fid;
-    
-    
+
+
     fid = h5tools_fopen(filename, H5F_ACC_RDONLY, H5P_DEFAULT, driver, NULL, 0);
-   
-    if (fid < 0) 
+
+    if (fid < 0)
     {
         goto fail;
     }
-    
+
     /* add some indentation to distinguish that these objects are external */
     indent += 2*COL;
-    
+
     handle_datasets(fid, targname, NULL, 0);
     handle_groups(fid, targname, NULL, 0);
     handle_datatypes(fid, targname, NULL, 0);
-    
+
     indent -= 2*COL;
-    
-    
+
+
     if (H5Fclose(fid) < 0)
         d_status = EXIT_FAILURE;
-    
-    
+
+
     return SUCCEED;
-    
+
 fail:
 
     return FAIL;
-    
+
 }
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 0646536..f3a84ef 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -5539,7 +5539,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    gent_binary
  *
- * Purpose:     Generate a file to be used in the binary output test 
+ * Purpose:     Generate a file to be used in the binary output test
  *              Contains:
  *              1) an integer dataset
  *              2) a float dataset
@@ -5564,7 +5564,7 @@ gent_binary(void)
  * integer
  *-------------------------------------------------------------------------
  */
- 
+
  did = H5Dcreate2(fid, "integer", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
  H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf);
  H5Dclose(did);
@@ -5587,7 +5587,7 @@ gent_binary(void)
  aid = H5Acreate2(did, "attr", H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT, H5P_DEFAULT);
  H5Aclose(aid);
  H5Dclose(did);
- 
+
 
  /* close */
  H5Sclose(sid);
@@ -5629,8 +5629,8 @@ gent_bigdims(void)
     /* create a file */
     fid  = H5Fcreate(FILE56, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     assert(fid >= 0);
-    
-    /* create dataset */ 
+
+    /* create dataset */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
     if(H5Pset_fill_value(dcpl, H5T_NATIVE_SCHAR, &fillvalue) < 0)
@@ -5641,35 +5641,35 @@ gent_bigdims(void)
         goto out;
     if((did = H5Dcreate2(fid, "dset4gb", H5T_NATIVE_SCHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto out;
-    if((tid = H5Dget_type(did)) < 0) 
+    if((tid = H5Dget_type(did)) < 0)
         goto out;
     if((size = H5Tget_size(tid)) <= 0)
         goto out;
-    
+
     /* select an hyperslab */
     nelmts = 20;
     hs_start[0] = GB4LL - 10;
     hs_size[0]  = nelmts;
-    
-    if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0) 
+
+    if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
         goto out;
-    
+
     buf=(char *) malloc((unsigned)(nelmts*size));
-    
-    for(i=0, c=0; i<nelmts; i++, c++) 
+
+    for(i=0, c=0; i<nelmts; i++, c++)
     {
         buf[i] = c;
     }
-    
-    if(H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size,NULL) < 0) 
+
+    if(H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size,NULL) < 0)
         goto out;
-    if(H5Dwrite (did,H5T_NATIVE_SCHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0) 
+    if(H5Dwrite (did,H5T_NATIVE_SCHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
         goto out;
-    
-    
+
+
     free(buf);
     buf=NULL;
-    
+
     /* close */
     if(H5Sclose(f_sid) < 0)
         goto out;
@@ -5682,9 +5682,9 @@ gent_bigdims(void)
 
     ret = H5Fclose(fid);
     assert(ret >= 0);
-    
+
     return;
-    
+
 out:
     printf("Error.....\n");
     H5E_BEGIN_TRY {
@@ -5695,7 +5695,7 @@ out:
         H5Fclose(fid);
     } H5E_END_TRY;
     return;
-    
+
 }
 
 
@@ -5735,7 +5735,7 @@ gent_hyperslab(void)
  * Function: gent_group_creation_order
  *
  * Purpose: generate a file with several groups with creation order set and not
- *  set tru its hierarchy 
+ *  set tru its hierarchy
  *
  *-------------------------------------------------------------------------
  */
@@ -5746,118 +5746,118 @@ gent_group_creation_order(void)
     hid_t    gid;      /* group ID */
     hid_t    gcpl_id;  /* group creation property list ID */
     hid_t    fcpl_id;  /* file creation property list ID (to set root group order) */
-    
-    if((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) < 0) 
+
+    if((fcpl_id = H5Pcreate(H5P_FILE_CREATE)) < 0)
         goto out;
-    
-    if(H5Pset_link_creation_order(fcpl_id, H5P_CRT_ORDER_TRACKED ) < 0) 
+
+    if(H5Pset_link_creation_order(fcpl_id, H5P_CRT_ORDER_TRACKED ) < 0)
         goto out;
-    
-    if((fid = H5Fcreate(FILE58, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT)) < 0) 
+
+    if((fid = H5Fcreate(FILE58, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    
-    
+
+
     /* create group creation property list */
-    if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) 
+    if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
         goto out;
 
 /*-------------------------------------------------------------------------
- * create a group "2" 
+ * create a group "2"
  *-------------------------------------------------------------------------
- */  
-    
+ */
+
 
-    if((gid = H5Gcreate2(fid, "2", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "2", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    
-    if((gid = H5Gcreate2(fid, "2/c", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+
+    if((gid = H5Gcreate2(fid, "2/c", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "2/b", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "2/b", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "2/a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "2/a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
 
-    if((gid = H5Gcreate2(fid, "2/a/a2", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "2/a/a2", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "2/a/a1", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "2/a/a1", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
 
-     if((gid = H5Gcreate2(fid, "2/a/a2/a22", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+     if((gid = H5Gcreate2(fid, "2/a/a2/a22", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "2/a/a2/a21", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "2/a/a2/a21", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
 
-  
+
 /*-------------------------------------------------------------------------
  * create a group "1" with H5P_CRT_ORDER_TRACKED set
  *-------------------------------------------------------------------------
- */  
-    if(H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) 
+ */
+    if(H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
         goto out;
 
 
-    if((gid = H5Gcreate2(fid, "1", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "1", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    
-    if((gid = H5Gcreate2(fid, "1/c", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+
+    if((gid = H5Gcreate2(fid, "1/c", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "1/b", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "1/b", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "1/a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "1/a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
 
-    if((gid = H5Gcreate2(fid, "1/a/a2", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "1/a/a2", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "1/a/a1", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "1/a/a1", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
 
-     if((gid = H5Gcreate2(fid, "1/a/a2/a22", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+     if((gid = H5Gcreate2(fid, "1/a/a2/a22", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    if((gid = H5Gcreate2(fid, "1/a/a2/a21", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "1/a/a2/a21", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    if(H5Gclose(gid) < 0) 
+    if(H5Gclose(gid) < 0)
         goto out;
-    
-  
-    if(H5Pclose(gcpl_id) < 0) 
+
+
+    if(H5Pclose(gcpl_id) < 0)
         goto out;
-    if(H5Pclose(fcpl_id) < 0) 
+    if(H5Pclose(fcpl_id) < 0)
         goto out;
-    if(H5Fclose(fid) < 0) 
+    if(H5Fclose(fid) < 0)
         goto out;
-    
+
     return;
-    
+
 out:
     printf("Error.....\n");
     H5E_BEGIN_TRY {
@@ -5865,17 +5865,17 @@ out:
         H5Pclose(gcpl_id);
         H5Pclose(fcpl_id);
         H5Fclose(fid);
-        
+
     } H5E_END_TRY;
     return;
-    
+
 }
 
 /*-------------------------------------------------------------------------
  * Function: gent_attr_creation_order
  *
- * Purpose: generate a file with several objects with attributes with creation 
- *  order set and not set 
+ * Purpose: generate a file with several objects with attributes with creation
+ *  order set and not set
  *
  *-------------------------------------------------------------------------
  */
@@ -5893,85 +5893,85 @@ gent_attr_creation_order(void)
     hid_t    tcpl_id;  /* datatype creation property list ID */
     int      i;
     const char *attr_name[3] = {"c", "b", "a" };
-    
-    if((fid = H5Fcreate(FILE59, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+
+    if((fid = H5Fcreate(FILE59, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* create group creation property list */
-    if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) 
+    if((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0)
         goto out;
 
     /* create dataset creation property list */
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) 
+    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto out;
 
     /* create dataset creation property list */
-    if((tcpl_id = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) 
+    if((tcpl_id = H5Pcreate(H5P_DATATYPE_CREATE)) < 0)
         goto out;
 
     /* enable attribute creation order tracking on dataset property list */
-    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED) < 0) 
+    if(H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
         goto out;
 
     /* enable attribute creation order tracking on group property list */
-    if(H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) 
+    if(H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
         goto out;
 
     /* enable attribute creation order tracking on datatype property list */
-    if(H5Pset_attr_creation_order(tcpl_id, H5P_CRT_ORDER_TRACKED) < 0) 
+    if(H5Pset_attr_creation_order(tcpl_id, H5P_CRT_ORDER_TRACKED) < 0)
         goto out;
 
     /* create a dataspace */
-    if((sid = H5Screate(H5S_SCALAR)) < 0) 
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
         goto out;
 
 /*-------------------------------------------------------------------------
  * create a dataset with creation order tracked for attributes and atributes in it
  *-------------------------------------------------------------------------
  */
-  
+
     /* create a dataset */
-    if((did = H5Dcreate2(fid, "dt", H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) 
+    if((did = H5Dcreate2(fid, "dt", H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0)
         goto out;
 
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(did, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(did, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
     } /* end for */
-    
-    if(H5Dclose(did) < 0) 
+
+    if(H5Dclose(did) < 0)
         goto out;
-    
+
 
 /*-------------------------------------------------------------------------
  * create a dataset without creation order tracked for attributes and atributes in it
  *-------------------------------------------------------------------------
  */
-  
+
     /* create a dataset */
-    if((did = H5Dcreate2(fid, "d", H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((did = H5Dcreate2(fid, "d", H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
 
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(did, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(did, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
     } /* end for */
-    
-    if(H5Dclose(did) < 0) 
+
+    if(H5Dclose(did) < 0)
         goto out;
-    
+
 
 
 /*-------------------------------------------------------------------------
@@ -5979,22 +5979,22 @@ gent_attr_creation_order(void)
  *-------------------------------------------------------------------------
  */
 
-    if((gid = H5Gcreate2(fid, "gt", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "gt", H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(gid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(gid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
-        
+
     } /* end for */
-    
-    if(H5Gclose(gid) < 0) 
+
+    if(H5Gclose(gid) < 0)
         goto out;
 
 /*-------------------------------------------------------------------------
@@ -6002,22 +6002,22 @@ gent_attr_creation_order(void)
  *-------------------------------------------------------------------------
  */
 
-    if((gid = H5Gcreate2(fid, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+    if((gid = H5Gcreate2(fid, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(gid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(gid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
-        
+
     } /* end for */
-    
-    if(H5Gclose(gid) < 0) 
+
+    if(H5Gclose(gid) < 0)
         goto out;
 
 
@@ -6026,25 +6026,25 @@ gent_attr_creation_order(void)
  *-------------------------------------------------------------------------
  */
 
-    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) 
+    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
         goto out;
-    
+
     if((H5Tcommit2(fid, "tt", tid, H5P_DEFAULT, tcpl_id, H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(tid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(tid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
-        
+
     } /* end for */
-    
-    if(H5Tclose(tid) < 0) 
+
+    if(H5Tclose(tid) < 0)
         goto out;
 
 /*-------------------------------------------------------------------------
@@ -6052,47 +6052,47 @@ gent_attr_creation_order(void)
  *-------------------------------------------------------------------------
  */
 
-    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) 
+    if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
         goto out;
-    
+
     if((H5Tcommit2(fid, "t", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(tid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(tid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
-        
+
     } /* end for */
-    
-    if(H5Tclose(tid) < 0) 
+
+    if(H5Tclose(tid) < 0)
         goto out;
 
 /*-------------------------------------------------------------------------
  * add some attributes to the root group
  *-------------------------------------------------------------------------
  */
-    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) 
+    if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
         goto out;
-    
+
     /* add attributes */
-    for(i = 0; i < 3; i++) 
+    for(i = 0; i < 3; i++)
     {
-        if((aid = H5Acreate2(gid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) 
+        if((aid = H5Acreate2(gid, attr_name[i], H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
-        
+
         /* close attribute */
-        if(H5Aclose(aid) < 0) 
+        if(H5Aclose(aid) < 0)
             goto out;
-        
+
     } /* end for */
-    
-    if(H5Gclose(gid) < 0) 
+
+    if(H5Gclose(gid) < 0)
         goto out;
 
 
@@ -6100,22 +6100,22 @@ gent_attr_creation_order(void)
  * close
  *-------------------------------------------------------------------------
  */
-    if(H5Sclose(sid) < 0) 
+    if(H5Sclose(sid) < 0)
         goto out;
 
-    if(H5Pclose(dcpl_id) < 0) 
+    if(H5Pclose(dcpl_id) < 0)
         goto out;
-    if(H5Pclose(gcpl_id) < 0) 
+    if(H5Pclose(gcpl_id) < 0)
         goto out;
-    if(H5Pclose(tcpl_id) < 0) 
+    if(H5Pclose(tcpl_id) < 0)
         goto out;
-    if(H5Fclose(fid) < 0) 
+    if(H5Fclose(fid) < 0)
         goto out;
 
 
-    
+
     return;
-    
+
 out:
     printf("Error.....\n");
     H5E_BEGIN_TRY {
@@ -6126,16 +6126,16 @@ out:
         H5Pclose(dcpl_id);
         H5Pclose(tcpl_id);
         H5Fclose(fid);
-        
+
     } H5E_END_TRY;
     return;
-    
+
 }
 
 /*-------------------------------------------------------------------------
  * Function:    gent_fpformat
  *
- * Purpose:     Generate a file to be used in the floating point format test 
+ * Purpose:     Generate a file to be used in the floating point format test
  *              Contains:
  *              1) a float dataset
  *              2) a double dataset
@@ -6179,7 +6179,7 @@ gent_fpformat(void)
 /*-------------------------------------------------------------------------
  * Function:    gent_extlinks
  *
- * Purpose:     Generate 2 files to be used in the external links test 
+ * Purpose:     Generate 2 files to be used in the external links test
  *   External links point from one HDF5 file to an object (Group, Dataset, or
  *    committed Datatype) in another file.
  *
@@ -6195,7 +6195,7 @@ gent_extlinks(void)
  /* create two files, a source and a target */
  source_fid = H5Fcreate(FILE61, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
  target_fid = H5Fcreate(FILE62, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
- 
+
 
 /*-------------------------------------------------------------------------
  * create a Group, a Dataset, and a committed Datatype in the target
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index d1b15bb..6352c52 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     {
         print_version("h5import");
         exit(EXIT_SUCCESS);
-        
+
     }
 
  /*
@@ -292,19 +292,19 @@ processDataFile(char *infile, struct Input *in, FILE **strm, hid_t file_id)
  /*-------------------------------------------------------------------------
   * special case for opening binary classes in WIN32
   * "FP" denotes a floating point binary file,
-  * "IN" denotes a signed integer binary file, 
+  * "IN" denotes a signed integer binary file,
   * "UIN" denotes an unsigned integer binary file,
   *-------------------------------------------------------------------------
   */
   if ( in->inputClass == 4 /* "IN" */ ||
        in->inputClass == 3 /* "FP" */ ||
-       in->inputClass == 7 /* "UIN" */ 
-      
+       in->inputClass == 7 /* "UIN" */
+
       )
   {
 
 #ifdef WIN32
-      
+
       if ((*strm = fopen(infile, "rb")) == NULL)
       {
           (void) fprintf(stderr, err1, infile);
@@ -852,20 +852,20 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
     char    str[1024];
     char    c;
     int     i = 0, j, nlines = 0, line;
-    
+
 /*-------------------------------------------------------------------------
  * get number of lines in the input file
  *-------------------------------------------------------------------------
  */
 
-    while ( !feof( *strm ) ) 
+    while ( !feof( *strm ) )
     {
         c = fgetc( *strm );
-                   
+
         if ( c == 10 ) /* eol */
         {
             nlines++;
-            
+
         }
     }
 
@@ -890,9 +890,9 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
         goto out;
 
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
-        
+
         /* create parent groups */
         if(in->path.count > 1) {
             j = 0;
@@ -913,7 +913,7 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
             handle = file_id;
             j = 0;
         }
-        
+
         /*enable error reporting */
     } H5E_END_TRY;
 
@@ -930,11 +930,11 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
 
     while(!feof(*strm)) {
         c = fgetc(*strm);
-        
+
         str[i] = c;
-        
+
         i++;
-        
+
         if(c == 10) /* eol */
         {
             char    *str2 = str;
@@ -960,11 +960,11 @@ processStrData(FILE **strm, struct Input *in, hid_t file_id)
 
             i = 0;
             str[ 0 ] = '\0';
-            
+
         }
     }
 
-    
+
     /* close */
     H5Dclose(dset_id);
     H5Sclose(space_id);
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index 9272632..0b0ba9c 100755
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.c
@@ -32,40 +32,40 @@ main(void)
     int       nrow = 3, ncol = 4, npln = 5;
     int       i, j, k;
     FILE      *sp;
-    
+
     float     b32r3[5][3][4];
     float     row4[3], col4[4], pln4[5];
     float     rowo4 = (float)11.0e0, colo4 = (float)21.0e0, plno4 = (float)51.0e0;
     float     rowi4 = (float)1.0e0, coli4 = (float)2.0e0, plni4 = (float)5.0e0;
-    
+
     int       b32i3[5][3][4];
     int       row4i[3], col4i[4], pln4i[5];
     int       rowo4i = (int)11 , colo4i = (int)21 , plno4i = (int)51 ;
     int       rowi4i = (int)1 , coli4i = (int)2 , plni4i = (int)5 ;
-    
+
 #ifndef WIN32
     long_long b64i2[3][4], b64i3[5][3][4];
     long_long row4i64[3], col4i64[4], pln4i64[5];
     long_long rowo4i64 = (long_long)11 , colo4i64 = (long_long)21 , plno4i64 = (long_long)51 ;
     long_long rowi4i64 = (long_long)1 , coli4i64 = (long_long)2 , plni4i64 = (long_long)5 ;
 #endif
-    
+
     short     b16i3[5][3][4];
     short     row4i16[3], col4i16[4], pln4i16[5];
     short     rowo4i16 = (short)11 , colo4i16 = (short)21 , plno4i16 = (short)51 ;
     short     rowi4i16 = (short)1 , coli4i16 = (short)2 , plni4i16 = (short)5 ;
-    
+
     char      b8i3[5][3][4];
     char      row4i8[3], col4i8[4], pln4i8[5];
     char      rowo4i8 = (char)11 , colo4i8 = (char)21 , plno4i8 = (char)51 ;
     char      rowi4i8 = (char)1 , coli4i8 = (char)2 , plni4i8 = (char)5 ;
-    
+
     double    b64r3[5][3][4];
     double    row8[3], col8[4], pln8[5];
     double    rowo8 = 11.0e0, colo8 = 21.0e0, plno8 = 51.0e0;
     double    rowi8 = 1.0e0, coli8 = 2.0e0, plni8 = 5.0e0;
-    
-    
+
+
     /*
     * initialize the row, column, and plane vectors
     *
@@ -73,40 +73,40 @@ main(void)
     * column values start at 21 and increment by 2 => 21, 23, 25, 27
     * plane values start at 51 and increment by 5 => 51, 56, 61, 66, 71
     */
-    
-    
+
+
     /*
     * build array elements - rank 2
     *
     * element value = sum of row value and col values
     */
-    
+
     row4[0] = rowo4;
     col4[0] = colo4;
     pln4[0] = plno4;
-    
+
     row8[0] = rowo8;
     col8[0] = colo8;
     pln8[0] = plno8;
-    
+
     row4i[0] = rowo4i;
     col4i[0] = colo4i;
     pln4i[0] = plno4i;
-    
+
 #ifndef WIN32
     row4i64[0] = rowo4i64;
     col4i64[0] = colo4i64;
     pln4i64[0] = plno4i64;
 #endif
-    
+
     row4i16[0] = rowo4i16;
     col4i16[0] = colo4i16;
     pln4i16[0] = plno4i16;
-    
+
     row4i8[0] = rowo4i8;
     col4i8[0] = colo4i8;
     pln4i8[0] = plno4i8;
-    
+
     for (i = 1; i < nrow; i++)
     {
         row4[i] = row4[i - 1] + rowi4;
@@ -157,7 +157,7 @@ main(void)
     *
     * element value = sum of row value, col, and plane values
     */
-    
+
     for (i = 0; i < nrow; i++)
     {
         for (j = 0; j < ncol; j++)
@@ -176,7 +176,7 @@ main(void)
         }
     }
 
-    
+
 
 #ifndef UNICOS
 
@@ -222,7 +222,7 @@ main(void)
   *-------------------------------------------------------------------------
   */
 
-#ifdef WIN32        
+#ifdef WIN32
     sp = fopen("binin32.bin", "wb");
 #else
     sp = fopen("binin32.bin", "w");
@@ -244,7 +244,7 @@ main(void)
   *-------------------------------------------------------------------------
   */
 
-#ifdef WIN32        
+#ifdef WIN32
     sp = fopen("binuin32.bin", "wb");
 #else
     sp = fopen("binuin32.bin", "w");
@@ -269,7 +269,7 @@ main(void)
   *-------------------------------------------------------------------------
   */
 
-#ifdef WIN32        
+#ifdef WIN32
     sp = fopen("binin16.bin", "wb");
 #else
     sp = fopen("binin16.bin", "w");
@@ -372,7 +372,7 @@ main(void)
     {
         /* test CR+LF (13,10) and EOF (26) in windows */
         char bin8w[4] = {13,10,26,0};
-        
+
 #ifdef WIN32
         sp = fopen("binin8w.bin", "wb");
 #else
@@ -385,8 +385,8 @@ main(void)
                 printf("error writing file\n");
         }
         fclose(sp);
-        
-        
+
+
     }
 
 
diff --git a/tools/h5recover/enable_journaling.c b/tools/h5recover/enable_journaling.c
index ee8d78c..df83de8 100755
--- a/tools/h5recover/enable_journaling.c
+++ b/tools/h5recover/enable_journaling.c
@@ -77,7 +77,7 @@ helppage(void)
 
 
 int
-set_journal(hid_t faccpl, const char * journalname) 
+set_journal(hid_t faccpl, const char * journalname)
 {
     H5AC2_jnl_config_t jnl_config;
 
@@ -132,8 +132,8 @@ main (int ac, char **av)
      *			        # add more rows, then crash. JournalEG.h5
      *				# is not readable as an HDF5 file.
      * ./h5recover -j JournalEG.h5.jnl JournalEG.h5	# Recover the file.
-     * 
-     * 
+     *
+     *
      */
     if (ac<=1){
 	helppage();
@@ -155,7 +155,7 @@ main (int ac, char **av)
 	}
     }
 
-    /* Create a file access property list to be used by both create and 
+    /* Create a file access property list to be used by both create and
      * reopen modes.
      * Use latest lib version needed by the Journaling feature.
      */
@@ -191,7 +191,7 @@ main (int ac, char **av)
 
 	/* Create dataset creation property list */
 	dsetpl = H5Pcreate(H5P_DATASET_CREATE);
-	
+
 	/* Enable chunking needed for unlimited dimesion */
 	H5Pset_layout(dsetpl, H5D_CHUNKED);
 	H5Pset_chunk(dsetpl, 2, chunk);
@@ -344,7 +344,7 @@ writedata(hid_t file, hid_t dataset, int begin, int end, hid_t timestep)
     fprintf(stderr, "File data flushed.\n");
     retcode = H5Awrite(timestep, H5T_NATIVE_INT, &timecounter);
     fprintf(stderr, "Time step counter updated.\n");
-    
-    
+
+
     return(retcode);
 }
diff --git a/tools/h5recover/h5recover.c b/tools/h5recover/h5recover.c
index 711380f..40afbb6 100644
--- a/tools/h5recover/h5recover.c
+++ b/tools/h5recover/h5recover.c
@@ -59,20 +59,20 @@ static struct long_options l_opts[] = {
 
 /* Utility Function Declarations: */
 
-void address_decode(size_t sizeof_addr, 
-                    const uint8_t **pp /* in, out */, 
+void address_decode(size_t sizeof_addr,
+                    const uint8_t **pp /* in, out */,
                     haddr_t *addr_p/*out*/);
 
-void address_encode(size_t sizeof_addr, 
-                    uint8_t **pp /* in, out */, 
+void address_encode(size_t sizeof_addr,
+                    uint8_t **pp /* in, out */,
                     haddr_t addr);
 
-void length_decode(size_t sizeof_length, 
-                   const uint8_t **pp /* in, out */, 
+void length_decode(size_t sizeof_length,
+                   const uint8_t **pp /* in, out */,
                    hsize_t *len_p /*out*/);
 
-void length_encode(size_t sizeof_length, 
-                   uint8_t **pp /* in, out */, 
+void length_encode(size_t sizeof_length,
+                   uint8_t **pp /* in, out */,
                    hsize_t length);
 
 hbool_t load_buf_from_file(int fd,
@@ -87,14 +87,14 @@ hbool_t load_buf_from_file(int fd,
 
 /* HDF5 File Investigation Function Declarations: */
 
-hbool_t find_super_block(int fd, 
-                         off_t file_len, 
+hbool_t find_super_block(int fd,
+                         off_t file_len,
                          off_t * sb_offset_ptr);
 
-hbool_t get_sb_base_addr(int fd, 
+hbool_t get_sb_base_addr(int fd,
                          off_t file_len,
-                         off_t sb_offset, 
-                         int sb_ver, 
+                         off_t sb_offset,
+                         int sb_ver,
                          int offset_size,
                          haddr_t * sb_base_addr_ptr);
 
@@ -139,7 +139,7 @@ hbool_t get_mdj_msg_addr__scan_chunk(int fd,
                                      haddr_t chunk_addr,
                                      haddr_t chunk_size,
                                      haddr_t * mdj_msg_addr_ptr,
-                                     hbool_t examine, 
+                                     hbool_t examine,
                                      unsigned verbosity);
 
 hbool_t get_mdj_msg_data(int fd,
@@ -275,7 +275,7 @@ hbool_t bjf__chksum_entry_body(int fd,
                                off_t file_len,
                                off_t offset,
                                off_t * new_offset_ptr,
-  	                       int * msg_type_ptr, 
+  	                       int * msg_type_ptr,
                                size_t body_length,
                                uint32_t * chksum_ptr,
                                unsigned verbosity);
@@ -284,16 +284,16 @@ hbool_t bjf__load_begin_trans_msg(int fd,
                                   off_t file_len,
                                   off_t offset,
                                   off_t * new_offset_ptr,
-  		                  int * msg_type_ptr, 
+  		                  int * msg_type_ptr,
                                   int msg_ver,
-                                  uint64_t * trans_num_ptr, 
+                                  uint64_t * trans_num_ptr,
                                   unsigned verbosity);
 
 hbool_t bjf__load_chksum(int fd,
                          off_t file_len,
                          off_t offset,
                          off_t * new_offset_ptr,
-                         int * msg_type_ptr, 
+                         int * msg_type_ptr,
                          uint32_t * chksum_ptr,
                          unsigned verbosity);
 
@@ -301,16 +301,16 @@ hbool_t bjf__load_end_trans_msg(int fd,
                                 off_t file_len,
                                 off_t offset,
                                 off_t * new_offset_ptr,
-  	                        int * msg_type_ptr, 
+  	                        int * msg_type_ptr,
                                 int msg_ver,
-                                uint64_t * trans_num_ptr, 
+                                uint64_t * trans_num_ptr,
                                 unsigned verbosity);
 
 hbool_t bjf__load_entry_body(int fd,
                              off_t file_len,
                              off_t offset,
                              off_t * new_offset_ptr,
-  	                     int * msg_type_ptr, 
+  	                     int * msg_type_ptr,
                              size_t body_length,
                              char * buf_ptr,
                              size_t buf_len,
@@ -321,9 +321,9 @@ hbool_t bjf__load_eoa_msg(int fd,
                           off_t file_len,
                           off_t offset,
                           off_t * new_offset_ptr,
-	                  int * msg_type_ptr, 
+	                  int * msg_type_ptr,
                           int msg_ver,
-                          haddr_t * eoa_ptr, 
+                          haddr_t * eoa_ptr,
                           int hdf5_offset_width,
                           unsigned verbosity);
 
@@ -331,12 +331,12 @@ hbool_t bjf__load_jnl_entry_msg(int fd,
                                 off_t file_len,
                                 off_t offset,
                                 off_t * new_offset_ptr,
-  		                int * msg_type_ptr, 
+  		                int * msg_type_ptr,
                                 int msg_ver,
-                                uint64_t * trans_num_ptr, 
-                                haddr_t * hdf5_offset_ptr, 
+                                uint64_t * trans_num_ptr,
+                                haddr_t * hdf5_offset_ptr,
                                 int hdf5_offset_width,
-                                size_t * hdf5_length_ptr, 
+                                size_t * hdf5_length_ptr,
                                 int hdf5_length_width,
                                 char * buf_ptr,
                                 size_t buf_len,
@@ -346,8 +346,8 @@ hbool_t bjf__load_length(int fd,
                          off_t file_len,
                          off_t offset,
                          off_t * new_offset_ptr,
-                         int * msg_type_ptr, 
-                         size_t * hdf5_length_ptr, 
+                         int * msg_type_ptr,
+                         size_t * hdf5_length_ptr,
                          int hdf5_length_width,
                          uint32_t * chksum_ptr,
                          unsigned verbosity);
@@ -356,11 +356,11 @@ hbool_t bjf__load_next_msg(int fd,
                            off_t file_len,
                            off_t offset,
                            off_t * new_offset_ptr,
-  		           int * msg_type_ptr, 
-                           uint64_t * trans_num_ptr, 
-                           haddr_t * hdf5_offset_ptr, 
+  		           int * msg_type_ptr,
+                           uint64_t * trans_num_ptr,
+                           haddr_t * hdf5_offset_ptr,
                            int hdf5_offset_width,
-                           size_t * hdf5_length_ptr, 
+                           size_t * hdf5_length_ptr,
                            int hdf5_length_width,
                            haddr_t * eoa_ptr,
                            char * buf_ptr,
@@ -371,8 +371,8 @@ hbool_t bjf__load_offset(int fd,
                          off_t file_len,
                          off_t offset,
                          off_t * new_offset_ptr,
-                         int * msg_type_ptr, 
-                         haddr_t * hdf5_offset_ptr, 
+                         int * msg_type_ptr,
+                         haddr_t * hdf5_offset_ptr,
                          int hdf5_offset_width,
                          uint32_t * chksum_ptr,
                          unsigned verbosity);
@@ -381,20 +381,20 @@ hbool_t bjf__load_trans_num(int fd,
                             off_t file_len,
                             off_t offset,
                             off_t * new_offset_ptr,
-  		            int * msg_type_ptr, 
-                            uint64_t * trans_num_ptr, 
+  		            int * msg_type_ptr,
+                            uint64_t * trans_num_ptr,
                             uint32_t * chksum_ptr,
                             unsigned verbosity);
 
 
-/* Unfortunately, H5_checksum_metadata() gives different results depending on 
+/* Unfortunately, H5_checksum_metadata() gives different results depending on
  * how the data is fed to it.  Hence, to duplicate the checksum computed on the
  * library side, we must load the entire metadata journal entry body into RAM
  * and compute the checksum in one call.
  *
- * As we don't know the size of a journal entry body until we read its journal 
- * entry message, a great deal of mallocing and freeing would be required if 
- * we allocated each buffer as needed, and then freed it when we were done 
+ * As we don't know the size of a journal entry body until we read its journal
+ * entry message, a great deal of mallocing and freeing would be required if
+ * we allocated each buffer as needed, and then freed it when we were done
  * computing the check sum.
  *
  * Instead, we will allocate a global buffer for this purpose, and then increase
@@ -417,11 +417,11 @@ size_t body_buf_len = 0;
  *
  * Function:	find_super_block()
  *
- * Purpose:	Scan the supplied file to determine if it is an HDF5 
- *		file, and if it is, load the offset into the file of 
+ * Purpose:	Scan the supplied file to determine if it is an HDF5
+ *		file, and if it is, load the offset into the file of
  *		the superblock in *sb_offset_ptr, and return TRUE.
  *
- *		If the function fails, either because the supplied 
+ *		If the function fails, either because the supplied
  *		file is not an HDF5 file, or for any other reason,
  *		*sb_offset_ptr is undefined, and the function returns
  *		FALSE
@@ -447,15 +447,15 @@ find_super_block(int fd,
     unsigned int verbosity = 0;
     off_t offset = 0;
 
-    if ( ( fd < 0 ) || 
-         ( file_len <= 0 ) || 
+    if ( ( fd < 0 ) ||
+         ( file_len <= 0 ) ||
          ( sb_offset_ptr == NULL ) ) {
 
         success = FALSE;
 	HDfprintf(stderr, "%s bad params on entry.\n", fcn_name);
     }
 
-    while ( ( success ) && ( ! found ) ) 
+    while ( ( success ) && ( ! found ) )
     {
         if ( (offset + H5F_SIGNATURE_LEN) >= file_len ) {
 
@@ -465,19 +465,19 @@ find_super_block(int fd,
 
                 HDfprintf(stderr, "%s: Target file is not an HDF5 file.\n");
             }
-        } else if ( ! load_buf_from_file(fd, file_len, offset, 
-                                         (size_t)H5F_SIGNATURE_LEN, sig_buf, 
+        } else if ( ! load_buf_from_file(fd, file_len, offset,
+                                         (size_t)H5F_SIGNATURE_LEN, sig_buf,
                                          verbosity, fcn_name, NULL) ) {
 
             success = FALSE;
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n", 
+                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n",
                           fcn_name);
             }
-        } else if ( HDmemcmp(sig_buf, 
-                             H5F_SIGNATURE, 
+        } else if ( HDmemcmp(sig_buf,
+                             H5F_SIGNATURE,
                              (size_t)H5F_SIGNATURE_LEN) == 0 ) {
 
             found = TRUE;
@@ -504,11 +504,11 @@ find_super_block(int fd,
  * Function:	get_sb_base_addr()
  *
  * Purpose:	Read the base address from the super block in the supplied
- *		file using the given superblock offset, load that value 
+ *		file using the given superblock offset, load that value
  *		into *sb_base_addr_ptr, and return TRUE.
  *
- *		If the function fails for any other reason, 
- *		*sb_base_addr_ptr is undefined, and the function returns 
+ *		If the function fails for any other reason,
+ *		*sb_base_addr_ptr is undefined, and the function returns
  *		FALSE.
  *
  * Return:	Success: TRUE
@@ -536,8 +536,8 @@ get_sb_base_addr(int fd,
     off_t sb_base_addr_offset;
     haddr_t sb_base_addr;
 
-    if ( ( fd < 0 ) || 
-         ( (sb_offset % 512) != 0 ) || 
+    if ( ( fd < 0 ) ||
+         ( (sb_offset % 512) != 0 ) ||
          ( offset_size <= 0 ) ||
          ( sizeof(haddr_t) > (size_t)offset_size ) ||
          ( offset_size > MAX_ADDR_SIZE ) ||
@@ -557,28 +557,28 @@ get_sb_base_addr(int fd,
 
         sb_base_addr_offset = sb_offset + H5F_SIGNATURE_LEN + 4;
 
-        if ( ! load_buf_from_file(fd, file_len, sb_base_addr_offset, 
-                                  (size_t)offset_size, addr_buf, 
+        if ( ! load_buf_from_file(fd, file_len, sb_base_addr_offset,
+                                  (size_t)offset_size, addr_buf,
                                   verbosity, fcn_name, NULL) ) {
 
             success = FALSE;
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n", 
+                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n",
                           fcn_name);
             }
         } else {
 
             address_decode((size_t)offset_size, &buf_ptr, &sb_base_addr);
- 
+
             if ( buf_ptr != &(addr_buf[offset_size]) ) {
 
                 success = FALSE;
 
                 if ( verbosity > 0 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                             "%s: Unexpected buf_ptr after address_decode().\n",
                              fcn_name);
                 }
@@ -599,22 +599,22 @@ get_sb_base_addr(int fd,
  *
  * Function:	get_journaling_status()
  *
- * Purpose:	Determine if the target file exists -- if it doesn't, 
+ * Purpose:	Determine if the target file exists -- if it doesn't,
  *              issue a diagnostic, and return FALSE.
  *
- *		If it exists, determine if it is an HDF5 file -- if it 
+ *		If it exists, determine if it is an HDF5 file -- if it
  *		isn't, issue a diagnostic, and return FALSE.
  *
  *              If it is an HDF5 file, determine whether it uses a super
  *		block that supports journaling -- if it doesn't, issue a
  *		diagnostic and return FALSE.
  *
- *		If the HDF5 file uses a superblock that supports 
- *		journaling, determine whether the file is marked as 
- *		having journaling in progress -- if it is not, issue a 
+ *		If the HDF5 file uses a superblock that supports
+ *		journaling, determine whether the file is marked as
+ *		having journaling in progress -- if it is not, issue a
  *		diagnostic and return FALSE.
  *
- *		If the target file is an HDF5 file that is marked as 
+ *		If the target file is an HDF5 file that is marked as
  *		having journaling in progress, determine its:
  *
  *			absolute superblock offset in the file
@@ -635,10 +635,10 @@ get_sb_base_addr(int fd,
  *		load these values into the locations indicated by the
  *		associated parameters, and return TRUE.
  *
- *		Set error_ptr to TRUE and return FALSE if the function 
+ *		Set error_ptr to TRUE and return FALSE if the function
  *		fails for any reason.
  *
- *		Note that the jnl_file_name_ptr parameter is presumed to 
+ *		Note that the jnl_file_name_ptr parameter is presumed to
  *		point to a buffer of char of length at least
  *		H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1.
  *
@@ -646,11 +646,11 @@ get_sb_base_addr(int fd,
  *		      is marked as having journaling in progress.
  *
  *		FALSE if the supplied path references a file that does
- *		      not exist, doesn't reference an HDF5 file, 
- *		      references an HDF5 file that doesn't support 
+ *		      not exist, doesn't reference an HDF5 file,
+ *		      references an HDF5 file that doesn't support
  *		      journaling, references an HDF5 file that supports
- *		      journaling but that is not marked as having 
- *		      journaling in progress, or if the function fails 
+ *		      journaling but that is not marked as having
+ *		      journaling in progress, or if the function fails
  *		      for any reason.
  *
  * Programmer:	JRM -- 2/24/09
@@ -659,12 +659,12 @@ get_sb_base_addr(int fd,
  *		Added the examine parameter.  This doesn't change
  *		the flow of execution, but it does cause the function to
  *		keep up a running commentary to stdout, and to suppress
- *		much of output to stderr that would normally be generated 
+ *		much of output to stderr that would normally be generated
  *		when errors are detected.
  *
  *		JRM -- 3/19/09
  *		Added the verbosity parameter and associated code.  It
- *		doesn't change the execution, but it does control the 
+ *		doesn't change the execution, but it does control the
  *		amount of comentary generated.
  *
  **************************************************************************/
@@ -705,7 +705,7 @@ get_journaling_status(char * file_path_ptr,
     haddr_t sb_ext_addr;
     haddr_t mdj_msg_addr = HADDR_UNDEF;
 
-    if ( ( file_path_ptr == NULL ) || 
+    if ( ( file_path_ptr == NULL ) ||
          ( file_len_ptr == NULL ) ||
          ( sb_offset_ptr == NULL ) ||
          ( sb_version_ptr == NULL ) ||
@@ -723,7 +723,7 @@ get_journaling_status(char * file_path_ptr,
 
     if ( examine ) {
 
-        HDfprintf(stdout, "Examining the putative HDF5 file %s:\n", 
+        HDfprintf(stdout, "Examining the putative HDF5 file %s:\n",
                   file_path_ptr);
 
         /* We don't want to generate output to stderr when doing an examine
@@ -740,7 +740,7 @@ get_journaling_status(char * file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "%sattempting to get the length of %s...\n", 
+            HDfprintf(stdout, "%sattempting to get the length of %s...\n",
                       indent1, file_path_ptr);
         }
 
@@ -757,10 +757,10 @@ get_journaling_status(char * file_path_ptr,
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stdout, "%sfile length = %lld\n", 
+                HDfprintf(stdout, "%sfile length = %lld\n",
                          indent2, (long long)file_len);
 
-            } 
+            }
 
             *file_len_ptr = file_len;
 
@@ -768,7 +768,7 @@ get_journaling_status(char * file_path_ptr,
 
                 success = FALSE;
                 *error_ptr = TRUE;
-                HDfprintf(err_file_ptr, "%s%s is empty.\n", 
+                HDfprintf(err_file_ptr, "%s%s is empty.\n",
                           indent1, file_path_ptr);
             }
         }
@@ -778,7 +778,7 @@ get_journaling_status(char * file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "%sattempting to open %s...\n", 
+            HDfprintf(stdout, "%sattempting to open %s...\n",
                       indent1, file_path_ptr);
         }
 
@@ -790,7 +790,7 @@ get_journaling_status(char * file_path_ptr,
 
             success = FALSE;
             *error_ptr = TRUE;
-            HDfprintf(err_file_ptr, "%scan't open %s.\n", 
+            HDfprintf(err_file_ptr, "%scan't open %s.\n",
                       indent1, file_path_ptr);
 
         } else {
@@ -801,7 +801,7 @@ get_journaling_status(char * file_path_ptr,
             }
         }
     }
- 
+
 
     if ( success ) {
 
@@ -816,7 +816,7 @@ get_journaling_status(char * file_path_ptr,
 
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
 		      "%ssuper block not found in %s -- not an HDF5 file?\n",
 		      indent1, file_path_ptr);
 
@@ -843,7 +843,7 @@ get_journaling_status(char * file_path_ptr,
 
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
 		     "%scan't get super block verison in %s -- file corrupt?\n",
                      indent1, file_path_ptr);
 
@@ -854,7 +854,7 @@ get_journaling_status(char * file_path_ptr,
                 HDfprintf(stdout, "%ssuper block version = %d.\n",
                           indent2, sb_version);
             }
-          
+
             *sb_version_ptr = sb_version;
 
             if ( ( sb_version == 0 ) || ( sb_version == 1 ) ) {
@@ -862,7 +862,7 @@ get_journaling_status(char * file_path_ptr,
                 success = FALSE;
                 *error_ptr = TRUE;
 
-                HDfprintf(err_file_ptr, 
+                HDfprintf(err_file_ptr,
                         "%sjournaling is not supported in the HDF5 file %s.\n",
                         indent1, file_path_ptr);
                 HDfprintf(err_file_ptr,
@@ -883,7 +883,7 @@ get_journaling_status(char * file_path_ptr,
                 HDfprintf(err_file_ptr,
                           "%sblock version.\n",
                           indent1);
-            } 
+            }
         }
     }
 
@@ -891,20 +891,20 @@ get_journaling_status(char * file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
 		      "%sreading offset and length sizes from super block...\n",
                       indent1);
         }
 
-        success = get_offset_and_length_size(fd, file_len, sb_offset, 
-                                             sb_version, &offset_size, 
+        success = get_offset_and_length_size(fd, file_len, sb_offset,
+                                             sb_version, &offset_size,
                                              &length_size);
 
         if ( ! success ) {
 
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%scan't get offset & length sizes from %s.\n",
                       indent1, file_path_ptr);
             HDfprintf(err_file_ptr, "%ssuper block corrupt?\n", indent1);
@@ -913,9 +913,9 @@ get_journaling_status(char * file_path_ptr,
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stdout, "%soffset_size = %d.\n", 
+                HDfprintf(stdout, "%soffset_size = %d.\n",
                           indent2, offset_size);
-                HDfprintf(stdout, "%slength_size = %d.\n", 
+                HDfprintf(stdout, "%slength_size = %d.\n",
                           indent2, length_size);
             }
         }
@@ -926,18 +926,18 @@ get_journaling_status(char * file_path_ptr,
         if ( sizeof(haddr_t) < (size_t)offset_size ) {
 
             /* we have a problem -- current definition of haddr_t is too
-             * small to represent offsets in the target hdf5 file.  Must 
+             * small to represent offsets in the target hdf5 file.  Must
              * abort.
              */
 
             success = FALSE;
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%sOffsets in %s are too big to fit in haddr_t.\n",
                       indent1, file_path_ptr);
 
-            HDfprintf(err_file_ptr, "%ssizeof(haddr_t) = %d.\n", 
+            HDfprintf(err_file_ptr, "%ssizeof(haddr_t) = %d.\n",
                       indent2, (int)(sizeof(haddr_t)));
 
         } else if ( offset_size > MAX_ADDR_SIZE ) {
@@ -945,11 +945,11 @@ get_journaling_status(char * file_path_ptr,
             success = FALSE;
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "Offsets in %s are too big for the address buffers in\n",
                       file_path_ptr);
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                      "this program.  Increase MAX_ADDR_SIZE and recompile.\n");
         }
     }
@@ -959,18 +959,18 @@ get_journaling_status(char * file_path_ptr,
         if ( sizeof(hsize_t) < (size_t)length_size ) {
 
             /* we have a problem -- current definition of hsize_t is too
-             * small to represent object lengths in the target hdf5 file.  
+             * small to represent object lengths in the target hdf5 file.
              * Must abort.
              */
 
             success = FALSE;
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%sLengths in %s are too big to fit in hsize_t.\n",
                       indent1, file_path_ptr);
 
-            HDfprintf(err_file_ptr, "%ssizeof(hsize_t) = %d.\n", 
+            HDfprintf(err_file_ptr, "%ssizeof(hsize_t) = %d.\n",
                       indent2, (int)(sizeof(hsize_t)));
 
         } else if ( length_size > MAX_LENGTH_SIZE ) {
@@ -978,11 +978,11 @@ get_journaling_status(char * file_path_ptr,
             success = FALSE;
             *error_ptr = TRUE;
 
-            HDfprintf(stderr, 
+            HDfprintf(stderr,
                       "Lengths in %s are too big for the length buffers in\n",
                       file_path_ptr);
 
-            HDfprintf(stderr, 
+            HDfprintf(stderr,
                    "this program.  Increase MAX_LENGTH_SIZE and recompile.\n");
         }
     }
@@ -994,7 +994,7 @@ get_journaling_status(char * file_path_ptr,
             HDfprintf(stdout, "%scomputing eoa addr and offset...\n", indent1);
         }
 
-        switch ( sb_version ) 
+        switch ( sb_version )
         {
             case 2:
                 eoa_addr = (haddr_t)(12 + (2 * offset_size));
@@ -1002,9 +1002,9 @@ get_journaling_status(char * file_path_ptr,
 
                 if ( verbosity > 0 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
 			      "%seoa_addr = 0x%llx\n%seoa_offset = 0x%llx\n",
-                              indent2, (long long)eoa_addr, 
+                              indent2, (long long)eoa_addr,
                               indent2, (long long)eoa_offset);
                 }
                 break;
@@ -1028,7 +1028,7 @@ get_journaling_status(char * file_path_ptr,
 
         }
 
-        success = get_sb_base_addr(fd, file_len, sb_offset, sb_version, 
+        success = get_sb_base_addr(fd, file_len, sb_offset, sb_version,
                                    offset_size, &base_addr);
 
         if ( ! success ) {
@@ -1059,14 +1059,14 @@ get_journaling_status(char * file_path_ptr,
                       indent1);
         }
 
-        success = get_sb_extension_addr(fd, file_len, sb_offset, sb_version, 
+        success = get_sb_extension_addr(fd, file_len, sb_offset, sb_version,
                                         offset_size, &sb_ext_addr);
 
         if ( ! success ) {
 
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
 	 	      "%scan't read SB extension addr from %s.\n",
                       indent1, file_path_ptr);
 
@@ -1084,7 +1084,7 @@ get_journaling_status(char * file_path_ptr,
 
                 success = FALSE;
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                           "%sThe file %s has no super block extension.\n",
                            indent1, file_path_ptr);
                 HDfprintf(stdout, "%s%s %s\n", indent1,
@@ -1098,19 +1098,19 @@ get_journaling_status(char * file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "%sreading SB extension object header version...\n",
                       indent1);
         }
 
-        success = get_sb_ext_obj_hdr_ver(fd, file_len, base_addr, 
+        success = get_sb_ext_obj_hdr_ver(fd, file_len, base_addr,
                                          sb_ext_addr, &ohdr_version);
 
         if ( ! success ) {
 
             *error_ptr = TRUE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%scan't read SB extension ohdr ver from %s\n",
                       indent1, file_path_ptr);
 
@@ -1121,7 +1121,7 @@ get_journaling_status(char * file_path_ptr,
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stdout, "%sobject header version = %d.\n", 
+                HDfprintf(stdout, "%sobject header version = %d.\n",
                           indent2, ohdr_version);
             }
 
@@ -1147,13 +1147,13 @@ get_journaling_status(char * file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
 		    "%sscanning SB extension for metadata journaling msg...\n",
                     indent1);
         }
 
         success = get_mdj_msg_addr(fd, file_len, ohdr_version, offset_size,
-                                   length_size, base_addr, sb_ext_addr, 
+                                   length_size, base_addr, sb_ext_addr,
                                    &mdj_msg_addr, examine, verbosity);
 
         if ( ! success ) {
@@ -1164,31 +1164,31 @@ get_journaling_status(char * file_path_ptr,
 
                 HDfprintf(stderr, "%s: get_mdj_msg_addr() reports an error.\n",
                           fcn_name);
-            } 
+            }
         } else {
 
             if ( ( verbosity > 0 ) && ( mdj_msg_addr != HADDR_UNDEF ) ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
 			  "%smetadata journaling msg addr = 0x%llx\n",
                           indent2, (unsigned long long)mdj_msg_addr);
             }
 
             if ( mdj_msg_addr == HADDR_UNDEF ) {
 
-		/* the metadata journaling message doesn't exist -- this 
+		/* the metadata journaling message doesn't exist -- this
                  * implies that metadata journaling is not enabled and that
 		 * it is therefore impossible to run a journal.
                  *
                  * Issue a message to this effect and set success to FALSE.
-                 * 
-                 * Note that this is not an error, so we don't set 
+                 *
+                 * Note that this is not an error, so we don't set
                  * *error_ptr to TRUE.
                  */
 
 		success = FALSE;
-            
-                HDfprintf(stdout, 
+
+                HDfprintf(stdout,
 		          "%sno metadata journaling message found in %s.\n",
                           indent1, file_path_ptr);
                 HDfprintf(stdout, "%s%s %s\n", indent1,
@@ -1206,16 +1206,16 @@ get_journaling_status(char * file_path_ptr,
                       indent1);
         }
 
-        success = 
-	    get_mdj_msg_data(fd, file_len, base_addr, mdj_msg_addr, 
-                             &journaling_enabled, &magic, jnl_file_name, 
+        success =
+	    get_mdj_msg_data(fd, file_len, base_addr, mdj_msg_addr,
+                             &journaling_enabled, &magic, jnl_file_name,
                              examine, verbosity);
 
         if ( ! success ) {
 
             *error_ptr = TRUE;
-            
-            HDfprintf(err_file_ptr, 
+
+            HDfprintf(err_file_ptr,
                       "%sCan't read metadata journal msg data from %s.\n",
                       indent1, file_path_ptr);
         }
@@ -1225,7 +1225,7 @@ get_journaling_status(char * file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "%sattempting to close %s...\n", 
+            HDfprintf(stdout, "%sattempting to close %s...\n",
                       indent1, file_path_ptr);
         }
 
@@ -1242,7 +1242,7 @@ get_journaling_status(char * file_path_ptr,
 
     if ( success ) {
 
-        /* copy relevant data into the locations pointed to by the 
+        /* copy relevant data into the locations pointed to by the
          * supplied parameters.
          */
         if ( journaling_enabled ) {
@@ -1257,21 +1257,21 @@ get_journaling_status(char * file_path_ptr,
 
             if ( examine ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                           "%s%s was journaled and not closed properly.\n",
                           indent1, file_path_ptr);
                 HDfprintf(stdout, "%s%s %s\n",
                           indent1,
 		          "It is probably corrupt, and it cannot be",
                           "opened by the HDF5 library.");
-                HDfprintf(stdout, "%sjournaling enabled = %d\n", 
+                HDfprintf(stdout, "%sjournaling enabled = %d\n",
                           indent2, (int)journaling_enabled);
-                HDfprintf(stdout, "%smagic = 0x%lx\n", 
+                HDfprintf(stdout, "%smagic = 0x%lx\n",
                           indent2, (unsigned long)magic);
                 HDfprintf(stdout, "%sjournal file name = \"%s\".\n",
                           indent2, jnl_file_name);
             }
-        } else { 
+        } else {
 
             /* nothing to do -- set success to FALSE */
             success = FALSE;
@@ -1297,7 +1297,7 @@ get_journaling_status(char * file_path_ptr,
  *		in *file_len_ptr, and return TRUE.
  *
  *		If the file does not exist, or if the function fails
- *		for any other reason, *file_len_ptr is undefined, and 
+ *		for any other reason, *file_len_ptr is undefined, and
  *		the function returns FALSE.
  *
  * Return:	Success: TRUE
@@ -1306,7 +1306,7 @@ get_journaling_status(char * file_path_ptr,
  * Programmer:	JRM -- 2/24/09
  *
  * Changes:	None.
- *		
+ *
  *
  **************************************************************************/
 
@@ -1332,8 +1332,8 @@ get_file_len(char * file_path_ptr,
             success = FALSE;
 
             if ( verbose ) {
-            
-                HDfprintf(stderr, "%s: Can't stat %s.\n", 
+
+                HDfprintf(stderr, "%s: Can't stat %s.\n",
                           fcn_name, file_path_ptr);
             }
         } else {
@@ -1353,17 +1353,17 @@ get_file_len(char * file_path_ptr,
  * Function:	get_mdj_msg_addr
  *
  * Purpose:	Given the base address of the HDF5 file and the relative
- *		address of the object header containing the super block 
- *		extension messages, try to find the address of the metadata 
- *		journaling message if it exists.  
+ *		address of the object header containing the super block
+ *		extension messages, try to find the address of the metadata
+ *		journaling message if it exists.
  *
  *		If it exists, set *mdj_msg_addr_ptr to the relative address
  *		of the message in the file, and return TRUE.
  *
- *		It it does not, set *mdj_msg_addr_ptr to HADDR_UNDEF and 
+ *		It it does not, set *mdj_msg_addr_ptr to HADDR_UNDEF and
  *		return TRUE.
  *
- *		If any errors are detected, return FALSE.  
+ *		If any errors are detected, return FALSE.
  *              In this case, *mdj_msg_addr_ptr is undefined.
  *
  * Return:	Success: TRUE if no errors are detected.
@@ -1378,7 +1378,7 @@ get_file_len(char * file_path_ptr,
  *
  *		JRM -- 3/19/09
  *		Added the verbosity parameter and associated code.  It
- *		doesn't change the execution, but it does control the 
+ *		doesn't change the execution, but it does control the
  *		amount of comentary generated.
  *
  **************************************************************************/
@@ -1407,7 +1407,7 @@ get_mdj_msg_addr(int fd,
     uint8_t flags;
     int msg_count = 0;
     uint16_t num_hdr_msgs;		/* version 1 header only */
-    uint32_t junk;    
+    uint32_t junk;
     uint32_t ohdr_size;			/* version 1 header only */
     uint64_t chunk_0_size;
     int size_of_chunk_0_size;		/* version 2 header only */
@@ -1416,7 +1416,7 @@ get_mdj_msg_addr(int fd,
     off_t offset;
     FILE * err_file_ptr = stderr;
 
-    if ( ( fd < 0 )  || 
+    if ( ( fd < 0 )  ||
          ( ( ohdr_ver != 1 ) && ( ohdr_ver != 2 ) ) ||
          ( mdj_msg_addr_ptr == NULL ) ) {
 
@@ -1452,12 +1452,12 @@ get_mdj_msg_addr(int fd,
                 /* set the offset to point to the number of messages */
                 offset = (off_t)(base_addr + sb_ext_addr + 2);
 
-                success = load_buf_from_file(fd, file_len, offset, (size_t)10, 
+                success = load_buf_from_file(fd, file_len, offset, (size_t)10,
                                              buf, verbosity, fcn_name, NULL);
 
                 if ( ! success ) {
 
-                    HDfprintf(err_file_ptr, 
+                    HDfprintf(err_file_ptr,
 		      "%scan't load section of ohdr -- file corruption?\n",
                       indent1);
                 }
@@ -1471,7 +1471,7 @@ get_mdj_msg_addr(int fd,
                 UINT32DECODE(p, ohdr_size);
 
                 if ( verbosity > 0 ) {
-                
+
                     HDfprintf(stdout, "%snum hdr msgs = %d.\n",
 			      indent2, (int)num_hdr_msgs);
 		    HDfprintf(stdout, "%schunk 0 base addr = 0x%llx.\n",
@@ -1513,7 +1513,7 @@ get_mdj_msg_addr(int fd,
 
                 offset = (off_t)(base_addr + sb_ext_addr + 5);
 
-                success = load_buf_from_file(fd, file_len, offset, (size_t)1, 
+                success = load_buf_from_file(fd, file_len, offset, (size_t)1,
                                              &flags, verbosity, fcn_name,
                                              NULL);
             }
@@ -1616,8 +1616,8 @@ get_mdj_msg_addr(int fd,
 		    offset += (off_t)4;
                 }
 
-                success = load_buf_from_file(fd, file_len, offset, 
-                                             (size_t)size_of_chunk_0_size, 
+                success = load_buf_from_file(fd, file_len, offset,
+                                             (size_t)size_of_chunk_0_size,
                                               buf, verbosity, fcn_name, NULL);
             }
 
@@ -1674,12 +1674,12 @@ get_mdj_msg_addr(int fd,
                 if ( size_of_chunk_0_size > addr_size ) {
 
                     success = FALSE;
-                    HDfprintf(err_file_ptr, 
+                    HDfprintf(err_file_ptr,
                               "%s%s %s\n",
                               indent1,
                               "size of chunk 0 size larger than file"
                               "address size!?!");
-                    HDfprintf(err_file_ptr, 
+                    HDfprintf(err_file_ptr,
                               "%ssize_of_chunk_0_size = %d > addr_size = %d.\n",
                               indent1, size_of_chunk_0_size, addr_size);
 
@@ -1729,7 +1729,7 @@ get_mdj_msg_addr(int fd,
             break;
 
         default:
-	    HDfprintf(stderr, "%s: ohdr_ver = %d out of range.\n", 
+	    HDfprintf(stderr, "%s: ohdr_ver = %d out of range.\n",
                       fcn_name, ohdr_ver);
             break;
     }
@@ -1748,16 +1748,16 @@ get_mdj_msg_addr(int fd,
  *
  * Function:	get_mdj_msg_addr__scan_chunk()
  *
- * Purpose:	Given the address of a chunk of messages associated with 
+ * Purpose:	Given the address of a chunk of messages associated with
  *		the object header containing the super block extension
- *		of the supplied file, scan the chunk for a metadata 
- *		journaling message, and return its address in 
+ *		of the supplied file, scan the chunk for a metadata
+ *		journaling message, and return its address in
  *		*mdj_msg_addr_ptr if one is found.
  *
  *		*mdj_msg_addr_ptr is undefined if no metadata journaling
  *		message is found.
  *
- *		If any errors are detected, return FALSE.  
+ *		If any errors are detected, return FALSE.
  *              In this case, *mdj_msg_addr_ptr is undefined.
  *
  * Return:	Success: TRUE if no errors are detected.
@@ -1772,7 +1772,7 @@ get_mdj_msg_addr(int fd,
  *
  *		JRM -- 3/19/09
  *		Added the verbosity parameter and associated code.  It
- *		doesn't change the execution, but it does control the 
+ *		doesn't change the execution, but it does control the
  *		amount of comentary generated.
  *
  **************************************************************************/
@@ -1791,7 +1791,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
                              haddr_t chunk_addr,
                              haddr_t chunk_size,
                              haddr_t * mdj_msg_addr_ptr,
-                             hbool_t examine, 
+                             hbool_t examine,
                              unsigned verbosity)
 {
     const char * fcn_name = "get_mdj_msg_addr__scan_chunk()";
@@ -1818,9 +1818,9 @@ get_mdj_msg_addr__scan_chunk(int fd,
     /* make sure the buffer is big enough */
     HDassert( (MAX_ADDR_SIZE + MAX_LENGTH_SIZE) <= 64 );
 
-    if ( ( fd < 0 )  || 
+    if ( ( fd < 0 )  ||
          ( ( ohdr_ver != 1 ) && ( ohdr_ver != 2 ) ) ||
-         ( mdj_msg_addr_ptr == NULL ) || 
+         ( mdj_msg_addr_ptr == NULL ) ||
          ( *mdj_msg_addr_ptr != HADDR_UNDEF ) ) {
 
         success = FALSE;
@@ -1843,7 +1843,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "%sscanning SB ext chunk %d.\n", 
+            HDfprintf(stdout, "%sscanning SB ext chunk %d.\n",
                       indent1, chunk_num);
         }
 
@@ -1864,22 +1864,22 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
                 }
 
-                if ( chunk_num != 0 ) { 
+                if ( chunk_num != 0 ) {
                     /* continuation chunk -- check signature */
 
                     signature_size = H5O_SIZEOF_MAGIC;
 
                     offset = (off_t)(base_addr + chunk_addr);
 
-                    success = load_buf_from_file(fd, file_len, offset, 
-                                                 (size_t)H5O_SIZEOF_MAGIC, 
-                                                 buf, verbosity, fcn_name, 
+                    success = load_buf_from_file(fd, file_len, offset,
+                                                 (size_t)H5O_SIZEOF_MAGIC,
+                                                 buf, verbosity, fcn_name,
                                                  NULL);
 
                     if ( success ) {
 
-                        if ( HDmemcmp(buf, 
-                                      H5O_CHK_MAGIC, 
+                        if ( HDmemcmp(buf,
+                                      H5O_CHK_MAGIC,
                                       (size_t)H5O_SIZEOF_MAGIC) != 0 ) {
 
                             success = FALSE;
@@ -1892,7 +1892,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
                                        "file corruption?");
                         } else if ( verbosity > 1 ) {
 
-                            HDfprintf(stdout, 
+                            HDfprintf(stdout,
                                       "%sContinuation message signature OK.\n",
                                       indent2);
                         }
@@ -1908,14 +1908,14 @@ get_mdj_msg_addr__scan_chunk(int fd,
     }
 
     /* scan the messages */
-    while ( ( success ) && 
+    while ( ( success ) &&
             ( cum_msg_size < chunk_size ) ) {
 
         msg_addr = chunk_addr + signature_size + cum_msg_size;
 
         if ( verbosity > 1 ) {
 
-            HDfprintf(stdout, "%schunk_size = 0x%llx\n", 
+            HDfprintf(stdout, "%schunk_size = 0x%llx\n",
                       indent2, (unsigned long long)chunk_size);
             HDfprintf(stdout, "%scum_msg_size = 0x%llx\n",
                       indent2, (unsigned long long)cum_msg_size);
@@ -1925,8 +1925,8 @@ get_mdj_msg_addr__scan_chunk(int fd,
         offset = (off_t)(base_addr + msg_addr);
 
         /* load the message type, size, flags, and possibly creation order */
-        success = load_buf_from_file(fd, file_len, offset, 
-                                     (size_t)msg_hdr_size, 
+        success = load_buf_from_file(fd, file_len, offset,
+                                     (size_t)msg_hdr_size,
                                      buf, verbosity, fcn_name, NULL);
 
         if ( success ) {
@@ -1949,7 +1949,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
                 default: /* keeping the compiler happy -- this can't happen */
                     success = FALSE;
-                    HDfprintf(stderr, "%s: reached the unreachable.\n", 
+                    HDfprintf(stderr, "%s: reached the unreachable.\n",
                     fcn_name);
                     break;
             }
@@ -1957,9 +1957,9 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
         if ( ( success ) && ( verbosity > 1 ) ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "%smsg: %d  type = %d  dsize = %d flags = 0x%x\n",
-                      indent2, *msg_count_ptr, (int)msg_type_num, 
+                      indent2, *msg_count_ptr, (int)msg_type_num,
                       (int)msg_data_size, (unsigned)flags);
         }
 
@@ -1967,13 +1967,13 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
         if ( success ) {
 
-            switch ( msg_type_num ) 
+            switch ( msg_type_num )
             {
 
-                case H5O_MDJ_MSG_ID: 
+                case H5O_MDJ_MSG_ID:
                     if ( verbosity > 0 ) {
 
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
 				  "%sfound journaling message at 0x%llx\n",
                                   indent1,
                                   (unsigned long long)msg_data_addr);
@@ -1985,7 +1985,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
                     } else {
 
-                        /* found a duplicate metadata journaling 
+                        /* found a duplicate metadata journaling
                          * message -- scream and die.
                          */
 
@@ -2009,7 +2009,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
                 case H5O_SHMESG_ID:
                 case H5O_BTREEK_ID:
 		case H5O_DRVINFO_ID:
-                    /* These messages are allowed in superblock 
+                    /* These messages are allowed in superblock
 		     * extension messages -- just skip over them.
                      */
 		    break;
@@ -2020,20 +2020,20 @@ get_mdj_msg_addr__scan_chunk(int fd,
                      */
                     if ( verbosity > 0 ) {
 
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                  "%dfound continuation msg -- chunk %d\n",
                                  indent1,
                                  chunk_num + 1);
                     }
 
-                    success = load_buf_from_file(fd, file_len, offset, 
-                                         (size_t)(addr_size + length_size + 1), 
+                    success = load_buf_from_file(fd, file_len, offset,
+                                         (size_t)(addr_size + length_size + 1),
                                          buf, verbosity, fcn_name, NULL);
 
                     if ( success ) {
 
                         address_decode((size_t)addr_size, &p, &new_chunk_addr);
- 
+
                         if ( p != &(buf[addr_size]) ) {
 
                             success = FALSE;
@@ -2051,7 +2051,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
                     if ( success ) {
 
                         length_decode((size_t)length_size, &p, &new_chunk_len);
- 
+
                         if ( p != &(buf[addr_size + length_size]) ) {
 
                             success = FALSE;
@@ -2065,7 +2065,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
                             }
                         }
                     }
-                    
+
                     if ( ( success ) && ( verbosity > 0 ) ) {
 
                         HDfprintf(stdout, "%schunk %d addr = 0x%llx\n",
@@ -2119,12 +2119,12 @@ get_mdj_msg_addr__scan_chunk(int fd,
                 case H5O_MTIME_NEW_ID:
                 case H5O_AINFO_ID:
                 case H5O_REFCOUNT_ID:
-                    /* these messages clearly shouldn't be in 
+                    /* these messages clearly shouldn't be in
                      * the superblock extension -- scream and die.
                      */
                     success = FALSE;
 
-                    HDfprintf(err_file_ptr, 
+                    HDfprintf(err_file_ptr,
                             "%sSB ext chunk %d contains a dis-allowed mssg.\n",
                             indent1, chunk_num);
                     HDfprintf(stdout, "%sprobably a bug in library\n", indent1);
@@ -2153,7 +2153,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
 
                     success = FALSE;
 
-                    HDfprintf(err_file_ptr, 
+                    HDfprintf(err_file_ptr,
 			      "%sfound gap in SB ext chunk with null msg.\n",
                               indent1);
                     HDfprintf(err_file_ptr, "%slibrary bug?.\n", indent1);
@@ -2164,13 +2164,13 @@ get_mdj_msg_addr__scan_chunk(int fd,
         }
 
         /* check for too many messages -- version 1 ohdr only */
-        if ( ( success ) && 
+        if ( ( success ) &&
              ( ohdr_ver == 1 ) &&
              ( *msg_count_ptr > num_hdr_msgs ) ) {
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%sSB extension has too many messages.\n",
                       indent1);
             HDfprintf(err_file_ptr, "%slibrary bug?.\n", indent1);
@@ -2201,17 +2201,17 @@ get_mdj_msg_addr__scan_chunk(int fd,
  *		address of the metadata journaling super block extension
  *		message, read the message, copy its contents into the
  *		locations indicated by the enabled_ptr, magic_ptr, and
- *		jnl_file_name parameters, and return TRUE.  
+ *		jnl_file_name parameters, and return TRUE.
  *
  *		Note that only * enabled_ptr is defined if journaling is
  *		not enabled.
- * 
- *		Note also that jnl_file_name is presumed to point to a 
- *		buffer of char of length at least 
+ *
+ *		Note also that jnl_file_name is presumed to point to a
+ *		buffer of char of length at least
  *		H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1.
  *
- *		If any errors are detected, return FALSE.  
- *              In this case, *enabled_ptr, *magic_ptr and the 
+ *		If any errors are detected, return FALSE.
+ *              In this case, *enabled_ptr, *magic_ptr and the
  *		contents of jnl_file_name are undefined.
  *
  * Return:	Success: TRUE if no errors are detected.
@@ -2226,7 +2226,7 @@ get_mdj_msg_addr__scan_chunk(int fd,
  *
  *		JRM -- 3/19/09
  *		Added the verbosity parameter and associated code.  It
- *		doesn't change the execution, but it does control the 
+ *		doesn't change the execution, but it does control the
  *		amount of comentary generated.
  *
  **************************************************************************/
@@ -2263,7 +2263,7 @@ get_mdj_msg_data(int fd,
     off_t offset;
     FILE * err_file_ptr = stderr;
 
-    if ( ( fd < 0 ) || 
+    if ( ( fd < 0 ) ||
          ( enabled_ptr == NULL ) ||
          ( magic_ptr == NULL ) ||
          ( jnl_file_name == NULL ) ) {
@@ -2295,8 +2295,8 @@ get_mdj_msg_data(int fd,
 
         offset = (off_t)(base_addr + mdj_msg_addr);
 
-        success = load_buf_from_file(fd, file_len, offset, 
-                                     (size_t)MDJ_MSG_HDR_LEN, 
+        success = load_buf_from_file(fd, file_len, offset,
+                                     (size_t)MDJ_MSG_HDR_LEN,
                                      buf, verbosity, fcn_name, NULL);
     }
 
@@ -2332,30 +2332,30 @@ get_mdj_msg_data(int fd,
 
         if ( (flags & MDJ_MSG__JOURNALING_ENABLED_FLAG) == 0 ) {
 
-            /* journaling is disabled -- this case shouldn't occur so we 
+            /* journaling is disabled -- this case shouldn't occur so we
              * we will print a warning.
              */
             journaling_enabled = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%s%s %s\n",
                       indent1,
                       "Found a metadata journaling message saying that",
             	      "journaling is disabled.");
 
         } else {
-       
+
             journaling_enabled = TRUE;
 
             if ( verbosity > 0 ) {
 
                 HDfprintf(stdout, "%sjournaling enabled = TRUE\n", indent2);
                 HDfprintf(stdout, "%smagic = 0x%x\n", indent2, (unsigned)magic);
-                HDfprintf(stdout, "%sjournal file path len = %d\n", 
+                HDfprintf(stdout, "%sjournal file path len = %d\n",
                           indent2, (int)path_len);
             }
 
-            if ( ( path_len <= 0 ) || 
+            if ( ( path_len <= 0 ) ||
                  ( path_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) ) {
 
                 success = FALSE;
@@ -2363,7 +2363,7 @@ get_mdj_msg_data(int fd,
                 HDfprintf(err_file_ptr, "%s%s %s (%d).\n",
                           indent1,
                           "Encountered metadata journaling message with",
-                          "path len our of range", 
+                          "path len our of range",
                           path_len);
             }
         }
@@ -2373,8 +2373,8 @@ get_mdj_msg_data(int fd,
 
         offset = (off_t)(base_addr + mdj_msg_addr + MDJ_MSG_HDR_LEN);
 
-        success = load_buf_from_file(fd, file_len, offset, 
-                                     (size_t)(path_len + 1), 
+        success = load_buf_from_file(fd, file_len, offset,
+                                     (size_t)(path_len + 1),
                                      buf, verbosity, fcn_name, NULL);
     }
 
@@ -2384,9 +2384,9 @@ get_mdj_msg_data(int fd,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "Encountered metadata journaling message with\n");
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "path_len not matching actual path len.\n");
         }
     }
@@ -2420,14 +2420,14 @@ get_mdj_msg_data(int fd,
  * Function:	get_offset_and_length_size
  *
  * Purpose:	Obtain the number of bytes required to represent offsets
- *		and lengths in the target HDF5 file, load these values into 
+ *		and lengths in the target HDF5 file, load these values into
  *		*offset_size_ptr and *length_size_ptr, and return TRUE.
  *
- *		If the function fails for any other reason, 
- *		*offset_size_ptr is undefined, and the function 
+ *		If the function fails for any other reason,
+ *		*offset_size_ptr is undefined, and the function
  *		returns FALSE.
  *
- *		Note that at present, this function works only with 
+ *		Note that at present, this function works only with
  *		the HDF5 version 2 super block, as that is the only
  *		version (for now) that supports journaling.
  *
@@ -2456,8 +2456,8 @@ get_offset_and_length_size(int fd,
     int offset_size;
     int length_size;
 
-    if ( ( fd < 0 ) || 
-         ( (sb_offset % 512) != 0 ) || 
+    if ( ( fd < 0 ) ||
+         ( (sb_offset % 512) != 0 ) ||
          ( offset_size_ptr == NULL ) ||
          ( length_size_ptr == NULL ) ) {
 
@@ -2475,14 +2475,14 @@ get_offset_and_length_size(int fd,
 
         offset = sb_offset + H5F_SIGNATURE_LEN + 1;
 
-        if ( ! load_buf_from_file(fd, file_len, offset, (size_t)2, 
+        if ( ! load_buf_from_file(fd, file_len, offset, (size_t)2,
                                   buf, verbosity, fcn_name, NULL) ) {
 
             success = FALSE;
 
             if ( verbosity > 2 ) {
 
-                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n", 
+                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n",
                           fcn_name);
             }
         } else {
@@ -2540,11 +2540,11 @@ get_offset_and_length_size(int fd,
  * Function:	get_sb_extension_addr()
  *
  * Purpose:	Read the super block extension address from the supplied
- *		file using the given superblock offset, load that value 
+ *		file using the given superblock offset, load that value
  *		into *sb_ext_addr_ptr, and return TRUE.
  *
- *		If the function fails for any other reason, 
- *		*sb_ext_addr_ptr is undefined, and the function returns 
+ *		If the function fails for any other reason,
+ *		*sb_ext_addr_ptr is undefined, and the function returns
  *		FALSE.
  *
  * Return:	Success: TRUE
@@ -2572,8 +2572,8 @@ get_sb_extension_addr(int fd,
     off_t sb_ext_offset;
     haddr_t sb_ext_addr;
 
-    if ( ( fd < 0 ) || 
-         ( (sb_offset % 512) != 0 ) || 
+    if ( ( fd < 0 ) ||
+         ( (sb_offset % 512) != 0 ) ||
          ( offset_size <= 0 ) ||
          ( sizeof(haddr_t) > (size_t)offset_size ) ||
          ( offset_size > MAX_ADDR_SIZE ) ||
@@ -2593,28 +2593,28 @@ get_sb_extension_addr(int fd,
 
         sb_ext_offset = sb_offset + H5F_SIGNATURE_LEN + 4 + offset_size;
 
-        if ( ! load_buf_from_file(fd, file_len, sb_ext_offset, 
-                                  (size_t)offset_size, addr_buf, 
+        if ( ! load_buf_from_file(fd, file_len, sb_ext_offset,
+                                  (size_t)offset_size, addr_buf,
                                   verbosity, fcn_name, NULL) ) {
 
             success = FALSE;
 
             if ( verbosity > 2 ) {
 
-                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n", 
+                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n",
                           fcn_name);
             }
         } else {
 
             address_decode(sizeof(haddr_t), &buf_ptr, &sb_ext_addr);
- 
+
 	    if ( buf_ptr != &(addr_buf[offset_size]) ) {
 
                 success = FALSE;
 
                 if ( verbosity > 2 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                             "%s: Unexpected buf_ptr after address_decode().\n",
                             fcn_name);
                 }
@@ -2636,9 +2636,9 @@ get_sb_extension_addr(int fd,
  * Function:	get_sb_ext_obj_hdr_ver()
  *
  * Purpose:	Given the supplied HDF5 file base address and super block
- *		extension relative address, attempt to determin the 
- *		version of object header being used to store the super 
- *		block extension messages, and return this value in 
+ *		extension relative address, attempt to determin the
+ *		version of object header being used to store the super
+ *		block extension messages, and return this value in
  *		*obj_hdr_type_ptr.
  *
  *		If successful, return TRUE.  On failure for any reason,
@@ -2661,7 +2661,7 @@ get_sb_ext_obj_hdr_ver(int fd,
                        int * ohdr_ver_ptr)
 {
     const char * fcn_name = "get_sb_ext_obj_hdr_ver()";
-    /* the buffer must be large enough for the object header magic and 
+    /* the buffer must be large enough for the object header magic and
      * its version -- note that version 1 doesn't have magic.
      */
     uint8_t buf[H5O_SIZEOF_MAGIC + 2];
@@ -2670,7 +2670,7 @@ get_sb_ext_obj_hdr_ver(int fd,
     int ohdr_ver;
     off_t ohdr_offset;
 
-    if ( ( fd < 0 ) || 
+    if ( ( fd < 0 ) ||
          ( ohdr_ver_ptr == NULL ) ) {
 
         success = FALSE;
@@ -2681,8 +2681,8 @@ get_sb_ext_obj_hdr_ver(int fd,
 
     if ( success ) {
 
-        if ( ! load_buf_from_file(fd, file_len, ohdr_offset, 
-                                  (size_t)(H5O_SIZEOF_MAGIC + 1), buf, 
+        if ( ! load_buf_from_file(fd, file_len, ohdr_offset,
+                                  (size_t)(H5O_SIZEOF_MAGIC + 1), buf,
                                   verbosity, fcn_name, NULL) ) {
 
             success = FALSE;
@@ -2701,8 +2701,8 @@ get_sb_ext_obj_hdr_ver(int fd,
 
             ohdr_ver = 1;
 
-        } else if ( HDmemcmp(buf, 
-                             H5O_HDR_MAGIC, 
+        } else if ( HDmemcmp(buf,
+                             H5O_HDR_MAGIC,
                              (size_t)H5O_SIZEOF_MAGIC) == 0 ) {
 
             ohdr_ver = (int)(buf[H5O_SIZEOF_MAGIC]);
@@ -2713,13 +2713,13 @@ get_sb_ext_obj_hdr_ver(int fd,
 
             if ( verbosity > 2 ) {
 
-                HDfprintf(stderr, 
+                HDfprintf(stderr,
                           "%s: sb_ext_addr doesn't seem to reference\n",
                           fcn_name);
                 HDfprintf(stderr, "	an object header.\n");
-                HDfprintf(stderr, "	base_addr = 0x%llx\n", 
+                HDfprintf(stderr, "	base_addr = 0x%llx\n",
                           (unsigned long long)base_addr);
-                HDfprintf(stderr, "	sb_ext_addr = 0x%llx\n", 
+                HDfprintf(stderr, "	sb_ext_addr = 0x%llx\n",
                           (unsigned long long)sb_ext_addr);
             }
         }
@@ -2744,11 +2744,11 @@ get_sb_ext_obj_hdr_ver(int fd,
  *
  * Function:	get_sb_version
  *
- * Purpose:	Read the super block version from the supplied file with 
- *		the given superblock offset, load that value into 
+ * Purpose:	Read the super block version from the supplied file with
+ *		the given superblock offset, load that value into
  *		*sb_ver_ptr, and return TRUE.
  *
- *		If the function fails for any other reason, *sb_ver_ptr 
+ *		If the function fails for any other reason, *sb_ver_ptr
  *		is undefined, and the function returns FALSE.
  *
  * Return:	Success: TRUE
@@ -2773,8 +2773,8 @@ get_sb_version(int fd,
     off_t version_offset;
     int version;
 
-    if ( ( fd < 0 ) || 
-         ( (sb_offset % 512) != 0 ) || 
+    if ( ( fd < 0 ) ||
+         ( (sb_offset % 512) != 0 ) ||
          ( sb_ver_ptr == NULL ) ) {
 
         success = FALSE;
@@ -2785,15 +2785,15 @@ get_sb_version(int fd,
 
         version_offset = sb_offset + H5F_SIGNATURE_LEN;
 
-        if ( ! load_buf_from_file(fd, file_len, version_offset, 
-                                  (size_t)1, &ver_buf, 
+        if ( ! load_buf_from_file(fd, file_len, version_offset,
+                                  (size_t)1, &ver_buf,
                                   verbosity, fcn_name, NULL) ) {
 
             success = FALSE;
 
             if ( verbosity > 2 ) {
 
-                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n", 
+                HDfprintf(stderr, "%s: load_buf_from_file() failed.\n",
                           fcn_name);
             }
         } else {
@@ -2822,7 +2822,7 @@ get_sb_version(int fd,
  *
  * Function:	load_buf_from_file()
  *
- * Purpose:	Seek to the specified location in the supplied file and 
+ * Purpose:	Seek to the specified location in the supplied file and
  *		then read the indicated number of bytes into the supplied
  *		buffer.
  *
@@ -2837,14 +2837,14 @@ get_sb_version(int fd,
  *
  * Programmer:	JRM -- 2/26/09
  *
- * Changes:	Added io_err_ptr parameter.  If defined (i.e. eof_ptr 
- *		isn't NULL), this parameter allows the function to 
- *		inform the caller that the failure was caused by an 
+ * Changes:	Added io_err_ptr parameter.  If defined (i.e. eof_ptr
+ *		isn't NULL), this parameter allows the function to
+ *		inform the caller that the failure was caused by an
  *		attempt to read beyond the end of file.
  *
  *		This is necessary, as when scanning the journal file,
  *		we will typically find it to be incomplete, and we need
- *		to distinguish between an eof error, and a system or 
+ *		to distinguish between an eof error, and a system or
  *		file I/O error.
  *						JRM -- 5/22/09
  *
@@ -2864,7 +2864,7 @@ load_buf_from_file(int fd,
     hbool_t success = TRUE;
     ssize_t result;
 
-    if ( ( fd < 0 ) || 
+    if ( ( fd < 0 ) ||
          ( file_len <= 0 ) ||
          ( buf_len <= 0 ) ||
          ( buf_ptr == NULL ) ||
@@ -2896,9 +2896,9 @@ load_buf_from_file(int fd,
 
             if ( verbosity > 2 ) {
 
-                HDfprintf(stderr, 
+                HDfprintf(stderr,
                         "%s:%s: lseek() to 0x%llx failed with errno %d(%s).\n",
-                        fcn_name, 
+                        fcn_name,
                         desc,
                         (unsigned long long)offset,
                         errno,
@@ -2936,7 +2936,7 @@ load_buf_from_file(int fd,
                      (int)result,
                      (int)buf_len);
                 }
-            } 
+            }
         }
     }
 
@@ -2961,14 +2961,14 @@ load_buf_from_file(int fd,
  *		header information, and return this data to the caller
  *		in the indicated locations after closing the file.
  *
- *		If examine is TRUE, do this while maintaining a running 
+ *		If examine is TRUE, do this while maintaining a running
  *		commentary.
  *
  *		If successful, return TRUE.  On failure for any reason,
  *		return FALSE.
  *
  *		Note that the function assumes that target_file_name_ptr
- *		points to a string that is at least MAX_PATH_LEN + 1 
+ *		points to a string that is at least MAX_PATH_LEN + 1
  *		bytes long.
  *
  * Return:	Success: TRUE
@@ -2978,22 +2978,22 @@ load_buf_from_file(int fd,
  *
  * Changes:	JRM -- 3/19/09
  *		Added the verbosity parameter and associated code.  It
- *		doesn't change the execution, but it does control the 
+ *		doesn't change the execution, but it does control the
  *		amount and format of comentary generated.
  *
- *		Also added file_len parameter -- now we are guaranteed 
+ *		Also added file_len parameter -- now we are guaranteed
  *		that the file exists and has positive length on entry.
  *
  *		JRM -- 5/15/09
  *		Updated function to handle the extra fields that appear
  *		in the header when human_readable is false.  This included
  *		adding the offset_width_ptr and length_width_ptr fields.
- *		Note that *offset_width_ptr and *length_width_ptr are 
+ *		Note that *offset_width_ptr and *length_width_ptr are
  *		undefined if *human_readable_ptr is TRUE.
  *
  **************************************************************************/
 
-hbool_t 
+hbool_t
 get_jnl_header_info(char * file_path_ptr,
                     off_t file_len,
                     size_t * header_length_ptr,
@@ -3029,7 +3029,7 @@ get_jnl_header_info(char * file_path_ptr,
          ( human_readable_ptr == NULL ) ||
          ( offset_width_ptr == NULL ) ||
          ( length_width_ptr == NULL ) ) {
-    
+
         success = FALSE;
         HDfprintf(stderr, "%s: bad param(s) on entry.\n", fcn_name);
     }
@@ -3039,10 +3039,10 @@ get_jnl_header_info(char * file_path_ptr,
         indent1 = "\t";
         indent2 = "\t\t";
 
-        /* don't generate output to stderr during examing unless a major 
+        /* don't generate output to stderr during examing unless a major
          * error or a bug in the program is detected.
          */
-         
+
         err_file_ptr = stdout;
 
     }
@@ -3062,7 +3062,7 @@ get_jnl_header_info(char * file_path_ptr,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, "%sCan't open %s -- permissions?.\n", 
+            HDfprintf(err_file_ptr, "%sCan't open %s -- permissions?.\n",
                       indent1, file_path_ptr);
 
         } else {
@@ -3085,14 +3085,14 @@ get_jnl_header_info(char * file_path_ptr,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, "%sCan't read first line of %s.\n", 
+            HDfprintf(err_file_ptr, "%sCan't read first line of %s.\n",
                       indent1, file_path_ptr);
 
         } else if ( buf[0] != '0' ) {
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
 		      "%sbad first char of header -- not a journal file.\n",
                       indent1);
         } else {
@@ -3135,13 +3135,13 @@ get_jnl_header_info(char * file_path_ptr,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
-                      "%sunknown journal file version \"%s\"(%d).\n", 
+            HDfprintf(err_file_ptr,
+                      "%sunknown journal file version \"%s\"(%d).\n",
                       indent1, version_str, version);
 
         } else if ( verbosity > 0 ) {
-    
-            HDfprintf(stdout, "%sjournal file version = %d.\n", 
+
+            HDfprintf(stdout, "%sjournal file version = %d.\n",
                       indent2, version);
         }
     }
@@ -3172,7 +3172,7 @@ get_jnl_header_info(char * file_path_ptr,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                           "%starget file path exceeds MAX_PATH_LEN.\n",
                           indent1);
 
@@ -3181,8 +3181,8 @@ get_jnl_header_info(char * file_path_ptr,
             HDstrcpy(target_file_name, target_file_str);
 
             if ( verbosity > 0 ) {
-    
-                HDfprintf(stdout, "%starget file = \"%s\"\n", 
+
+                HDfprintf(stdout, "%starget file = \"%s\"\n",
                           indent2, target_file_name);
             }
         }
@@ -3226,7 +3226,7 @@ get_jnl_header_info(char * file_path_ptr,
             magic = (int32_t)tmp_magic;
 
             if ( verbosity > 0 ) {
-    
+
                 HDfprintf(stdout, "%smagic = 0x%x\n", indent2, magic);
             }
         }
@@ -3244,7 +3244,7 @@ get_jnl_header_info(char * file_path_ptr,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%sUnexpected journal creation date tag \"%s\".\n",
                       indent1, creation_date_tag );
 
@@ -3256,8 +3256,8 @@ get_jnl_header_info(char * file_path_ptr,
                       indent1);
 
         } else if ( verbosity > 0 ) {
-    
-            HDfprintf(stdout, "%screation date = %s\n", 
+
+            HDfprintf(stdout, "%screation date = %s\n",
                       indent2, creation_date_str);
         }
     }
@@ -3271,12 +3271,12 @@ get_jnl_header_info(char * file_path_ptr,
         human_readable_tag = HDstrtok(NULL, " ");
 
         if ( ( human_readable_tag == NULL ) ||
-             ( strcmp(human_readable_tag, H5C2_JNL__HUMAN_READABLE_TAG) 
+             ( strcmp(human_readable_tag, H5C2_JNL__HUMAN_READABLE_TAG)
                != 0 ) ) {
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%sUnexpected human readable tag \"%s\".\n",
                       indent1, human_readable_tag );
 
@@ -3286,14 +3286,14 @@ get_jnl_header_info(char * file_path_ptr,
 
             HDfprintf(err_file_ptr, "%sno human readable string in header.\n",
                       indent1);
- 
-        } else if ( ( (tmp_human_readable = 
+
+        } else if ( ( (tmp_human_readable =
                        HDstrtol(human_readable_str, NULL, 10)) == LONG_MIN ) ||
                     ( tmp_human_readable == LONG_MAX ) ) {
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%serror decoding human readable string: %d (%s)\n",
                       indent1, errno, strerror(errno));
 
@@ -3302,7 +3302,7 @@ get_jnl_header_info(char * file_path_ptr,
 
             success = FALSE;
 
-            HDfprintf(err_file_ptr, 
+            HDfprintf(err_file_ptr,
                       "%shuman readable value out of range (%ld).\n",
                       indent1, tmp_human_readable);
 
@@ -3311,8 +3311,8 @@ get_jnl_header_info(char * file_path_ptr,
             human_readable = (hbool_t)tmp_human_readable;
 
             if ( verbosity > 0 ) {
-    
-                HDfprintf(stdout, "%shuman readable = %d\n", 
+
+                HDfprintf(stdout, "%shuman readable = %d\n",
                           indent2, human_readable);
             }
         }
@@ -3365,7 +3365,7 @@ get_jnl_header_info(char * file_path_ptr,
             offset_width = (int)tmp_offset_width;
 
             if ( verbosity > 0 ) {
-    
+
                 HDfprintf(stdout, "%soffset width = %d\n", indent2, offset_width);
             }
         }
@@ -3418,7 +3418,7 @@ get_jnl_header_info(char * file_path_ptr,
             length_width = (int)tmp_length_width;
 
             if ( verbosity > 0 ) {
-    
+
                 HDfprintf(stdout, "%slength width = %d\n", indent2, length_width);
             }
         }
@@ -3434,7 +3434,7 @@ get_jnl_header_info(char * file_path_ptr,
 
         if ( HDfclose(file_ptr) != 0 ) {
 
-            HDfprintf(stderr, "%serror closing %s.\n", 
+            HDfprintf(stderr, "%serror closing %s.\n",
                       indent1, file_path_ptr);
 
         } else if ( verbosity > 0 ) {
@@ -3467,23 +3467,23 @@ get_jnl_header_info(char * file_path_ptr,
  *
  * Function:	scan_journal_file
  *
- * Purpose:	Scan the supplied journal file to determine whether it 
+ * Purpose:	Scan the supplied journal file to determine whether it
  *		contains any completed transactions.  If it does, also
  *		report the maximum address that appears in an eoa message,
- *		the size of the largest journal entry body, and the 
+ *		the size of the largest journal entry body, and the
  *		number of the last complete transaction.
  *
- *		The function assumes that the header has already been 
+ *		The function assumes that the header has already been
  *		examined, and that its length is in the header_length.
- *		If the journal file is binary, it also assumes that the 
- *		offset_width and length_width parameters contain the 
- *		widths of offsets and lengths in the binary journal file 
+ *		If the journal file is binary, it also assumes that the
+ *		offset_width and length_width parameters contain the
+ *		widths of offsets and lengths in the binary journal file
  *		(and also in the target HDF5 file).
  *
- *		The function also assumes that the journal file is 
+ *		The function also assumes that the journal file is
  *		closed on entry.
  *
- *		Note: While this function has been designed with both 
+ *		Note: While this function has been designed with both
  *		      human readable and binary journal files in mind,
  *		      in its first incarnation, it only supports binary
  *		      journal files.
@@ -3496,7 +3496,7 @@ get_jnl_header_info(char * file_path_ptr,
  *
  **************************************************************************/
 
-hbool_t 
+hbool_t
 scan_journal_file(char * file_path_ptr,
                   off_t file_len,
                   size_t header_length,
@@ -3523,7 +3523,7 @@ scan_journal_file(char * file_path_ptr,
     uint64_t max_trans_num = 0;
     off_t offset;
     off_t new_offset;
-    
+
 
     if ( ( file_path_ptr == NULL ) ||
          ( file_len <= 0 ) ||
@@ -3548,7 +3548,7 @@ scan_journal_file(char * file_path_ptr,
 
             body_buf_len = 0;
             proceed = FALSE;
-            HDfprintf(stderr, "%s: initial allocation of body buffer failed.\n", 
+            HDfprintf(stderr, "%s: initial allocation of body buffer failed.\n",
                       fcn_name);
         }
     }
@@ -3620,7 +3620,7 @@ scan_journal_file(char * file_path_ptr,
 
                 case JF__UNDEFINED_MSG:
                     proceed = FALSE;
-                    HDfprintf(stderr, 
+                    HDfprintf(stderr,
                               "%s: bjf__load_next_msg() returned undef msg?!?\n",
                               fcn_name);
 		    break;
@@ -3628,7 +3628,7 @@ scan_journal_file(char * file_path_ptr,
 		case JF__BEGIN_TRANS_MSG:
                     if ( trans_in_progress ) {
 
-                        /* At present, nested transaction are forbidden -- 
+                        /* At present, nested transaction are forbidden --
                          * scream and die if we encounter one.
                          */
 
@@ -3638,7 +3638,7 @@ scan_journal_file(char * file_path_ptr,
 
                     } else if ( trans_num != max_trans_num + 1 ) {
 
-                        /* we may decide to drop this invarient eventually, 
+                        /* we may decide to drop this invarient eventually,
                          * but we will check it for now, and scream and die
                          * if it fails.
                          */
@@ -3647,7 +3647,7 @@ scan_journal_file(char * file_path_ptr,
                            "Encountered out of sequence transaction in journal");
 
                     } else {
-                    
+
                         trans_in_progress = TRUE;
                         cur_trans_num = trans_num;
 
@@ -3661,13 +3661,13 @@ scan_journal_file(char * file_path_ptr,
 
 		case JF__JNL_ENTRY_MSG:
                     if ( ! trans_in_progress ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                                  "Encountered jnl entry outside of transaction");
 
                     } else if ( trans_num != cur_trans_num ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                                  "Encountered jnl entry with bad trans num");
@@ -3693,19 +3693,19 @@ scan_journal_file(char * file_path_ptr,
 
 		case JF__END_TRANS_MSG:
                     if ( ! trans_in_progress ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                              "Encountered trans end msg outside of transaction");
 
                     } else if ( trans_num != cur_trans_num ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                                  "Encountered trans end with bad trans num");
 
                     } else {
-                        
+
                        trans_in_progress = FALSE;
                        max_trans_num = cur_trans_num;
 
@@ -3734,14 +3734,14 @@ scan_journal_file(char * file_path_ptr,
 		case JF__INVALID_MSG:
                     if ( verbosity > 1 ) {
 
-                        HDfprintf(stdout, 
+                        HDfprintf(stdout,
                                   "\tinvalid message -- end of journal.\n");
                     }
 		    break;
 
 		default:
                     proceed = FALSE;
-                    HDfprintf(stderr, 
+                    HDfprintf(stderr,
                            "%s: bjf__load_next_msg() returned unknown msg?!?\n",
                            fcn_name);
 		    break;
@@ -3796,7 +3796,7 @@ scan_journal_file(char * file_path_ptr,
                           (long long)max_hdf5_length);
             }
 
-            HDfprintf(stdout, "\tMax eoa = 0x%llx.\n", 
+            HDfprintf(stdout, "\tMax eoa = 0x%llx.\n",
                       (unsigned long long)max_eoa);
         }
     }
@@ -3810,7 +3810,7 @@ scan_journal_file(char * file_path_ptr,
 
     return(proceed);
 
-} /* scan_journal_file() */                  
+} /* scan_journal_file() */
 
 
 /**************************************************************************/
@@ -3825,7 +3825,7 @@ scan_journal_file(char * file_path_ptr,
  *
  * Function:	examine_files()
  *
- * Purpose:	Scan the supplied file(s) to determine their status, 
+ * Purpose:	Scan the supplied file(s) to determine their status,
  *		and report.  Do nothing.
  *
  * Return:	void
@@ -3887,8 +3887,8 @@ examine_files(char * hdf5_file_name,
                                                    verbosity);
         if ( error ) {
 
-            HDfprintf(stdout, 
-                "\nEncountered errors examining %s -- can't run journal.\n", 
+            HDfprintf(stdout,
+                "\nEncountered errors examining %s -- can't run journal.\n",
                 hdf5_file_name);
         }
     }
@@ -3899,12 +3899,12 @@ examine_files(char * hdf5_file_name,
 
     } else {
 
-        HDfprintf(stdout, "\nExamining the putative HDF5 journal file %s:\n", 
+        HDfprintf(stdout, "\nExamining the putative HDF5 journal file %s:\n",
                   journal_file_name);
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "%sattempting to determine journal file length...\n",
                       indent1);
         }
@@ -3913,7 +3913,7 @@ examine_files(char * hdf5_file_name,
 
             journal_file_exists = FALSE;
             journal_file_ok = FALSE;
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "%sCan't get journal file length -- does it exist?\n\n",
                       indent1);
 
@@ -3921,16 +3921,16 @@ examine_files(char * hdf5_file_name,
 
             journal_file_exists = TRUE;
 
-            HDfprintf(stdout, "%sthe file %s is empty.\n\n", 
+            HDfprintf(stdout, "%sthe file %s is empty.\n\n",
                       indent1, journal_file_name);
-        
+
         } else {
 
             journal_file_exists = TRUE;
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stdout, "%sfile length = %lld\n", 
+                HDfprintf(stdout, "%sfile length = %lld\n",
                           indent2, (long long)journal_file_len);
             }
         }
@@ -3958,7 +3958,7 @@ examine_files(char * hdf5_file_name,
 
         } else {
 
-            HDfprintf(stdout, "%sheader in %s looks OK.\n\n", 
+            HDfprintf(stdout, "%sheader in %s looks OK.\n\n",
                       indent1, journal_file_name);
 
         }
@@ -3982,10 +3982,10 @@ examine_files(char * hdf5_file_name,
                 HDfprintf(stdout, "magic mismatch!!! Don't run %s on %s.\n\n",
                           journal_file_name, hdf5_file_name);
             }
-        } else if ( ( journal_file_exists ) && 
+        } else if ( ( journal_file_exists ) &&
                     ( journal_file_len == 0 ) ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
 "Since %s is empty, either %s\n\
 already has consistent metadata and need only be marked as not having\n\
 journaling in progress so it can opened with the hdf5 library, or\n\
@@ -4020,9 +4020,9 @@ If you are sure you have the correct journal file, go ahead and run\n\
  *
  * Purpose:	Examine the supplied HDF5 file, and determine if it is:
  *
- *			a) really an HDF5 file, 
+ *			a) really an HDF5 file,
  *
- *			b) uses a version of the HDF5 file format that 
+ *			b) uses a version of the HDF5 file format that
  *			   supports journaling, and
  *
  *			c) is marked as having journaling in progress.
@@ -4030,18 +4030,18 @@ If you are sure you have the correct journal file, go ahead and run\n\
  *		If any of these conditions fails to hold, there is nothing
  *		to be done -- issue a diagnostic and return false.
  *
- *		If all the above conditions hold, examine the supplied 
+ *		If all the above conditions hold, examine the supplied
  *		journal file and determine if it is either:
  *
- *			a) and empty file, or 
+ *			a) and empty file, or
  *
  *			b) an HDF5 journal file with magic number matching
  *			   that of the supplied HDF5 file.
  *
- *		In the first case, if the force flag is not set, notify the 
- *		user that the journal file is empty, that we therefore 
- *		cannot verify that it is the correct journal file for the 
- *		supplied HDF5 file, and give the user the chance to abort 
+ *		In the first case, if the force flag is not set, notify the
+ *		user that the journal file is empty, that we therefore
+ *		cannot verify that it is the correct journal file for the
+ *		supplied HDF5 file, and give the user the chance to abort
  *		the recovery.  Return false if the the recovery is aborted,
  *		and true if it is allowed to proceed.
  *
@@ -4108,7 +4108,7 @@ verify_files(char * hdf5_file_name,
         proceed = FALSE;
         HDfprintf(stderr, "%s: bad param(s) on entry.\n", fcn_name);
 
-    } 
+    }
 
     if ( proceed ) {
 
@@ -4128,27 +4128,27 @@ verify_files(char * hdf5_file_name,
 
         if ( *error_ptr ) {
 
-            HDfprintf(stderr, 
+            HDfprintf(stderr,
                   "\nEncountered errors examining %s -- can't run journal.\n\n",
                   hdf5_file_name);
 
         } else if ( ! proceed ) {
 
-            HDfprintf(stderr, 
+            HDfprintf(stderr,
                       "\nJournaling not enabled and/or supported on %s\n",
                       hdf5_file_name);
             HDfprintf(stderr, "Can't run journal.\n\n");
 
         } else {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "\n%s was journaled and not closed properly.\n",
                       hdf5_file_name);
 
             if ( verbosity > 0 ) {
 
                 HDfprintf(stdout, "\tmagic = 0x%lx\n", (unsigned long)magic);
-                HDfprintf(stdout, "\tjournal file name = \"%s\".\n", 
+                HDfprintf(stdout, "\tjournal file name = \"%s\".\n",
                           jnl_file_name);
             }
         }
@@ -4161,7 +4161,7 @@ verify_files(char * hdf5_file_name,
             proceed = FALSE;
             *error_ptr = TRUE;
             journal_file_exists = FALSE;
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "\nCan't get journal file length -- does it exist?\n\n");
 
         } else {
@@ -4172,7 +4172,7 @@ verify_files(char * hdf5_file_name,
         }
     }
 
-    if ( ( proceed ) && 
+    if ( ( proceed ) &&
          ( journal_file_exists) ) {
 
         if ( journal_file_len > 0 ) {
@@ -4192,7 +4192,7 @@ verify_files(char * hdf5_file_name,
             if ( ! proceed ) {
 
                 *error_ptr = TRUE;
-                HDfprintf(stderr, 
+                HDfprintf(stderr,
                           "\nerrors reading %s.  Journal un-useable.\n\n",
                           journal_file_name);
 
@@ -4205,11 +4205,11 @@ verify_files(char * hdf5_file_name,
 
                 if ( magic == jnl_magic ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                                "\nthe journal file %s has matching magic.\n\n",
                                journal_file_name);
 
-                    if ( ( ! jnl_human_readable ) && 
+                    if ( ( ! jnl_human_readable ) &&
                          ( ( jnl_offset_size != hdf5_offset_size ) ||
                            ( jnl_length_size != hdf5_length_size ) ) ) {
 
@@ -4220,9 +4220,9 @@ verify_files(char * hdf5_file_name,
                                  "length size mismatch",
                                  "recovery canceled.");
                         HDfprintf(stderr, "\thdf5/jnl offset size = %d/%d\n",
-			          hdf5_offset_size, jnl_offset_size); 
+			          hdf5_offset_size, jnl_offset_size);
                         HDfprintf(stderr, "\thdf5/jnl length size = %d/%d\n",
-			          hdf5_length_size, jnl_length_size); 
+			          hdf5_length_size, jnl_length_size);
 
                     }
 
@@ -4237,7 +4237,7 @@ verify_files(char * hdf5_file_name,
             }
         } else {
 
-            HDfprintf(stdout, "The journal file %s is empty.\n", 
+            HDfprintf(stdout, "The journal file %s is empty.\n",
                       journal_file_name);
             HDfprintf(stdout, "%s %s\n",
                       "Thus is is impossible to verify that",
@@ -4252,7 +4252,7 @@ verify_files(char * hdf5_file_name,
                 char reply_buf[128];
                 hbool_t done = FALSE;
                 int i;
-                
+
                 while ( ! done ) {
 
                     HDfprintf(stdout, "Proceed with the recovery? (y/n): ");
@@ -4265,7 +4265,7 @@ verify_files(char * hdf5_file_name,
                             i++;
                         }
 
-                        if ( ( reply_buf[i] == 'y' ) || 
+                        if ( ( reply_buf[i] == 'y' ) ||
                              ( reply_buf[i] == 'Y' ) ) {
 
                             done = TRUE;
@@ -4308,11 +4308,11 @@ verify_files(char * hdf5_file_name,
  *
  *		The function assumes that:
  *
- *		1) The supplied journal file and HDF5 file have been 
- *		   examined, and that their magic numbers and offset 
- *		   and length sizes match.  
+ *		1) The supplied journal file and HDF5 file have been
+ *		   examined, and that their magic numbers and offset
+ *		   and length sizes match.
  *
- *		2) That the journal file contains at least one complete 
+ *		2) That the journal file contains at least one complete
  *		   transaction.
  *
  *		3) The max eoa listed in the journal file is known, as
@@ -4323,7 +4323,7 @@ verify_files(char * hdf5_file_name,
  *		transactions, closes the supplied files, and then marks
  *		the HDF5 file as being recovered.
  *
- *		Note: While this function has been designed with both 
+ *		Note: While this function has been designed with both
  *		      human readable and binary journal files in mind,
  *		      in its first incarnation, it only supports binary
  *		      journal files.
@@ -4336,7 +4336,7 @@ verify_files(char * hdf5_file_name,
  *
  **************************************************************************/
 
-hbool_t 
+hbool_t
 apply_journal_file(char * hdf5_file_path_ptr,
                    off_t hdf5_file_len,
                    off_t sb_offset,
@@ -4370,12 +4370,12 @@ apply_journal_file(char * hdf5_file_path_ptr,
     uint64_t trans_num = 0;
     off_t offset;
     off_t new_offset;
-    
+
 
     if ( ( hdf5_file_path_ptr == NULL ) ||
          ( jnl_file_path_ptr == NULL ) ||
          ( jnl_file_len <= 0 ) ||
-         ( header_length <= 0 ) || 
+         ( header_length <= 0 ) ||
          ( max_trans_num <= 0 ) ||
          ( new_eoa == HADDR_UNDEF ) ||
          ( max_body_len <= 0 ) ) {
@@ -4386,7 +4386,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
     } else if ( human_readable ) {
 
         proceed = FALSE;
-        HDfprintf(stderr, 
+        HDfprintf(stderr,
                   "%s: only binary journal files supported at present.\n",
                   fcn_name);
     }
@@ -4401,7 +4401,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
         if ( verbosity > 1 ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                     "\tattempting to allocate journal entry body buffer...\n");
         }
 
@@ -4411,7 +4411,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
             proceed = FALSE;
             HDfprintf(stderr, "%s: buffer allocation failed.\n", fcn_name);
-        
+
         } else {
 
             if ( verbosity > 0 ) {
@@ -4425,7 +4425,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "\tattempting to open journal file %s...\n", 
+            HDfprintf(stdout, "\tattempting to open journal file %s...\n",
                       jnl_file_path_ptr);
         }
 
@@ -4450,7 +4450,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "\tattempting to open HDF5 file %s...\n", 
+            HDfprintf(stdout, "\tattempting to open HDF5 file %s...\n",
                       hdf5_file_path_ptr);
         }
 
@@ -4461,7 +4461,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
         if ( hdf5_fd == -1 ) {
 
             proceed = FALSE;
-            HDfprintf(stderr, "\tcan't open hdf5 file %s.\n", 
+            HDfprintf(stderr, "\tcan't open hdf5 file %s.\n",
                       hdf5_file_path_ptr);
 
         } else {
@@ -4517,7 +4517,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
                 case JF__UNDEFINED_MSG:
                     proceed = FALSE;
-                    HDfprintf(stderr, 
+                    HDfprintf(stderr,
                              "%s: bjf__load_next_msg() returned undef msg?!?\n",
                              fcn_name);
 		    break;
@@ -4525,7 +4525,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 		case JF__BEGIN_TRANS_MSG:
                     if ( trans_in_progress ) {
 
-                        /* At present, nested transaction are forbidden -- 
+                        /* At present, nested transaction are forbidden --
                          * scream and die if we encounter one.
                          */
 
@@ -4535,7 +4535,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
                     } else if ( trans_num != last_trans_num + 1 ) {
 
-                        /* we may decide to drop this invarient eventually, 
+                        /* we may decide to drop this invarient eventually,
                          * but we will check it for now, and scream and die
                          * if it fails.
                          */
@@ -4544,7 +4544,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
                           "Encountered out of sequence transaction in journal");
 
                     } else {
-                    
+
                         trans_in_progress = TRUE;
                         cur_trans_num = trans_num;
 
@@ -4558,13 +4558,13 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
 		case JF__JNL_ENTRY_MSG:
                     if ( ! trans_in_progress ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                                  "Encountered jnl entry outside of transaction");
 
                     } else if ( trans_num != cur_trans_num ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                                  "Encountered jnl entry with bad trans num");
@@ -4573,7 +4573,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
                         if ( verbosity > 1 ) {
 
-                            HDfprintf(stdout, 
+                            HDfprintf(stdout,
                                       "\tApplying Jnl Entry: trans = %lld, ",
                                       (long long)cur_trans_num);
 
@@ -4584,10 +4584,10 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
                         /* apply the journal entry */
 
-                        bytes_written = pwrite(hdf5_fd, 
-                                               (const void *)buf, 
+                        bytes_written = pwrite(hdf5_fd,
+                                               (const void *)buf,
                                                hdf5_length,
-                                               (off_t)(hdf5_base_addr + 
+                                               (off_t)(hdf5_base_addr +
                                                        hdf5_offset));
 
                         if ( bytes_written != (ssize_t)hdf5_length ) {
@@ -4603,19 +4603,19 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
 		case JF__END_TRANS_MSG:
                     if ( ! trans_in_progress ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                             "Encountered trans end msg outside of transaction");
 
                     } else if ( trans_num != cur_trans_num ) {
-                    
+
                         proceed = FALSE;
                         HDfprintf(stderr, "%s -- Exiting.\n",
                                  "Encountered trans end with bad trans num");
 
                     } else {
-                        
+
                         trans_in_progress = FALSE;
                         last_trans_num = cur_trans_num;
 
@@ -4631,7 +4631,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
                             if ( done ) {
 
-                                HDfprintf(stdout, 
+                                HDfprintf(stdout,
                                           "\tLast complete transaction applied.\n");
                             }
                         }
@@ -4654,7 +4654,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
 		default:
                     proceed = FALSE;
-                    HDfprintf(stderr, 
+                    HDfprintf(stderr,
                            "%s: bjf__load_next_msg() returned unknown msg?!?\n",
                            fcn_name);
 		    break;
@@ -4673,7 +4673,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
         HDfprintf(stdout, "Updating EOA in the hdf5 file %s:\n", hdf5_file_path_ptr);
     }
-    
+
 
     if ( buf != NULL ) {
 
@@ -4692,7 +4692,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "\tattempting to close jnl file %s...\n", 
+            HDfprintf(stdout, "\tattempting to close jnl file %s...\n",
                       jnl_file_path_ptr);
         }
 
@@ -4730,7 +4730,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
         if ( verbosity > 0 ) {
 
-            HDfprintf(stdout, "\tattempting to close hdf5 file %s...\n", 
+            HDfprintf(stdout, "\tattempting to close hdf5 file %s...\n",
                       hdf5_file_path_ptr);
         }
 
@@ -4747,7 +4747,7 @@ apply_journal_file(char * hdf5_file_path_ptr,
 
     return(proceed);
 
-} /* apply_journal_file() */                  
+} /* apply_journal_file() */
 
 
 /**************************************************************************
@@ -4801,7 +4801,7 @@ mark_hdf5_file_recovered(char * hdf5_file_path_ptr)
         if ( H5Pget_jnl_config(fapl, &config) == -1) {
 
             proceed = FALSE;
-            HDfprintf(stderr, "%s: couldn't get mdc config from FAPL.\n", 
+            HDfprintf(stderr, "%s: couldn't get mdc config from FAPL.\n",
                       fcn_name);
         }
     }
@@ -4831,7 +4831,7 @@ mark_hdf5_file_recovered(char * hdf5_file_path_ptr)
             HDfprintf(stderr, "%s: couldn't open recovered HDF5 file.\n",
                       fcn_name);
         }
-    } 
+    }
 
     if ( proceed ) {
 
@@ -4853,8 +4853,8 @@ mark_hdf5_file_recovered(char * hdf5_file_path_ptr)
  *
  * Function:	update_hdf5_eoa()
  *
- * Purpose:	Modify the eoa field superblock of the supplied hdf5 file 
- *		to the specified value, and update the superblock checksum 
+ * Purpose:	Modify the eoa field superblock of the supplied hdf5 file
+ *		to the specified value, and update the superblock checksum
  *		accordingly.
  *
  * Return:	TRUE if no errors are detected, and FALSE otherwise.
@@ -4926,7 +4926,7 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
                  + hdf5_offset_width  	/* base address */
                  + hdf5_offset_width; 	/* sb ext address */
 
-        chksum_disp = eoa_disp 
+        chksum_disp = eoa_disp
                     + hdf5_offset_width	/* EOF address */
                     + hdf5_offset_width;/* root group obj hdr address */
 
@@ -4959,8 +4959,8 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
     if ( proceed ) {
 
         /* verify signature and version */
-        if ( HDmemcmp(buf, 
-                      H5F_SIGNATURE, 
+        if ( HDmemcmp(buf,
+                      H5F_SIGNATURE,
                       (size_t)H5F_SIGNATURE_LEN) != 0 ) {
 
             proceed = FALSE;
@@ -4969,7 +4969,7 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
         } else if ( (int)(buf[version_disp]) != sb_ver ) {
 
             proceed = FALSE;
-            HDfprintf(stderr, "%s: Unexpected super block verion?!?!\n", 
+            HDfprintf(stderr, "%s: Unexpected super block verion?!?!\n",
                       fcn_name);
         }
     }
@@ -4980,8 +4980,8 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
 
         p = (uint8_t *)(&(buf[eoa_disp]));
 
-        address_decode((size_t)hdf5_offset_width, 
-                       (const uint8_t **)(&p), 
+        address_decode((size_t)hdf5_offset_width,
+                       (const uint8_t **)(&p),
                        &old_eoa);
 
         p = (uint8_t *)(&(buf[chksum_disp]));
@@ -5002,17 +5002,17 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
 
     if ( ( proceed ) && ( verbosity > 1 ) ) {
 
-        HDfprintf(stdout, "\tpre-update eoa = 0x%llx\n", 
+        HDfprintf(stdout, "\tpre-update eoa = 0x%llx\n",
                   (unsigned long long)old_eoa);
 
-        HDfprintf(stdout, "\tpre-update chksum = 0x%x\n", 
+        HDfprintf(stdout, "\tpre-update chksum = 0x%x\n",
                   (unsigned)old_chksum);
     }
 
     if ( proceed ) {
 
-        /* write the new eoa and chksum to the in core image of the 
-         * super block 
+        /* write the new eoa and chksum to the in core image of the
+         * super block
          */
 
         p = (uint8_t *)(&(buf[eoa_disp]));
@@ -5028,10 +5028,10 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
 
     if ( ( proceed ) && ( verbosity > 1 ) ) {
 
-        HDfprintf(stdout, "\tpost-update eoa = 0x%llx\n", 
+        HDfprintf(stdout, "\tpost-update eoa = 0x%llx\n",
                   (unsigned long long)new_eoa);
 
-        HDfprintf(stdout, "\tpost-update chksum = 0x%x\n", 
+        HDfprintf(stdout, "\tpost-update chksum = 0x%x\n",
                   (unsigned)new_chksum);
     }
 
@@ -5042,7 +5042,7 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
             HDfprintf(stdout, "\tUpdating hdf5 file length.\n");
         }
 
-        /* use ftruncate() to set the HDF5 file length to match the 
+        /* use ftruncate() to set the HDF5 file length to match the
          * the new EOA.
          */
 
@@ -5065,7 +5065,7 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
              (ssize_t)sb_size ) {
 
             proceed = FALSE;
-            HDfprintf(stderr, 
+            HDfprintf(stderr,
                      "Write of modified super block to hdf5 file %s failed.\n",
                      hdf5_file_path_ptr);
         }
@@ -5092,7 +5092,7 @@ update_hdf5_eoa(char * hdf5_file_path_ptr,
  *		Set *new_offset_ptr to reference the first byte after the
  *		entry body.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
@@ -5111,7 +5111,7 @@ bjf__chksum_entry_body(int fd,
                        off_t file_len,
                        off_t offset,
                        off_t * new_offset_ptr,
-  	               int * msg_type_ptr, 
+  	               int * msg_type_ptr,
                        size_t body_length,
                        uint32_t * chksum_ptr,
                        unsigned verbosity)
@@ -5121,7 +5121,7 @@ bjf__chksum_entry_body(int fd,
     hbool_t proceed = TRUE;
     size_t rmdr;
     off_t new_offset;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5149,7 +5149,7 @@ bjf__chksum_entry_body(int fd,
         if ( body_buf == NULL ) {
 
             proceed = FALSE;
-            HDfprintf(stderr, 
+            HDfprintf(stderr,
                       "%s: realloc() of body_buf failed.  Desired new size = %d.\n",
                       fcn_name, (int)body_buf_len);
         }
@@ -5157,12 +5157,12 @@ bjf__chksum_entry_body(int fd,
 
     if ( proceed ) {
 
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      body_length,
-                                     (uint8_t *)body_buf, 
-                                     verbosity, 
+                                     (uint8_t *)body_buf,
+                                     verbosity,
                                      fcn_name,
                                      &eof);
 
@@ -5173,7 +5173,7 @@ bjf__chksum_entry_body(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -5205,21 +5205,21 @@ bjf__chksum_entry_body(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_begin_trans_msg()
  *
- * Purpose:     Read and validate the contents of the begin transaction 
+ * Purpose:     Read and validate the contents of the begin transaction
  *		message from the supplied file, and set:
  *
- *			*msg_type_ptr to JF__BEGIN_TRANS_MSG, and 
+ *			*msg_type_ptr to JF__BEGIN_TRANS_MSG, and
  *
- *			*trans_num_ptr to the transaction number listed 
+ *			*trans_num_ptr to the transaction number listed
  *				in the message.
  *
- *			*new_offset_ptr to the offset of the byte just 
+ *			*new_offset_ptr to the offset of the byte just
  *				after the begin transaction message.
  *
  *		The supplied offset is presumed to reference the first
  *		byte of the message after the signature and version.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
@@ -5238,14 +5238,14 @@ bjf__load_begin_trans_msg(int fd,
                           off_t file_len,
                           off_t offset,
                           off_t * new_offset_ptr,
-  		          int * msg_type_ptr, 
+  		          int * msg_type_ptr,
                           int msg_ver,
-                          uint64_t * trans_num_ptr, 
+                          uint64_t * trans_num_ptr,
                           unsigned verbosity)
 {
     const char * fcn_name = "bjf__load_begin_trans_msg()";
     hbool_t proceed = TRUE;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5267,8 +5267,8 @@ bjf__load_begin_trans_msg(int fd,
                                               file_len,
                                               *new_offset_ptr,
                                               new_offset_ptr,
-  		                              msg_type_ptr, 
-                                              trans_num_ptr, 
+  		                              msg_type_ptr,
+                                              trans_num_ptr,
                                               NULL,
                                               verbosity);
 
@@ -5290,7 +5290,7 @@ bjf__load_begin_trans_msg(int fd,
 
                 if ( verbosity > 1 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                        "Unknown begin trans msg ver detected at offset 0x%llx.\n",
                        (unsigned long long)offset);
                 }
@@ -5306,18 +5306,18 @@ bjf__load_begin_trans_msg(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_chksum()
  *
- * Purpose:     Load a checksum from the supplied journal file at the 
+ * Purpose:     Load a checksum from the supplied journal file at the
  *		specified offset.
  *
  *		If successful, set *chksum_ptr to the newly loaded check
- *		sum and set *new_offset_ptr to reference the first byte 
+ *		sum and set *new_offset_ptr to reference the first byte
  *		in the journal file after the checks sum.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
- *		Return TRUE if successful, and FALSE if any error is 
+ *		Return TRUE if successful, and FALSE if any error is
  *		detected,
  *
  * Return:      TRUE on success
@@ -5333,7 +5333,7 @@ bjf__load_chksum(int fd,
                  off_t file_len,
                  off_t offset,
                  off_t * new_offset_ptr,
-                 int * msg_type_ptr, 
+                 int * msg_type_ptr,
                  uint32_t * chksum_ptr,
                  unsigned verbosity)
 {
@@ -5343,7 +5343,7 @@ bjf__load_chksum(int fd,
     hbool_t proceed = TRUE;
     uint8_t * p;
     uint32_t chksum;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5356,12 +5356,12 @@ bjf__load_chksum(int fd,
 
     if ( proceed ) {
 
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      sizeof(uint32_t),
-                                     (uint8_t *)buf, 
-                                     verbosity, 
+                                     (uint8_t *)buf,
+                                     verbosity,
                                      fcn_name,
                                      &eof);
 
@@ -5373,7 +5373,7 @@ bjf__load_chksum(int fd,
 
             *chksum_ptr = chksum;
             *new_offset_ptr = offset + (off_t)(sizeof(uint32_t));
-            
+
         } else {
 
             *msg_type_ptr = JF__INVALID_MSG;
@@ -5381,7 +5381,7 @@ bjf__load_chksum(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -5400,21 +5400,21 @@ bjf__load_chksum(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_end_trans_msg()
  *
- * Purpose:     Read and validate the contents of the end transaction 
+ * Purpose:     Read and validate the contents of the end transaction
  *		message from the supplied file, and set:
  *
- *			*msg_type_ptr to JF__END_TRANS_MSG, and 
+ *			*msg_type_ptr to JF__END_TRANS_MSG, and
  *
- *			*trans_num_ptr to the transaction number listed 
+ *			*trans_num_ptr to the transaction number listed
  *				in the message.
  *
- *			*new_offset_ptr to the offset of the byte just 
+ *			*new_offset_ptr to the offset of the byte just
  *				after the end transaction message.
  *
  *		The supplied offset is presumed to reference the first
  *		byte of the message after the signature and version.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
@@ -5433,9 +5433,9 @@ bjf__load_end_trans_msg(int fd,
                         off_t file_len,
                         off_t offset,
                         off_t * new_offset_ptr,
-  	                int * msg_type_ptr, 
+  	                int * msg_type_ptr,
                         int msg_ver,
-                        uint64_t * trans_num_ptr, 
+                        uint64_t * trans_num_ptr,
                         unsigned verbosity)
 {
     const char * fcn_name = "bjf__load_end_trans_msg()";
@@ -5462,8 +5462,8 @@ bjf__load_end_trans_msg(int fd,
                                               file_len,
                                               *new_offset_ptr,
                                               new_offset_ptr,
-  		                              msg_type_ptr, 
-                                              trans_num_ptr, 
+  		                              msg_type_ptr,
+                                              trans_num_ptr,
                                               NULL,
                                               verbosity);
 
@@ -5486,7 +5486,7 @@ bjf__load_end_trans_msg(int fd,
 
                 if ( verbosity > 1 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                        "Unknown end trans msg ver detected at offset 0x%llx.\n",
                        (unsigned long long)offset);
                 }
@@ -5503,7 +5503,7 @@ bjf__load_end_trans_msg(int fd,
  * Function:    bjf__load_entry_body()
  *
  * Purpose:     Read the specifice number of bytes from the supplied file
- *		starting at the indicated offset, and copy them into the 
+ *		starting at the indicated offset, and copy them into the
  *		supplied buffer.
  *
  *		Set *new_offset_ptr to reference the first byte after the
@@ -5512,7 +5512,7 @@ bjf__load_end_trans_msg(int fd,
  *		If chksum_ptr isn't NULL, checksum the data copied into
  *		the buffer, and update *chksum_ptr accordingly.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
@@ -5531,7 +5531,7 @@ bjf__load_entry_body(int fd,
                     off_t file_len,
                     off_t offset,
                     off_t * new_offset_ptr,
-  	            int * msg_type_ptr, 
+  	            int * msg_type_ptr,
                     size_t body_length,
                     char * buf_ptr,
                     size_t buf_len,
@@ -5541,7 +5541,7 @@ bjf__load_entry_body(int fd,
     const char * fcn_name = "bjf__load_entry_body()";
     hbool_t eof = FALSE;
     hbool_t proceed = TRUE;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5560,12 +5560,12 @@ bjf__load_entry_body(int fd,
 
     if ( proceed ) {
 
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      body_length,
-                                     (uint8_t *)buf_ptr, 
-                                     verbosity, 
+                                     (uint8_t *)buf_ptr,
+                                     verbosity,
                                      fcn_name,
                                      &eof);
 
@@ -5576,7 +5576,7 @@ bjf__load_entry_body(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -5611,15 +5611,15 @@ bjf__load_entry_body(int fd,
  * Purpose:     Read and validate the contents of the end of address space
  *		message from the supplied file, and set:
  *
- *			*msg_type_ptr to JF__EOA_MSG, and 
+ *			*msg_type_ptr to JF__EOA_MSG, and
  *
- *			*new_offset_ptr to the offset of the byte just 
+ *			*new_offset_ptr to the offset of the byte just
  *				after the end of address space message.
  *
  *		The supplied offset is presumed to reference the first
  *		byte of the message after the signature and version.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
@@ -5638,15 +5638,15 @@ bjf__load_eoa_msg(int fd,
                   off_t file_len,
                   off_t offset,
                   off_t * new_offset_ptr,
-	          int * msg_type_ptr, 
+	          int * msg_type_ptr,
                   int msg_ver,
-                  haddr_t * eoa_ptr, 
+                  haddr_t * eoa_ptr,
                   int hdf5_offset_width,
                   unsigned verbosity)
 {
     const char * fcn_name = "bjf__load_eoa_msg()";
     hbool_t proceed = TRUE;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5669,13 +5669,13 @@ bjf__load_eoa_msg(int fd,
                                            file_len,
                                            *new_offset_ptr,
                                            new_offset_ptr,
-                                           msg_type_ptr, 
-                                           eoa_ptr, 
+                                           msg_type_ptr,
+                                           eoa_ptr,
                                            hdf5_offset_width,
                                            NULL,
                                            verbosity);
 
-                if ( ( proceed ) && 
+                if ( ( proceed ) &&
                      ( *msg_type_ptr == JF__UNDEFINED_MSG ) ) {
 
                     *msg_type_ptr = JF__EOA_MSG;
@@ -5693,7 +5693,7 @@ bjf__load_eoa_msg(int fd,
 
                 if ( verbosity > 1 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                        "Unknown eoa msg ver detected at offset 0x%llx.\n",
                        (unsigned long long)offset);
                 }
@@ -5714,20 +5714,20 @@ bjf__load_eoa_msg(int fd,
  *
  *		*msg_type_ptr to JF__JNL_ENTRY_MSG,
  *
- *		*trans_num_ptr to the transaction number listed 
+ *		*trans_num_ptr to the transaction number listed
  *			in the message,
  *
  *		*trans_num_ptr to the transaction number listed
  *                     	in the message,
  *
- *		*hdf5_offset_ptr to the base address listed in the 
+ *		*hdf5_offset_ptr to the base address listed in the
  *			message,
  *
  *		*hdf5_length_ptr to the entry length listed in the message,
  *
- *		if buf_ptr is not NULL, and buf_len is less than 
+ *		if buf_ptr is not NULL, and buf_len is less than
  *			or equal to the length found in the message,
- *			load the body of the journal entry into 
+ *			load the body of the journal entry into
  *			*buf_ptr.
  *
  *		*new_offset_ptr to reference the first byte after
@@ -5736,7 +5736,7 @@ bjf__load_eoa_msg(int fd,
  *		The supplied offset is presumed to reference the first
  *		byte of the message after the signature and version.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
@@ -5755,12 +5755,12 @@ bjf__load_jnl_entry_msg(int fd,
                         off_t file_len,
                         off_t offset,
                         off_t * new_offset_ptr,
-  		        int * msg_type_ptr, 
+  		        int * msg_type_ptr,
                         int msg_ver,
-                        uint64_t * trans_num_ptr, 
-                        haddr_t * hdf5_offset_ptr, 
+                        uint64_t * trans_num_ptr,
+                        haddr_t * hdf5_offset_ptr,
                         int hdf5_offset_width,
-                        size_t * hdf5_length_ptr, 
+                        size_t * hdf5_length_ptr,
                         int hdf5_length_width,
                         char * buf_ptr,
                         size_t buf_len,
@@ -5770,7 +5770,7 @@ bjf__load_jnl_entry_msg(int fd,
     hbool_t proceed = TRUE;
     uint32_t chksum = 0;
     uint32_t expected_chksum;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5794,8 +5794,8 @@ bjf__load_jnl_entry_msg(int fd,
                                               file_len,
                                               *new_offset_ptr,
                                               new_offset_ptr,
-  		                              msg_type_ptr, 
-                                              trans_num_ptr, 
+  		                              msg_type_ptr,
+                                              trans_num_ptr,
                                               &chksum,
                                               verbosity);
                 if ( ( proceed ) &&
@@ -5805,8 +5805,8 @@ bjf__load_jnl_entry_msg(int fd,
                                                file_len,
                                                *new_offset_ptr,
                                                new_offset_ptr,
-                                               msg_type_ptr, 
-                                               hdf5_offset_ptr, 
+                                               msg_type_ptr,
+                                               hdf5_offset_ptr,
                                                hdf5_offset_width,
                                                &chksum,
                                                verbosity);
@@ -5819,8 +5819,8 @@ bjf__load_jnl_entry_msg(int fd,
                                                file_len,
                                                *new_offset_ptr,
                                                new_offset_ptr,
-                                               msg_type_ptr, 
-                                               hdf5_length_ptr, 
+                                               msg_type_ptr,
+                                               hdf5_length_ptr,
                                                hdf5_length_width,
                                                &chksum,
                                                verbosity);
@@ -5835,7 +5835,7 @@ bjf__load_jnl_entry_msg(int fd,
                                                        file_len,
                                                        *new_offset_ptr,
                                                        new_offset_ptr,
-  	                                               msg_type_ptr, 
+  	                                               msg_type_ptr,
                                                        *hdf5_length_ptr,
                                                        buf_ptr,
                                                        buf_len,
@@ -5847,7 +5847,7 @@ bjf__load_jnl_entry_msg(int fd,
                                                          file_len,
                                                          *new_offset_ptr,
                                                          new_offset_ptr,
-  	                                                 msg_type_ptr, 
+  	                                                 msg_type_ptr,
                                                          *hdf5_length_ptr,
                                                          &chksum,
                                                          verbosity);
@@ -5861,7 +5861,7 @@ bjf__load_jnl_entry_msg(int fd,
                                                file_len,
                                                *new_offset_ptr,
                                                new_offset_ptr,
-                                               msg_type_ptr, 
+                                               msg_type_ptr,
                                                &expected_chksum,
                                                verbosity);
                 }
@@ -5872,7 +5872,7 @@ bjf__load_jnl_entry_msg(int fd,
 
                     proceed = FALSE;
                     *msg_type_ptr = JF__INVALID_MSG;
-                    
+
                     if ( verbosity > 0 ) {
 
                         HDfprintf(stdout, "Chksum mismatch in jnl entry msg.\n");
@@ -5883,11 +5883,11 @@ bjf__load_jnl_entry_msg(int fd,
 
                     if ( verbosity > 1 ) {
 
-			HDfprintf(stdout, "\ttrans num = %lld\n", 
+			HDfprintf(stdout, "\ttrans num = %lld\n",
                                   (long long)(*trans_num_ptr));
-			HDfprintf(stdout, "\toffset = 0x%llx\n", 
+			HDfprintf(stdout, "\toffset = 0x%llx\n",
                                   (unsigned long long)(*hdf5_offset_ptr));
-			HDfprintf(stdout, "\tlength = 0x%llx\n", 
+			HDfprintf(stdout, "\tlength = 0x%llx\n",
                                   (unsigned long long)(*hdf5_length_ptr));
                     }
                 }
@@ -5905,7 +5905,7 @@ bjf__load_jnl_entry_msg(int fd,
 
                 if ( verbosity > 0 ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                        "Unknown jnl entry msg ver detected at offset 0x%llx.\n",
                        (unsigned long long)offset);
                 }
@@ -5921,21 +5921,21 @@ bjf__load_jnl_entry_msg(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_length()
  *
- * Purpose:     Load the length (i.e. hdf5 object length) from the supplied 
+ * Purpose:     Load the length (i.e. hdf5 object length) from the supplied
  *		journal file at the specified offset.
  *
  *		If successful, set *length_ptr to the newly loaded HDF5
- *		object length and set *new_offset_ptr to reference the 
+ *		object length and set *new_offset_ptr to reference the
  *		first byte in the journal file after the HDF5 object length.
- *		Also, if chksum_ptr is not NULL, compute the checksum on 
+ *		Also, if chksum_ptr is not NULL, compute the checksum on
  *		the on disc representation of the HDF5 file object length
  *		and update *chksum_ptr accordingly.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
- *		Return TRUE if successful, and FALSE if any error is 
+ *		Return TRUE if successful, and FALSE if any error is
  *		detected,
  *
  * Return:      TRUE on success
@@ -5951,8 +5951,8 @@ bjf__load_length(int fd,
                  off_t file_len,
                  off_t offset,
                  off_t * new_offset_ptr,
-                 int * msg_type_ptr, 
-                 size_t * hdf5_length_ptr, 
+                 int * msg_type_ptr,
+                 size_t * hdf5_length_ptr,
                  int hdf5_length_width,
                  uint32_t * chksum_ptr,
                  unsigned verbosity)
@@ -5963,7 +5963,7 @@ bjf__load_length(int fd,
     hbool_t proceed = TRUE;
     uint8_t * p;
     size_t hdf5_length;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -5976,12 +5976,12 @@ bjf__load_length(int fd,
 
     if ( proceed ) {
 
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      (size_t)hdf5_length_width,
-                                     (uint8_t *)buf, 
-                                     verbosity, 
+                                     (uint8_t *)buf,
+                                     verbosity,
                                      fcn_name,
                                      &eof);
 
@@ -6016,7 +6016,7 @@ bjf__load_length(int fd,
 
                         if ( verbosity > 2 ) {
 
-                            HDfprintf(stdout, "%s: invalid hdf5_length_width.\n", 
+                            HDfprintf(stdout, "%s: invalid hdf5_length_width.\n",
                                       fcn_name);
                         }
                         break;
@@ -6028,7 +6028,7 @@ bjf__load_length(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -6054,11 +6054,11 @@ bjf__load_length(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_next_msg()
  *
- * Purpose:     Read the message from the supplied file that starts at 
- *		the supplied offset, and set *msg_type_ptr, *trans_num_ptr, 
- *		*offset_ptr, *length_ptr, and *eoa_ptr as appropriate.  
- *		If the message is a journal entry, buf_ptr is not NULL 
- *		and buf_len is greater than or equal to the length of the 
+ * Purpose:     Read the message from the supplied file that starts at
+ *		the supplied offset, and set *msg_type_ptr, *trans_num_ptr,
+ *		*offset_ptr, *length_ptr, and *eoa_ptr as appropriate.
+ *		If the message is a journal entry, buf_ptr is not NULL
+ *		and buf_len is greater than or equal to the length of the
  *		entry body, load the body into *buf_ptr.
  *
  *		In all cases, set *new_offset_ptr to either the offset at
@@ -6068,66 +6068,66 @@ bjf__load_length(int fd,
  *
  *		More specifically:
  *
- *		If the the message is invalid, set: 
+ *		If the the message is invalid, set:
  *
  *			*msg_type_ptr to JF__INVALID_MSG
  *
- *			The targets of all other pointer parameters are 
+ *			The targets of all other pointer parameters are
  *			undefined.
  *
  *
  *		If the message is a begin transaction message, set:
  *
- *			*msg_type_ptr to JF__BEGIN_TRANS_MSG, and 
+ *			*msg_type_ptr to JF__BEGIN_TRANS_MSG, and
  *
- *			*trans_num_ptr to the transaction number listed 
+ *			*trans_num_ptr to the transaction number listed
  *				in the message.
  *
- *			The targets of all other pointer parameters are 
+ *			The targets of all other pointer parameters are
  *				undefined.
  *
  *
  *		If the message is a journal entry message, set:
- *		
+ *
  *			*msg_type_ptr to JF__JNL_ENTRY_MSG,
  *
  *			*trans_num_ptr to the transaction number listed
  *                      	in the message,
  *
- *			*offset_ptr to the base address listed in the 
+ *			*offset_ptr to the base address listed in the
  *				message,
  *
- *			*length_ptr to the entry length listed in the 
+ *			*length_ptr to the entry length listed in the
  *				message,
  *
- *			if buf_ptr is not NULL, and buf_len is less than 
+ *			if buf_ptr is not NULL, and buf_len is less than
  *				or equal to the length found in the message,
- *				load the body of the journal entry into 
+ *				load the body of the journal entry into
  *				*buf_ptr.
  *
- *			The targets of all other pointer parameters are 
+ *			The targets of all other pointer parameters are
  *			undefined.
  *
  *
  *		If the message is an end transaction message, set:
  *
- *			*msg_type_ptr to JF__END_TRANS_MSG, and 
+ *			*msg_type_ptr to JF__END_TRANS_MSG, and
  *
- *			*trans_num_ptr to the transaction number listed 
+ *			*trans_num_ptr to the transaction number listed
  *				in the message.
  *
- *			The targets of all other pointer parameters are 
+ *			The targets of all other pointer parameters are
  *				undefined.
  *
  *
  *		If the message is an EOA message, set:
  *
- *			*msg_type_ptr to JF__EOA_MSG, and 
+ *			*msg_type_ptr to JF__EOA_MSG, and
  *
  *			*eoa_ptr to the end of address space value listed
  *				in the message
  *
- *			The targets of all other pointer parameters are 
+ *			The targets of all other pointer parameters are
  *			undefined.
  *
  *		In all cases, set *new_offset_ptr to either the offset at
@@ -6150,11 +6150,11 @@ bjf__load_next_msg(int fd,
                    off_t file_len,
                    off_t offset,
                    off_t * new_offset_ptr,
-  		   int * msg_type_ptr, 
-                   uint64_t * trans_num_ptr, 
-                   haddr_t * hdf5_offset_ptr, 
+  		   int * msg_type_ptr,
+                   uint64_t * trans_num_ptr,
+                   haddr_t * hdf5_offset_ptr,
                    int hdf5_offset_width,
-                   size_t * hdf5_length_ptr, 
+                   size_t * hdf5_length_ptr,
                    int hdf5_length_width,
                    haddr_t * eoa_ptr,
                    char * buf_ptr,
@@ -6166,7 +6166,7 @@ bjf__load_next_msg(int fd,
     char msg_ver;
     hbool_t eof = FALSE;
     hbool_t proceed = TRUE;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -6184,9 +6184,9 @@ bjf__load_next_msg(int fd,
         *msg_type_ptr = JF__UNDEFINED_MSG;
 
         /* try to load the message signature and version into sig_buf */
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      (size_t)(H5C2_BJNL__SIG_LEN + 1),
                                      (uint8_t *)sig_buf,
                                      verbosity,
@@ -6199,7 +6199,7 @@ bjf__load_next_msg(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -6217,15 +6217,15 @@ bjf__load_next_msg(int fd,
 
         if ( verbosity > 2 ) {
 
-            HDfprintf(stdout, 
+            HDfprintf(stdout,
                       "%s: Read sig = \"%s\", ver = %d at offset 0x%llx.\n",
-                      fcn_name, 
-                      sig_buf, 
-                      (int)msg_ver, 
+                      fcn_name,
+                      sig_buf,
+                      (int)msg_ver,
                       (unsigned long long)(offset));
         }
 
-        if ( HDstrncmp(sig_buf, H5C2_BJNL__BEGIN_TRANS_SIG, 
+        if ( HDstrncmp(sig_buf, H5C2_BJNL__BEGIN_TRANS_SIG,
                        (size_t)(H5C2_BJNL__SIG_LEN)) == 0 ) {
 
             proceed = bjf__load_begin_trans_msg(fd,
@@ -6237,25 +6237,25 @@ bjf__load_next_msg(int fd,
                                        trans_num_ptr,
                                        verbosity);
 
-        } else if ( HDstrncmp(sig_buf, H5C2_BJNL__JOURNAL_ENTRY_SIG, 
+        } else if ( HDstrncmp(sig_buf, H5C2_BJNL__JOURNAL_ENTRY_SIG,
                               (size_t)(H5C2_BJNL__SIG_LEN)) == 0 ) {
 
 	    proceed = bjf__load_jnl_entry_msg(fd,
                                        file_len,
                                        offset + (off_t)(H5C2_BJNL__SIG_LEN + 1),
                                        new_offset_ptr,
-  		                       msg_type_ptr, 
+  		                       msg_type_ptr,
                                        msg_ver,
-                                       trans_num_ptr, 
-                                       hdf5_offset_ptr, 
+                                       trans_num_ptr,
+                                       hdf5_offset_ptr,
                                        hdf5_offset_width,
-                                       hdf5_length_ptr, 
+                                       hdf5_length_ptr,
                                        hdf5_length_width,
                                        buf_ptr,
                                        buf_len,
                                        verbosity);
 
-        } else if ( HDstrncmp(sig_buf, H5C2_BJNL__END_TRANS_SIG, 
+        } else if ( HDstrncmp(sig_buf, H5C2_BJNL__END_TRANS_SIG,
                               (size_t)(H5C2_BJNL__SIG_LEN)) == 0 ) {
 
             proceed = bjf__load_end_trans_msg(fd,
@@ -6268,16 +6268,16 @@ bjf__load_next_msg(int fd,
                                        verbosity);
 
 
-        } else if ( HDstrncmp(sig_buf, H5C2_BJNL__END_ADDR_SPACE_SIG, 
+        } else if ( HDstrncmp(sig_buf, H5C2_BJNL__END_ADDR_SPACE_SIG,
                               (size_t)(H5C2_BJNL__SIG_LEN)) == 0 ) {
 
 	    proceed = bjf__load_eoa_msg(fd,
                                        file_len,
                                        offset + (off_t)(H5C2_BJNL__SIG_LEN + 1),
                                        new_offset_ptr,
-	                               msg_type_ptr, 
+	                               msg_type_ptr,
                                        msg_ver,
-                                       eoa_ptr, 
+                                       eoa_ptr,
                                        hdf5_offset_width,
                                        verbosity);
 
@@ -6289,7 +6289,7 @@ bjf__load_next_msg(int fd,
 
             if ( verbosity > 0 ) {
 
-                HDfprintf(stdout, 
+                HDfprintf(stdout,
                   "Invalid/unknown binary msg sig detected at offset 0x%llx.\n",
                   (unsigned long long)offset);
             }
@@ -6304,21 +6304,21 @@ bjf__load_next_msg(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_offset()
  *
- * Purpose:     Load the offset (i.e. hdf5 file address) from the supplied 
+ * Purpose:     Load the offset (i.e. hdf5 file address) from the supplied
  *		journal file at the specified offset.
  *
  *		If successful, set *hdf5_offset_ptr to the newly loaded HDF5
- *		file address and set *new_offset_ptr to reference the 
- *		first byte in the journal file after the HDF5 file address.  
- *		Also, if chksum_ptr is not NULL, compute the checksum on 
- *		the on disc representation of the HDF5 file offset number, 
+ *		file address and set *new_offset_ptr to reference the
+ *		first byte in the journal file after the HDF5 file address.
+ *		Also, if chksum_ptr is not NULL, compute the checksum on
+ *		the on disc representation of the HDF5 file offset number,
  *		and update *chksum_ptr accordingly.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
- *		Return TRUE if successful, and FALSE if any error is 
+ *		Return TRUE if successful, and FALSE if any error is
  *		detected,
  *
  * Return:      TRUE on success
@@ -6334,8 +6334,8 @@ bjf__load_offset(int fd,
                  off_t file_len,
                  off_t offset,
                  off_t * new_offset_ptr,
-                 int * msg_type_ptr, 
-                 haddr_t * hdf5_offset_ptr, 
+                 int * msg_type_ptr,
+                 haddr_t * hdf5_offset_ptr,
                  int hdf5_offset_width,
                  uint32_t * chksum_ptr,
                  unsigned verbosity)
@@ -6346,7 +6346,7 @@ bjf__load_offset(int fd,
     hbool_t proceed = TRUE;
     uint8_t * p;
     haddr_t hdf5_offset;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -6359,12 +6359,12 @@ bjf__load_offset(int fd,
 
     if ( proceed ) {
 
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      (size_t)hdf5_offset_width,
-                                     (uint8_t *)buf, 
-                                     verbosity, 
+                                     (uint8_t *)buf,
+                                     verbosity,
                                      fcn_name,
                                      &eof);
 
@@ -6399,7 +6399,7 @@ bjf__load_offset(int fd,
 
                         if ( verbosity > 1 ) {
 
-                            HDfprintf(stdout, "%s: invalid offset_width.\n", 
+                            HDfprintf(stdout, "%s: invalid offset_width.\n",
                                       fcn_name);
                         }
                         break;
@@ -6411,7 +6411,7 @@ bjf__load_offset(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -6437,21 +6437,21 @@ bjf__load_offset(int fd,
 /*-------------------------------------------------------------------------
  * Function:    bjf__load_trans_num()
  *
- * Purpose:     Load the transaction number from the supplied file at the 
+ * Purpose:     Load the transaction number from the supplied file at the
  *		specified offset.
  *
- *		If successful, set *trans_num_ptr to the newly loaded 
- *		transaction number, and set *new_offset_ptr to reference the 
- *		first byte in the file after the transaction.  Also, if 
+ *		If successful, set *trans_num_ptr to the newly loaded
+ *		transaction number, and set *new_offset_ptr to reference the
+ *		first byte in the file after the transaction.  Also, if
  *		chksum_ptr is not NULL, compute the checksum on the on disc
  *		representation of the transaction number, and update *
  *		chksum_ptr accordingly.
  *
- *		If an error is detected, set *msg_type_ptr to 
+ *		If an error is detected, set *msg_type_ptr to
  *		JF__INVALID_MSG, and set *new_offset_ptr to the offset
  *		at which the error was detected.
  *
- *		Return TRUE if successful, and FALSE if any error is 
+ *		Return TRUE if successful, and FALSE if any error is
  *		detected,
  *
  * Return:      TRUE on success
@@ -6467,8 +6467,8 @@ bjf__load_trans_num(int fd,
                     off_t file_len,
                     off_t offset,
                     off_t * new_offset_ptr,
-  		    int * msg_type_ptr, 
-                    uint64_t * trans_num_ptr, 
+  		    int * msg_type_ptr,
+                    uint64_t * trans_num_ptr,
                     uint32_t * chksum_ptr,
                     unsigned verbosity)
 {
@@ -6478,7 +6478,7 @@ bjf__load_trans_num(int fd,
     hbool_t proceed = TRUE;
     uint8_t * p;
     uint64_t trans_num;
-   
+
     if ( ( fd < 0 ) ||
          ( new_offset_ptr == NULL ) ||
          ( msg_type_ptr == NULL ) ||
@@ -6491,12 +6491,12 @@ bjf__load_trans_num(int fd,
 
     if ( proceed ) {
 
-        proceed = load_buf_from_file(fd, 
-                                     file_len, 
-                                     offset, 
+        proceed = load_buf_from_file(fd,
+                                     file_len,
+                                     offset,
                                      sizeof(uint64_t),
-                                     (uint8_t *)buf, 
-                                     verbosity, 
+                                     (uint8_t *)buf,
+                                     verbosity,
                                      fcn_name,
                                      &eof);
 
@@ -6524,7 +6524,7 @@ bjf__load_trans_num(int fd,
 
             if ( eof ) {
 
-                /* we have encountered the end of file, not a system 
+                /* we have encountered the end of file, not a system
                  * or I/O error.  Set proceed back to TRUE, as encountering
                  * the end of file is not necessarily an error in this
                  * context.
@@ -6592,7 +6592,7 @@ static void
 leave(int ret)
 {
  h5tools_close();
- 
+
  exit(ret);
 }
 
@@ -6608,14 +6608,14 @@ leave(int ret)
  *
  *-------------------------------------------------------------------------
  */
-static int 
+static int
 file_copy(char * file_from, char * file_to)
 {
 
     FILE * from;
     FILE * to;
     char ch;
-    
+
     /* open source file */
     if((from = fopen(file_from, "rb")) == NULL) {
         error_msg(progname, "Could not open source file\n");
@@ -6638,7 +6638,7 @@ file_copy(char * file_from, char * file_to)
             leave( EXIT_FAILURE );
         } /* end if */
 
-        if( !feof(from) ) 
+        if( !feof(from) )
             fputc(ch, to);
 
         if( ferror(to) ) {
@@ -6671,7 +6671,7 @@ file_copy(char * file_from, char * file_to)
  *               updates the pointer to point to the next byte after the
  *               address.
  *
- *               If the value read is all 1's, then the address is 
+ *               If the value read is all 1's, then the address is
  *               returned with an undefined value.
  *
  * Programmer:   Mike McGreevy (utilizing code from Robb Matzke)
@@ -6680,8 +6680,8 @@ file_copy(char * file_from, char * file_to)
  *-------------------------------------------------------------------------
  */
 void
-address_decode(size_t sizeof_addr, 
-               const uint8_t **pp /* in, out */, 
+address_decode(size_t sizeof_addr,
+               const uint8_t **pp /* in, out */,
                haddr_t *addr_p/*out*/)
 {
 
@@ -6694,7 +6694,7 @@ address_decode(size_t sizeof_addr,
     assert(addr_p);
 
     *addr_p = 0;
-    
+
     for (i=0; i<sizeof_addr; i++) {
         c = *(*pp)++;
         if (c != 0xff)
@@ -6729,14 +6729,14 @@ address_decode(size_t sizeof_addr,
  *-------------------------------------------------------------------------
  */
 void
-address_encode(size_t sizeof_addr, 
-               uint8_t **pp /* in, out */, 
+address_encode(size_t sizeof_addr,
+               uint8_t **pp /* in, out */,
                haddr_t addr)
 {
     unsigned u;
-    
+
     assert(pp && *pp);
-    
+
     for(u = 0; u < sizeof_addr; u++) {
         *(*pp)++ = (uint8_t)(addr & 0xff);
         addr >>= 8;
@@ -6761,8 +6761,8 @@ address_encode(size_t sizeof_addr,
  *-------------------------------------------------------------------------
  */
 void
-length_decode(size_t sizeof_length, 
-              const uint8_t **pp /* in, out */, 
+length_decode(size_t sizeof_length,
+              const uint8_t **pp /* in, out */,
               hsize_t *len_p /*out*/)
 {
 
@@ -6775,7 +6775,7 @@ length_decode(size_t sizeof_length,
     HDassert( sizeof_length <= sizeof(hsize_t) );
 
     *len_p = 0;
-    
+
     for ( i = 0; i < sizeof_length; i++ ) {
 
         c = *(*pp)++;
@@ -6797,7 +6797,7 @@ length_decode(size_t sizeof_length,
  *
  * Purpose:     Encodes a length into the buffer pointed to by *pp and
  *              then increments the pointer to the first byte after the
- *              length. 
+ *              length.
  *
  * Programmer:  JRM -- 3/6/09 (rework of address_encode())
  *
@@ -6805,15 +6805,15 @@ length_decode(size_t sizeof_length,
  */
 
 void
-length_encode(size_t sizeof_length, 
-              uint8_t **pp /* in, out */, 
+length_encode(size_t sizeof_length,
+              uint8_t **pp /* in, out */,
               hsize_t length)
 {
     unsigned u;
-    
+
     HDassert(pp && *pp);
     HDassert( sizeof_length <= sizeof(hsize_t) );
-    
+
     for ( u = 0; u < sizeof_length; u++ ) {
 
         *(*pp)++ = (uint8_t)(length & 0xff);
@@ -6840,7 +6840,7 @@ length_encode(size_t sizeof_length,
  * Programmer:   Mike McGreevy <mamcgree@hdfgroup.org>
  *               Monday, March 10, 2008
  *
- * Modifications: 
+ * Modifications:
  *               Mike McGreevy, August 7, 2008
  *               Parses superblock to update EOA value
  *
@@ -6848,7 +6848,7 @@ length_encode(size_t sizeof_length,
  */
 
 int
-main(int argc, 
+main(int argc,
      const char *argv[])
 {
 
@@ -6897,7 +6897,7 @@ main(int argc,
     long             pos_end; /* file descriptor position indicator */
     char             temp[100]; /* temporary buffer */
     H5F_t *          f; /* File pointer */
-    hbool_t          jrnl_has_transactions = TRUE;              
+    hbool_t          jrnl_has_transactions = TRUE;
     hbool_t          examine_files_only = FALSE;
     hbool_t          force = FALSE;
     hbool_t          error = FALSE;
@@ -6943,7 +6943,7 @@ main(int argc,
                 usage();
                 leave( EXIT_SUCCESS );
                 break;
-            
+
             case 'b':
                 custom_name = 1;
                 file_name_backup = strdup ( opt_arg );
@@ -7002,7 +7002,7 @@ main(int argc,
 
     /* check for missing backup file name */
     if ( custom_name == 1) {
-        
+
         if ( file_name_backup == NULL ) {
 
             error_msg(progname, "Journal file backup name missing\n");
@@ -7071,264 +7071,264 @@ main(int argc,
         } /* end if */
 
         else {
-            file_name_backup = HDmalloc(HDstrlen(file_name) + (size_t)10);    
+            file_name_backup = HDmalloc(HDstrlen(file_name) + (size_t)10);
 
             HDsnprintf(file_name_backup, HDstrlen(file_name) + (size_t)8, "%s.backup", file_name);
             if ( verbose ) printf("Copying HDF5 file <%s> into file <%s>\n", file_name, file_name_backup);
             file_copy( /* from */ file_name, /* to */ file_name_backup);
-    
+
         } /* end else */
 
     } /* end if */
 
     if ( jnl_human_readable ) {
-    
+
         /* =========================== */
         /* Open HDF5 and Journal Files */
         /* =========================== */
-    
+
         /* open the journal file for reading */
         journal_fp = fopen(journal_name, "r");
-        
+
         if (journal_fp == NULL) {
-    
+
             error_msg(progname, "Could not open specified journal file\n");
             usage();
             leave( EXIT_FAILURE );
-    
+
         } /* end if */
-        
+
         /* open hdf5 file for reading and writing */
         hdf5_fd = open(file_name, O_RDWR);
-        
+
         if (hdf5_fd == -1) {
-        
+
             error_msg(progname, "Could not open specified hdf5 file\n");
             usage();
             leave( EXIT_FAILURE );
-    
+
         } /* end if */
-    
+
         /* allocate temporary space to store and transaction messages */
         last_trans_msg = HDmalloc((size_t)50);
         if (last_trans_msg == NULL) {
-    
+
             error_msg(progname, "Could not allocate space\n");
             leave( EXIT_FAILURE);
-    
+
         } /* end if */
-    
-        if ( verbose ) printf("Recovering file <%s> from journal <%s>\n\n", 
+
+        if ( verbose ) printf("Recovering file <%s> from journal <%s>\n\n",
                               file_name, journal_name);
-    
+
         /* ====================================================== */
         /* Find the last complete transaction in the journal file */
         /* ====================================================== */
-    
+
         fseek(journal_fp, 0, SEEK_END);
-    
+
         while (last_trans_found == 0) {
-    
+
             while (fgetc(journal_fp) != '\n') {
-                
+
                 if (ftell(journal_fp) <= 1) {
-    
+
                     jrnl_has_transactions = FALSE;
                     printf("Journal file has no complete transactions. Nothing to recover!\n");
                     break;
-            
+
                 } /* end if */
-    
+
                 fseek(journal_fp, -2, SEEK_CUR);
-    
+
             } /* end while */
-    
+
             if (jrnl_has_transactions == FALSE) break;
-    
+
             if ( fgetc(journal_fp) == '3' ) {
-    
+
                 last_trans_found = 1;
                 pos_end = ftell(journal_fp);
                 fseek(journal_fp, -1, SEEK_CUR);
                 fgets(last_trans_msg, 50, journal_fp);
-    
+
             } /* end if */
-    
+
             else {
-    
+
                 fseek(journal_fp, -3, SEEK_CUR);
-    
+
             } /* end else */
-    
+
         } /* end while */
-    
+
         /* ================================================================== */
         /* Only do the recovery procedure if there is something to recover in */
         /* the journal file. Otherwise, skip over these steps and mark        */
         /* the file as recovered.                                             */
         /* ================================================================== */
-        
+
         if (jrnl_has_transactions == TRUE) {
-    
+
             /* ================================================================= */
             /* Pre-parse of journal file to pull information needed before doing */
             /* the recovery.                                                     */
             /*    - max journal size (for buffer allocation)                     */
             /*    - max EOA size (for superblock update, to preserve raw data)   */
             /* ================================================================= */
-    
+
             fseek(journal_fp, 0, SEEK_SET);
-        
+
             c_new = 0;
             c_old = 0;
             max_size = 0;
-    
+
             if ( verbose ) printf("Pre-parsing journal file to pull needed data ... \n");
-    
+
             /* while journal is not at end of file */
             while (ftell(journal_fp) != pos_end) {
-    
+
                 c_old = c_new;
                 c_new = fgetc(journal_fp);
-            
+
                 /* if position is at the start of a line */
                 if (c_old == '\n') {
-    
+
                     /* ========================================================== */
                     /* if the line is a journal entry, determine its size. update */
                     /* max size value if needed.                                  */
                     /* ========================================================== */
                     if (c_new == '2') {
-    
+
                         pos = ftell(journal_fp);
-    
-                        fgets(temp, 100, journal_fp); 
+
+                        fgets(temp, 100, journal_fp);
                         tok[0] = HDstrtok(temp, " ");
                         if (tok[0] == NULL) {
-    
+
                             error_msg(progname, "Could not tokenize entry\n");
                             leave( EXIT_FAILURE);
-        
+
                         } /* end if */
                         for (i=1; i<8; i++) {
-    
+
                             tok[i] = HDstrtok(NULL, " ");
                             if (tok[i] == NULL) {
-    
+
                                 error_msg(progname, "Could not tokenize entry\n");
                                 leave( EXIT_FAILURE);
-    
+
                             } /* end if */
-    
+
                         } /* end for */
-                    
+
                         size = (size_t)HDstrtoll(tok[3], NULL, 10);
-    
+
                         if (max_size < size) {
-    
+
                             max_size = size;
-    
+
                         } /* end if */
-    
+
                         /* jump back to start of line */
                         fseek(journal_fp, pos, SEEK_SET);
-    
+
                     } /* end if */
-    
+
                     /* =========================================================== */
                     /* If the line is an EOA entry, determine its value and update */
                     /* if it exceeds the current max length                        */
                     /* =========================================================== */
-    
+
                     if (c_new == 'E') {
-                
+
                         pos = ftell(journal_fp);
-    
+
                         fgets(temp, 100, journal_fp);
                         p = &temp[11];
-    
-    		    /* according to the man page, strtoll() should accept a 
-    		     * "0x" prefix on any base 16 value -- seems this is 
+
+    		    /* according to the man page, strtoll() should accept a
+    		     * "0x" prefix on any base 16 value -- seems this is
     		     * not the case.  Deal with this by incrementing p
     		     * past the prefix.
     		     */
-    
+
     		    while ( HDisspace(*(p)) ) { p++; }
-    
+
     		    if ( ( *(p) == '0' ) &&
     		         ( *(p + 1) == 'x' ) ) {
-    
+
     		            p += 2;
     		    }
-    
+
                         eoa = (haddr_t)HDstrtoll(p, NULL, 16);
                         if (eoa == 0) {
-        
-                            error_msg(progname, 
+
+                            error_msg(progname,
     				  "Could not convert eoa to integer\n");
                             leave( EXIT_FAILURE);
-    
+
                         } /* end if */
-    
+
                         if (update_eoa < eoa) {
-    
+
                             update_eoa = eoa;
-    
+
                         } /* end if */
-    
+
                         /* jump back to start of line */
                         fseek(journal_fp, pos, SEEK_SET);
-    
+
                     } /* end if */
-    
+
                 } /* end if */
-    
+
             } /* end while */
-    
+
             if ( verbose ) printf(" - Maximum journal entry size = %d\n", max_size);
             if ( verbose ) printf(" - Journaled EOA value = 0x%llx\n", update_eoa);
-    
+
             /* =================================== */
             /* Update EOA value in HDF5 superblock */
             /* =================================== */
-    
+
             if (update_eoa != 0) {
-    
+
                 if ( verbose ) printf("\nLooking for HDF5 superblock ... \n");
                 /* Jump through possible locations of superblock */
                 for(n = 8; n < 16; n++) {
-        
+
                     sb_addr = (8 == n) ? 0 : 1 << n;
-        
+
                     /* read from HDF5 file */
-                    pread(hdf5_fd, buf, H5F_SIGNATURE_LEN, sb_addr);    
-        
+                    pread(hdf5_fd, buf, H5F_SIGNATURE_LEN, sb_addr);
+
                     /* Check to see if superblock has been found. */
                     if(!HDmemcmp(buf, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) {
-        
+
                         if ( verbose ) printf(" - Superblock signature found at location %d\n", sb_addr);
-        
+
                         if ( verbose ) printf(" - Reading in entire superblock\n");
-        
+
                         /* Read in entire superblock */
                         pread(hdf5_fd, sbuf, H5F_MAX_SUPERBLOCK_SIZE, sb_addr/* + H5F_SIGNATURE_LEN */);
-        
+
                         /* Use p as a pointer into superblock buffer */
                         p = sbuf;
-        
+
                         /* Skip over signature */
                         p += H5F_SIGNATURE_LEN;
-    
-                        /* Get superblock version number */   
+
+                        /* Get superblock version number */
                         super_vers = *p++;
-        
+
                         /* add printfs to verbose */
                         if ( verbose ) printf(" - Superblock version number = %d\n", super_vers);
-            
+
                         /* ==================================== */
-                        /* Point to EOA value in the superblock */ 
+                        /* Point to EOA value in the superblock */
                         /* ==================================== */
-    
+
                         /* First part of superblock may be of differing versions */
                         if(super_vers < 2) {
                             /* skip over unneeded data */
@@ -7336,283 +7336,283 @@ main(int argc,
                                  1 +  /* root group version */
                                  1 +  /* reserved byte */
                                  1;   /* shared header version */
-    
+
                             sizeof_addr = *p++; /* size of file addresses */
-    
+
                             p += 1 +  /* size of file sizes */
                                  1 +  /* reserved byte */
                                  2 +  /* 1/2 rank for symtable leaf nodes */
                                  2 +  /* 1/2 rank for btree internal nodes */
                                  4 +  /* file status flags */
                                  2;   /* b-tree internal k value */
-                    
+
                             if (super_vers == 1)
                                 p += 2; /* reserved bytes */
-    
+
                         } /* end if */
-    
+
                         /* Superblock version number > 2 */
                         else {
-                
+
                             sizeof_addr = *p++; /* size of file addresses */
-                    
+
                             p += 1 + /* size of file sizes */
                                  1;  /* file status flags */
-     
+
                             p_front = p;
                             p_end = p;
-                       
+
                         } /* end else */
-                       
+
                         /* Skip over various variable portions of superblock */
                         address_decode((size_t)sizeof_addr, &p_end, &addr); /* base address */
                         address_decode((size_t)sizeof_addr, &p_end, &addr); /* extension address */
-    
+
                         /* ============================ */
                         /* Update EOA in the superblock */
                         /* ============================ */
-    
+
                         p_front = p_end;
-    
+
                         /* Decode the EOA address */
                         address_decode((size_t)sizeof_addr, &p_end, &addr);
-    
+
                         if ( verbose ) printf(" - Current value of EOA in superblock is 0x%llx\n", addr);
-                    
+
                         /* Set the EOA to the address pulled from the journal */
                         addr = (haddr_t)update_eoa;
                         p_end = p_front;
-    
+
                         /* encode new EOA value into superblock buffer */
                         address_encode((size_t)sizeof_addr, &p_end, addr);
-    
+
                         if ( verbose ) printf(" - EOA value has been updated to 0x%llx in superblock\n", update_eoa);
-    
+
                         /* skip over root group object header */
                         address_decode((size_t)sizeof_addr, &p_end, &addr); /* root group object header */
-    
+
                         p_front = p_end;
-    
+
                         if ( verbose ) printf(" - Updating checksum value of superblock\n");
-    
+
                         /* decode checksum */
                         read_chksum = 0;
                         UINT32DECODE(p_end, read_chksum);
-    
+
                         p_end = p_front;
-    
+
                         /* Update the CHECKSUM VALUE */
                         /* Compute superblock checksum */
                         chksum = H5_checksum_metadata(sbuf, (size_t)(p_end - sbuf), 0);
-    
+
                         /* Superblock checksum */
                         UINT32ENCODE(p_end, chksum);
-    
+
                         new_eoa = (haddr_t)update_eoa;
-    
+
                         /* verify new EOA value in buffer is correct */
                         address_decode((size_t)sizeof_addr, &p_front, &addr);
-                    
+
                         /* Extend file to be EOA bytes */
                         HDftruncate(hdf5_fd, new_eoa);
-                
+
                         /* Write out new updated superblock to the file */
                         status = pwrite(hdf5_fd, sbuf, (size_t)H5F_MAX_SUPERBLOCK_SIZE, sb_addr /*+ H5F_SIGNATURE_LEN */);
-    
+
                         if (status == -1) {
                             error_msg(progname, "pwrite failed when trying to update superblock\n");
                             leave( EXIT_FAILURE );
-                        } 
-                
+                        }
+
                         if (status == 0) {
                             error_msg(progname, "pwrite did not write anything to superblock!\n");
                             leave( EXIT_FAILURE);
                         }
-    
+
                         if ( verbose ) printf(" - New superblock written to HDF5 file\n");
-                    
+
                     } /* end if */
-        
+
                 } /* end for */
-    
+
             } /* end if (update_eoa != 0)*/
-    
+
             if ( verbose ) printf("\nBeginning recovery process ... \n\n");
-    
+
             /* ==================================================================== */
             /* Main Recovery Procedure:                                             */
             /* Read through the journal file and recover any journal entries found. */
             /* ==================================================================== */
-    
+
             max_size = max_size * 3 + 200;
-    
+
             /* allocate space large enough to hold largest journal entry */
             readback = HDmalloc( max_size );
             if (readback == NULL) {
-    
+
                 error_msg(progname, "Could not allocate space to hold entries\n");
                 leave( EXIT_FAILURE);
-    
+
             } /* end if */
-    
+
             /* read through journal file. recover any journal entries found, up
              * through the last transaction number */
             fseek(journal_fp, 0, SEEK_SET);
-    
+
             while ( fgets(readback, max_size, journal_fp) != NULL ) {
-        
+
                 if (HDstrcmp(readback, last_trans_msg) == 0) {
-        
+
                     /* done reading from file */
                     break;
-    
+
                 } /* end if */
-        
+
                 /* ===================================================== */
                 /* If journal entry is found, write entry into HDF5 file */
                 /* ===================================================== */
-    
+
                 if ( readback[0] == '2') { /* journal entry found */
-    
+
                     if ( verbose ) printf("Journal entry found.\n");
                     if ( verbose ) printf("Tokenizing journal entry.\n");
-    
+
                     /* ================================================= */
                     /* Tokenize the journal entry in order to grab data */
                     /* ================================================= */
-    
+
                     /* divide the journal entry into tokens */
                     tok[0] = HDstrtok(readback, " ");
                     if (tok[0] == NULL) {
-    
+
                         error_msg(progname, "Could not tokenize journal entry\n");
                         leave( EXIT_FAILURE);
-        
+
                     } /* end if */
-    
+
                     if ( verbose ) printf("  token[0] : <%s>\n", tok[0]);
-    
+
                     for (i=1; i<8; i++) {
-    
+
                         tok[i] = HDstrtok(NULL, " ");
                         if (tok[i] == NULL) {
-    
+
                             error_msg(progname, "Could not tokenize journal entry\n");
                             leave( EXIT_FAILURE);
-    
+
                         } /* end if */
-    
+
                         if ( verbose ) printf("  token[%d] : <%s>\n", i, tok[i]);
-    
+
                     } /* end for */
-    
-                    /* put all remaining data into last token. */ 
+
+                    /* put all remaining data into last token. */
                     /* This contains all of the journal entry body */
                     tok[8] = HDstrtok(NULL, "\n");
                     if (tok[8] == NULL) {
-    
+
                         error_msg(progname, "Could not tokenize journal entry\n");
                         leave( EXIT_FAILURE);
-    
+
                     } /* end if */
-    
+
                     if ( verbose ) printf("  token[8] : <hexadecimal body data>\n");
-    
+
                     /* =================================== */
                     /* Convert Items from Character Arrays */
                     /* =================================== */
-    
+
                     if ( verbose ) printf("Converting data from character strings.\n");
-    
+
                     /* convert address from character character string */
-    
-    		/* according to the man page, strtoll() should accept a 
-    		 * "0x" prefix on any base 16 value -- seems this is 
+
+    		/* according to the man page, strtoll() should accept a
+    		 * "0x" prefix on any base 16 value -- seems this is
     		 * not the case.  Deal with this by incrementing tok[6]
     		 * past the prefix.
     		 */
     		while ( HDisspace(*(tok[6])) ) { (tok[6])++; }
     		if ( ( *(tok[6]) == '0' ) &&
     		     ( *(tok[6] + 1) == 'x' ) ) {
-    
+
     		        (tok[6]) += 2;
     		}
                     address = (off_t)HDstrtoll(tok[6], NULL, 16);
                     if (address == 0) {
-        
+
                         error_msg(progname, "Could not convert address to integer\n");
                         leave( EXIT_FAILURE);
-    
+
                     } /* end if */
-    
+
                     if ( verbose ) printf("  address  : %llx\n", address);
-    
+
                     /* convert size from character string*/
                     size = (size_t)HDstrtoll(tok[4], NULL, 10);
                     if (size == 0) {
-    
+
                         error_msg(progname, "Could not convert size to double\n");
                         leave( EXIT_FAILURE);
-    
+
                     } /* end if */
-    
+
                     if ( verbose ) printf("  length   : %d\n", size);
-    
+
                     /* transform body out of hexadecimal character string */
                     body = HDmalloc(size + 1);
                     if (body == NULL) {
-    
+
                         error_msg(progname, "Could not allocate space for body\n");
                         leave( EXIT_FAILURE);
-    
+
                     } /* end if */
-                
+
                     p = &(tok[8])[0];
-                
+
                     for (i = 0; i < size; i++) {
-                
+
                         body[i] = HDstrtoul(p, NULL, 16);
                         p = &p[3];
-    
+
                     } /* end for */
-    
+
                     body[i] = 0;
-    
+
                     if ( verbose ) printf("  body     : binary body data\n");
-    
+
                     /* ================================================ */
                     /* Write into HDF5 file the recovered journal entry */
                     /* ================================================ */
-    
+
                     if ( verbose ) printf("Writing entry to HDF5 file.\n");
-     
+
                     /* perform a write */
                     status = pwrite(hdf5_fd, body, size, address);
-    
+
                     if (status == -1) {
                         error_msg(progname, "pwrite failed\n");
                         leave( EXIT_FAILURE );
                     }
-                
+
                     if (status == 0) {
                         error_msg(progname, "pwrite did not write anything!\n");
                         leave( EXIT_FAILURE);
                     }
-    
+
                     /* Verify that write occurred correctly */
                     if ( check_file == 1) {
-    
+
                         if ( verbose ) printf("Verifying success of write");
-                
+
                         compare_buf = HDmalloc(size + 1);
-        
+
                         if (compare_buf == NULL) {
                             error_msg(progname, "Could not allocate space\n");
                             leave( EXIT_FAILURE);
                         } /* end if */
-                    
+
                         pread(hdf5_fd, compare_buf, size, address);
-    
+
                         /* do a quick string compare on two items */
                         if (HDstrcmp((const char *)body, (const char *)compare_buf) != 0) {
                             error_msg(progname, "Entry incorrectly written into HDF5 file. Exiting.\n");
@@ -7621,7 +7621,7 @@ main(int argc,
                             printf(" -- from HDF5 file: '%s'\n", compare_buf);
                             leave( EXIT_FAILURE );
                         } /* end if */
-    
+
                         /* compare each individual value of entry */
                         for (i=0; i<size; i++) {
                             if (body[i] != compare_buf[i]) {
@@ -7632,90 +7632,90 @@ main(int argc,
                                 leave( EXIT_FAILURE );
                             }
                         }
-    
+
                         if ( verbose ) printf(" .... SUCCESS!\n\n");
                         free(compare_buf);
-    
+
                     }
-    
+
                     free(body);
-    
+
                 } /* end if */
-    
+
             } /* end while */
-    
+
             free(readback);
-    
+
         } /* end if jrnl_has_transactions */
-    
+
         fclose(journal_fp);
         close(hdf5_fd);
         free(last_trans_msg);
         free(journal_name);
         if (file_name_backup != NULL) HDfree(file_name_backup);
-    
+
         /* =========================== */
         /* Mark HDF5 File as Recovered */
         /* =========================== */
-    
+
         /* set up appropriate fapl */
         fapl = H5Pcreate(H5P_FILE_ACCESS);
-        
+
         if ( fapl == -1 ) {
-        
+
             error_msg(progname, "Could not create FAPL.\n");
             leave( EXIT_FAILURE );
-        
+
         } /* end if */
-        
+
         config.version = 1; /* should be H5C2__CURR_AUTO_SIZE_CTL_VER */
-        
+
         /* get H5AC_cache_config_t configuration from fapl */
         if ( H5Pget_jnl_config(fapl, &config) == -1) {
-        
+
             error_msg(progname, "Could not get mdc config from FAPL.\n");
             leave( EXIT_FAILURE );
-        
+
         }
-                
+
         /* make sure journal recovered field is set to TRUE in mdc_config */
         config.journal_recovered = TRUE;
-        
+
         /* set H5AC_cache_config_t configuration with file recovered */
         if ( H5Pset_jnl_config(fapl, &config) == -1) {
-        
+
             error_msg(progname, "Could not set mdc config on FAPL.\n");
             leave( EXIT_FAILURE );
-        
+
         } /* end if */
-    
+
         /* open HDF5 file with provided fapl */
-        fid = H5Fopen(file_name, H5F_ACC_RDWR, fapl);    
-           
+        fid = H5Fopen(file_name, H5F_ACC_RDWR, fapl);
+
         if ( fid == -1 ) {
-        
+
             error_msg(progname, "Could not open recovered HDF5 file.\n");
             leave( EXIT_FAILURE );
-        
+
         } /* end if */
-    
+
         /* close HDF5 file */
         if ( H5Fclose(fid) == -1 ) {
-        
+
             error_msg(progname, "Could not close recovered HDF5 file.\n");
             leave( EXIT_FAILURE );
-        
+
         } /* end if */
-    
+
         /* ================ */
         /* Cleanup and Exit */
         /* ================ */
-    
-        if (jrnl_has_transactions == TRUE) 
+
+        if (jrnl_has_transactions == TRUE)
             printf("HDF5 file successfuly recovered.\n");
         else
             printf("File marked as recovered.\n");
-    
+
         if ( verbose ) printf("==============================================\n\n");
     } else {
 
@@ -7763,6 +7763,6 @@ main(int argc,
     free(file_name);
 
     return 0;
-    
+
 } /* end main */
 
diff --git a/tools/h5recover/trecover.h b/tools/h5recover/trecover.h
index 3705929..99d4b20 100644
--- a/tools/h5recover/trecover.h
+++ b/tools/h5recover/trecover.h
@@ -49,10 +49,10 @@
 #define H5FILE_NAME        "trecover.h5"
 #define CTL_H5FILE_NAME    "CTL"H5FILE_NAME	/* control file name */
 #define JNL_H5FILE_NAME    H5FILE_NAME".jnl"	/* journal file name */
-#define DATASETNAME "IntArray" 
-#define CHUNKDATASETNAME "IntArrayChunked" 
-#define ZDATASETNAME "IntArrayZCompressed" 
-#define SZDATASETNAME "IntArraySZCompressed" 
+#define DATASETNAME "IntArray"
+#define CHUNKDATASETNAME "IntArrayChunked"
+#define ZDATASETNAME "IntArrayZCompressed"
+#define SZDATASETNAME "IntArraySZCompressed"
 
 /* Data Structures */
 typedef union CrasherParam_t {
diff --git a/tools/h5recover/trecover_crasher.c b/tools/h5recover/trecover_crasher.c
index adcb33e..e2c4f15 100644
--- a/tools/h5recover/trecover_crasher.c
+++ b/tools/h5recover/trecover_crasher.c
@@ -12,12 +12,12 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/*  
+/*
  * crasher HDF5 API module of the trecover test program.
  *
  * Creator: Albert Cheng, Jan 28, 2008.
  */
- 
+
 #include "trecover.h"
 
 /* Crasher
@@ -54,13 +54,13 @@ crasher(int crash_mode, CrasherParam_t *crash_param)
 	    fprintf(stderr, "Unknown Crash Mode (%d)\n", crash_mode);
 	    break;
     }
-}     
+}
 
 
 /* Red Storm may hang if the signal handlin routine does I/O, even just printf() calls.
  * Be aware if you want to add printf calls.
  */
-void wakeup(int signum) 
+void wakeup(int signum)
 {
     /* call crasher with sync mode */
     crasher(SyncCrash, 0);
diff --git a/tools/h5recover/trecover_main.c b/tools/h5recover/trecover_main.c
index fc941ab..0e33644 100644
--- a/tools/h5recover/trecover_main.c
+++ b/tools/h5recover/trecover_main.c
@@ -12,13 +12,13 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/*  
+/*
  * This is the Main body of the HDF5 Test program for the h5recover tool.
  * It creates two HDF5 files, one as the Data file, the other the Control file.
  * The two files are intended to contain identical data. The Control file will
  * be completed with no error but the Data file, though written with the same
  * data, is intentional crashed without proper file flush or close.
- * 
+ *
  * (The two files are then verified by processes outside of this program.)
  * The crashed Data file is restored by the h5recover tool and compared with
  * the Control file, expecting identical file content up to the last successful
@@ -26,7 +26,7 @@
  *
  * Creator: Albert Cheng, Jan 28, 2008.
  */
- 
+
 #include "trecover.h"
 
 /* Global variables */
@@ -123,7 +123,7 @@ parser(int ac, char **av)
 	    }
 	}else{
 	    fprintf(stderr, "Unknown command option(%s)\n", *av);
-	    help(); 
+	    help();
 	    exit(1);
 	}
     } /* end of while */
@@ -133,9 +133,9 @@ parser(int ac, char **av)
 	   ( DSTypes != DSChunked ) ||
 	   ( PatchMode != 0 ) ) ) {
 
-        fprintf(stderr, 
+        fprintf(stderr,
 		"-v option cannot be combined with other options\n");
-        help(); 
+        help();
         exit(1);
     }
 
@@ -158,7 +158,7 @@ init(void)
 void
 help(void)
 {
-    fprintf(stderr, 
+    fprintf(stderr,
        "Usage: trecover ([-a <seconds>] [-b] [-d <dataset-type>] [-h]) | [-v]\n"
        "\t-a\tAsync crash seconds where <seconds> is a real number.\n"
        "\t-b\tUse binary journal file (default human readable).\n"
@@ -195,8 +195,8 @@ main (int ac, char **av)
 	    /* create/open both files. */
 	    create_files(H5FILE_NAME, CTL_H5FILE_NAME);
 
-	    /* Create datasets in both Control file and data files.  
-	     * Close both. 
+	    /* Create datasets in both Control file and data files.
+	     * Close both.
 	     */
 	    create_dataset(ctl_file, DSTypes, RANK, dims, dimschunk);
 	    close_file(ctl_file);
@@ -205,9 +205,9 @@ main (int ac, char **av)
         }
 
         /* Open data file with Journaling and control file without. */
-        journal_files(H5FILE_NAME, CTL_H5FILE_NAME, JNL_H5FILE_NAME, 
+        journal_files(H5FILE_NAME, CTL_H5FILE_NAME, JNL_H5FILE_NAME,
                       PatchMode, humanReadableJnl);
-    
+
         if (PatchMode){
 	    /* extend the datafile again without writing data, then close it. */
 	    extend_dataset(datafile, NX, 4*NX-1, PatchMode);
@@ -229,12 +229,12 @@ main (int ac, char **av)
 	    if (AsyncCrashParam.tinterval == 0)
 	        CRASH;
 
-	    /* Close file only if Async crash is scheduled but has 
-	     * not occurred yet. 
+	    /* Close file only if Async crash is scheduled but has
+	     * not occurred yet.
 	     */
 	    close_file(datafile);
         }
     }
 
     return(ret_val);
-}     
+}
diff --git a/tools/h5recover/trecover_verifier.c b/tools/h5recover/trecover_verifier.c
index f88be8e..3198cb7 100644
--- a/tools/h5recover/trecover_verifier.c
+++ b/tools/h5recover/trecover_verifier.c
@@ -12,7 +12,7 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* 
+/*
  * This file contains a set of routines intended to verify that the crashed
  * file has been recovered correctly.
  *
@@ -21,7 +21,7 @@
  * 1) The file is readable.
  *
  * 2) If the crash file contains a dataset of the same name as a dataset
- *    that appears in the architype, 
+ *    that appears in the architype,
  *
  *    a) it is of the same type and configuration,
  *
@@ -32,10 +32,10 @@
  *       or filler value, or matching data for a while followed by garbage
  *       or filler falue
  *
- * 3) The crash file contains no dataset that are not in the architype 
+ * 3) The crash file contains no dataset that are not in the architype
  *    file.
  *
- * If the crash file is clearly not correctly recoverd, write a message 
+ * If the crash file is clearly not correctly recoverd, write a message
  * to this effect to stderr, and return non-zero.
  *
  * If the raw data looks odd, write a message to stdout, and return zero.
@@ -43,13 +43,13 @@
  * If all is OK, return 0
  *
  * Note that this code make a lot of assumptions about the structure
- * of the control and crash files.  I expect that this file will have 
+ * of the control and crash files.  I expect that this file will have
  * to be reworked whenever the test file generation code is changed.
  *
  * 					JRM -- 12/8/08
  *
  * WARNING: The above is only partially implemented.  Specifically,
- * at present we only check for the chunked integer dataset type, and 
+ * at present we only check for the chunked integer dataset type, and
  * do not check for extraneous dataset.
  */
 
@@ -81,7 +81,7 @@ open_files(const char *filename, const char *ctl_filename)
 	    fprintf(stderr, "Can't open crash file \"%s\".\n", ctl_filename);
 	    H5Fclose(ctl_file);
 	    ctl_file = -1;
-        
+
         }
     }
 
@@ -89,7 +89,7 @@ open_files(const char *filename, const char *ctl_filename)
 
 }
 
-int 
+int
 verify_chunked_dset(void)
 {
     hbool_t done = FALSE;
@@ -128,7 +128,7 @@ verify_chunked_dset(void)
     hsize_t ctl_memspace_dims[RANK];
     hsize_t crash_memspace_dims[RANK];
 
-    /* Check to see if the dataset appears in both the ctl and crash 
+    /* Check to see if the dataset appears in both the ctl and crash
      * files.
      */
     if ( ret_val == 0 )
@@ -155,7 +155,7 @@ verify_chunked_dset(void)
 	    if ( crash_dset >= 0 ) {
 
 	        ret_val = 1;
-		fprintf(stderr, 
+		fprintf(stderr,
 		    "dataset %s appears in crash file but not in ctl file.\n",
 		    DATASETNAME);
 	    }
@@ -207,8 +207,8 @@ verify_chunked_dset(void)
     /* get the extents */
     if ( ( ret_val == 0 ) && ( ! done ) ) {
 
-        ctl_rank = H5Sget_simple_extent_dims(ctl_dspace, 
-                                             ctl_dims, 
+        ctl_rank = H5Sget_simple_extent_dims(ctl_dspace,
+                                             ctl_dims,
                                              ctl_maxdims );
         if ( ctl_rank != RANK ) {
 
@@ -217,8 +217,8 @@ verify_chunked_dset(void)
 
 	}
 
-        crash_rank =  H5Sget_simple_extent_dims(crash_dspace, 
-                                                crash_dims, 
+        crash_rank =  H5Sget_simple_extent_dims(crash_dspace,
+                                                crash_dims,
                                                 crash_maxdims);
         if ( ctl_rank != RANK ) {
 
@@ -284,7 +284,7 @@ verify_chunked_dset(void)
         if ( ctl_maxdims[0] != H5S_UNLIMITED ) {
 
 	    ret_val = 1;
-            fprintf(stderr, 
+            fprintf(stderr,
                       "chunk dspace ctl_maxdims[0] != H5S_UNLIMITED.\n");
 
 	} else if ( ctl_maxdims[1] != NY ) {
@@ -295,7 +295,7 @@ verify_chunked_dset(void)
         } else if ( crash_maxdims[0] != H5S_UNLIMITED ) {
 
 	    ret_val = 1;
-            fprintf(stderr, 
+            fprintf(stderr,
                       "chunk dspace crash_maxdims[0] != H5S_UNLIMITED.\n");
 
 	} else if ( crash_maxdims[1] != NY ) {
@@ -306,8 +306,8 @@ verify_chunked_dset(void)
     }
 
 
-    /* get the underlying type of the data sets, and verify that it 
-     * is as expected 
+    /* get the underlying type of the data sets, and verify that it
+     * is as expected
      */
     if ( ( ret_val == 0 ) && ( ! done ) ) {
 
@@ -379,7 +379,7 @@ verify_chunked_dset(void)
 
     /* finally, read in the contents of the dsets and compare them.
      *
-     * Since we are not journaling raw data, it is hard to say if 
+     * Since we are not journaling raw data, it is hard to say if
      * any particular set of value is right or wrong, but we will
      * try to spot anything odd and comment.
      */
@@ -389,12 +389,12 @@ verify_chunked_dset(void)
 
         ctl_memspace_dims[0] = ctl_dims[0];
         ctl_memspace_dims[1] = ctl_dims[1];
-    
+
 	ctl_memspace = H5Screate_simple(RANK, ctl_memspace_dims, NULL);
 
         crash_memspace_dims[0] = crash_dims[0];
         crash_memspace_dims[1] = crash_dims[1];
-    
+
 	crash_memspace = H5Screate_simple(RANK, crash_memspace_dims, NULL);
 
 	if ( ( ctl_memspace < 0 ) || ( crash_memspace < 0 ) ) {
@@ -405,11 +405,11 @@ verify_chunked_dset(void)
         } else {
 
 	    ctl_result = H5Sselect_hyperslab(ctl_memspace, H5S_SELECT_SET,
-			                     zero_offset, NULL, 
+			                     zero_offset, NULL,
 					     ctl_memspace_dims, NULL);
 
 	    crash_result = H5Sselect_hyperslab(crash_memspace, H5S_SELECT_SET,
-			                       zero_offset, NULL, 
+			                       zero_offset, NULL,
 					       crash_memspace_dims, NULL);
 
 	    if ( ( ctl_result < 0 ) || ( crash_result < 0 ) ) {
@@ -425,10 +425,10 @@ verify_chunked_dset(void)
     /* set up the file space selections */
     if ( ( ret_val == 0 ) && ( ! done ) ) {
 
-        ctl_result = H5Sselect_hyperslab(ctl_dspace, H5S_SELECT_SET, 
+        ctl_result = H5Sselect_hyperslab(ctl_dspace, H5S_SELECT_SET,
 			                 zero_offset, NULL, ctl_dims, NULL);
 
-        crash_result = H5Sselect_hyperslab(crash_dspace, H5S_SELECT_SET, 
+        crash_result = H5Sselect_hyperslab(crash_dspace, H5S_SELECT_SET,
 			                   zero_offset, NULL, crash_dims, NULL);
 
         if ( ( ctl_result < 0 ) || ( crash_result < 0 ) ) {
@@ -466,26 +466,26 @@ verify_chunked_dset(void)
      *
      * 2) All bad data.
      *
-     * 3) Good data at the beginning, turning to gargbage somewhere along 
+     * 3) Good data at the beginning, turning to gargbage somewhere along
      *    the way.  This should be the typical case.
      *    Further, since we this is a chunked data set, we would expect
      *    each chunk to be all good or all bad.
      *
      * The following code is an attempt to check this.  We will not flag
-     * any errors, but if we see anything odd, we will dump the contents 
+     * any errors, but if we see anything odd, we will dump the contents
      * of the data set.
      */
 
     if ( ( ret_val == 0 ) && ( ! done ) ) {
 
-        /* do a raster scan of the dataset and cont the number of 
+        /* do a raster scan of the dataset and cont the number of
          * transitions from good data to bad data and vise versa.
-         * 
+         *
          * If there are "too many" transitions, make note and request
          * a dump of the data sets.
          *
-         * Similarly, if any streak of good or bad data is not a 
-         * multiple of the chunk height, make note and request a 
+         * Similarly, if any streak of good or bad data is not a
+         * multiple of the chunk height, make note and request a
          * dump of the data sets.
          */
 
@@ -522,7 +522,7 @@ verify_chunked_dset(void)
 
                     if ( ctl_data[i][j] == crash_data[i][j] ) {
 
-                        /* don't begin a good data streak unless we have 
+                        /* don't begin a good data streak unless we have
                          * two good values in a row.
                          */
                         if ( prev_entry_matched ) {
@@ -558,7 +558,7 @@ verify_chunked_dset(void)
 
         if ( transitions > (2 * ChunkX) ) {
 
-            fprintf(stdout, 
+            fprintf(stdout,
                     "\nToo many transitions between good and bad data.\n");
             fprintf(stdout, "Dumping the ctl and crash chunked data sets.\n");
             dump_ctl_dset = TRUE;
@@ -662,7 +662,7 @@ verify_chunked_dset(void)
 } /* verify_chunked_dset() */
 
 
-int 
+int
 verify_recovery(void)
 {
     int ret_val = 0;
diff --git a/tools/h5recover/trecover_writer.c b/tools/h5recover/trecover_writer.c
index 7779f5b..e5ebab6 100644
--- a/tools/h5recover/trecover_writer.c
+++ b/tools/h5recover/trecover_writer.c
@@ -12,12 +12,12 @@
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/*  
+/*
  * writer HDF5 API module of the trecover test program.
  *
  * Creator: Albert Cheng, Jan 28, 2008.
  */
- 
+
 #include "trecover.h"
 
 int
@@ -61,7 +61,7 @@ journal_files(const char *filename, const char *ctl_filename, const char *jnl_fi
     if (!patch){
 
     /* set latest format */
-    if ( H5Pset_libver_bounds(faccpl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST ) 
+    if ( H5Pset_libver_bounds(faccpl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST )
          < 0 ) {
         fprintf(stderr, "H5Pset_libver_bounds on data file failed\n");
         H5Pclose(faccpl);
@@ -114,22 +114,22 @@ create_dataset(hid_t f, int dstype, int rank, hsize_t *dims, hsize_t *dimschunk)
 {
     hid_t       dataset;         /* dataset handle */
     hid_t       dataspace, plist;      /* handles */
-    herr_t      status;                             
+    herr_t      status;
     hsize_t 	maxdims[RANK]; 		/* Dataset dimensions */
 
     /* Default to create an unlimited dimension dataset unless contigous
      * storeage is used.
      */
     if (dstype & DSContig)
-	dataspace = H5Screate_simple(rank, dims, NULL); 
+	dataspace = H5Screate_simple(rank, dims, NULL);
     else{
 	maxdims[0]=H5S_UNLIMITED;
 	maxdims[1]=NY;
-	dataspace = H5Screate_simple(rank, dims, maxdims); 
+	dataspace = H5Screate_simple(rank, dims, maxdims);
     }
     /*
      * Describe the size of the array and create the data space for fixed
-     * size dataset. 
+     * size dataset.
      */
 
     if (dstype & DSContig) {
@@ -235,13 +235,13 @@ create_dataset(hid_t f, int dstype, int rank, hsize_t *dims, hsize_t *dimschunk)
 
 
 
-    /* 
+    /*
      * All done, close/release resources.
      */
     H5Sclose(dataspace);
 
     return;
-}     
+}
 
 
 /* extend the dataset size to end rows.  If it is not patch,
@@ -309,7 +309,7 @@ writedata(hid_t dataset, int begin, int end)
     while (beginInc <= end){
 	if (beginInc+nrows-1 > end)
 	    nrows=end-beginInc+1;	/* last fragment of rows */
-	
+
 	start[0]=beginInc;
 	start[1]=0;
 	count[0]=nrows;
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index febf7d7..d827972 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -65,16 +65,16 @@ int h5repack(const char* infile,
     /* check input */
     if (check_options(options)<0)
         return -1;
-    
+
     /* check for objects in input that are in the file */
     if (check_objects(infile,options) < 0)
         return -1;
-    
+
     /* copy the objects  */
     if (copy_objects(infile,outfile,options) < 0)
         return -1;
-    
-    
+
+
     return 0;
 }
 
@@ -97,7 +97,7 @@ int h5repack_init (pack_opt_t *options,
     memset(options,0,sizeof(pack_opt_t));
     options->threshold = 1024;
     options->verbose   = verbose;
-        
+
     for ( n = 0; n < H5_REPACK_MAX_NFILTERS; n++)
     {
         options->filter_g[n].filtn  = -1;
@@ -105,7 +105,7 @@ int h5repack_init (pack_opt_t *options,
         for ( k = 0; k < CD_VALUES; k++)
             options->filter_g[n].cd_values[k] = -1;
     }
-     
+
     return (options_table_init(&(options->op_tbl)));
 }
 
@@ -141,36 +141,36 @@ int h5repack_addfilter(const char* str,
     int             n_objs;         /* number of objects in the current -f or -l option entry */
     int             is_glb;         /* is the filter global */
 
-    
-     
+
+
     /* parse the -f option */
     obj_list=parse_filter(str,&n_objs,&filter,options,&is_glb);
     if (obj_list==NULL)
     {
         return -1;
     }
-    
+
     /* if it applies to all objects */
     if (is_glb)
     {
-        
+
         int n;
-        
+
         n = options->n_filter_g++; /* increase # of global filters */
 
         if (options->n_filter_g > H5_REPACK_MAX_NFILTERS)
         {
             error_msg(progname, "maximum number of filters exceeded for <%s>\n",str);
             return -1;
-            
+
         }
-                
+
         options->filter_g[n] = filter;
     }
-    
+
     else
         options_add_filter(obj_list,n_objs,filter,options->op_tbl);
-    
+
     free(obj_list);
     return 0;
 }
@@ -190,25 +190,25 @@ int h5repack_addfilter(const char* str,
 int h5repack_addlayout(const char* str,
                        pack_opt_t *options)
 {
-    
+
     obj_list_t  *obj_list=NULL;     /*one object list for the -t and -c option entry */
     int         n_objs;             /*number of objects in the current -t or -c option entry */
     pack_info_t pack;               /*info about layout to extract from parse */
     int         j;
-    
+
     init_packobject(&pack);
-    
+
     if (options->all_layout==1){
     error_msg(progname, "invalid layout input: 'all' option \
         is present with other objects <%s>\n",str);
     return -1;
     }
-    
+
     /* parse the layout option */
     obj_list=parse_layout(str,&n_objs,&pack,options);
     if (obj_list==NULL)
         return -1;
-    
+
     /* set global layout option */
     if (options->all_layout==1 )
     {
@@ -230,13 +230,13 @@ int h5repack_addlayout(const char* str,
             }
         }
     }
-    
+
     if (options->all_layout==0)
         options_add_layout(obj_list,
         n_objs,
         &pack,
         options->op_tbl);
-    
+
     free(obj_list);
     return 0;
 }
@@ -252,7 +252,7 @@ int h5repack_addlayout(const char* str,
  * Programmer: pvn@ncsa.uiuc.edu
  *
  * Date: September, 22, 2003
- * 
+ *
  * Modification:
  *   Peter Cao, July 9, 2007
  *   Add "-L, --latest" and other options to pack a file with the latest file format
@@ -264,7 +264,7 @@ static int check_options(pack_opt_t *options)
     unsigned int   i;
     int            k, j, has_cp=0, has_ck=0;
     char           slayout[30];
-    
+
     /*-------------------------------------------------------------------------
     * objects to layout
     *-------------------------------------------------------------------------
@@ -297,11 +297,11 @@ static int check_options(pack_opt_t *options)
             }
         }
     }/* verbose */
-    
+
     for ( i = 0; i < options->op_tbl->nelems; i++)
     {
         char* name=options->op_tbl->objs[i].path;
-        
+
         if (options->op_tbl->objs[i].chunk.rank>0)
         {
             if (options->verbose){
@@ -319,24 +319,24 @@ static int check_options(pack_opt_t *options)
             has_ck=1;
         }
     }
-    
+
     if (options->all_layout==1 && has_ck){
     error_msg(progname, "invalid chunking input: 'all' option\
         is present with other objects\n");
     return -1;
     }
-    
+
     /*-------------------------------------------------------------------------
     * objects to filter
     *-------------------------------------------------------------------------
     */
-    
+
     if (options->verbose && have_request(options) /* only print if requested */)
     {
         printf("Objects to apply filter are...\n");
         if (options->all_filter==1)
         {
-            
+
             for (k = 0; k < options->n_filter_g; k++ )
             {
                 H5Z_filter_t filtn=options->filter_g[k].filtn;
@@ -359,12 +359,12 @@ static int check_options(pack_opt_t *options)
             };
         }
     } /* verbose */
-    
+
     for ( i = 0; i < options->op_tbl->nelems; i++)
     {
         pack_info_t pack  = options->op_tbl->objs[i];
         char*       name  = pack.path;
-        
+
         for ( j=0; j<pack.nfilters; j++)
         {
             if (options->verbose)
@@ -373,18 +373,18 @@ static int check_options(pack_opt_t *options)
                     name,
                     get_sfilter(pack.filter[j].filtn));
             }
-            
+
             has_cp=1;
-            
+
         } /* j */
     } /* i */
-    
+
     if (options->all_filter==1 && has_cp){
     error_msg(progname, "invalid compression input: 'all' option\
         is present with other objects\n");
     return -1;
     }
-    
+
     /* check options for the latest format */
     if (options->grp_compact < 0) {
         error_msg(progname, "invalid maximum number of links to store as header messages\n");
@@ -404,7 +404,7 @@ static int check_options(pack_opt_t *options)
             return -1;
         }
     }
-    
+
     return 0;
 }
 
@@ -429,11 +429,11 @@ static int check_objects(const char* fname,
     hid_t         fid;
     unsigned int  i;
     trav_table_t  *travt = NULL;
-    
+
     /* nothing to do */
     if(options->op_tbl->nelems == 0)
         return 0;
-    
+
     /*-------------------------------------------------------------------------
      * open the file
      *-------------------------------------------------------------------------
@@ -442,32 +442,32 @@ static int check_objects(const char* fname,
         printf("<%s>: %s\n", fname, H5FOPENERROR );
         return -1;
     }
-    
+
     /*-------------------------------------------------------------------------
      * get the list of objects in the file
      *-------------------------------------------------------------------------
      */
-    
+
     /* init table */
     trav_table_init(&travt);
-    
+
     /* get the list of objects in the file */
     if(h5trav_gettable(fid, travt) < 0)
         goto out;
-    
+
     /*-------------------------------------------------------------------------
      * compare with user supplied list
      *-------------------------------------------------------------------------
      */
-    
+
     if(options->verbose)
         printf("Opening file <%s>. Searching for objects to modify...\n", fname);
-    
+
     for(i = 0; i < options->op_tbl->nelems; i++) {
         char* name=options->op_tbl->objs[i].path;
         if(options->verbose)
             printf(" <%s>",name);
-        
+
         /* the input object names are present in the file and are valid */
         if(h5trav_getindext(name, travt) < 0) {
             error_msg(progname, "%s Could not find <%s> in file <%s>. Exiting...\n",
@@ -489,7 +489,7 @@ static int check_objects(const char* fname,
                 int     rank;
                 hid_t   did;
                 hid_t   sid;
-                
+
                 if(options->op_tbl->objs[i].chunk.rank > 0) {
                     rank = options->op_tbl->objs[i].chunk.rank;
                     for(j = 0; j < rank; j++)
@@ -512,7 +512,7 @@ static int check_objects(const char* fname,
                     if(H5Dclose(did) < 0)
                         goto out;
                 }
-                
+
                 if (csize < ppb ) {
                     printf(" <warning: SZIP settins, chunk size is smaller than pixels per block>\n");
                     goto out;
@@ -521,7 +521,7 @@ static int check_objects(const char* fname,
             break;
         }
     } /* i */
-      
+
    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
@@ -529,7 +529,7 @@ static int check_objects(const char* fname,
     H5Fclose(fid);
     trav_table_free(travt);
     return 0;
-    
+
 out:
     H5Fclose(fid);
     trav_table_free(travt);
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index 80fb1b0..de56aad 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -100,11 +100,11 @@ typedef struct {
  H5D_layout_t    layout_g;    /*global layout information for the ALL case */
  int             verbose;     /*verbose mode */
  hsize_t         threshold;   /*minimum size to compress, in bytes */
- int             use_native;  /*use a native type in write */  
+ int             use_native;  /*use a native type in write */
  int             latest;      /*pack file with the latest file format */
  int             grp_compact; /* Set the maximum number of links to store as header messages in the group */
  int             grp_indexed; /* Set the minimum number of links to store in the indexed format */
- int             msg_size[8]; /* Minumum size of shared messages: dataspace, 
+ int             msg_size[8]; /* Minumum size of shared messages: dataspace,
                                  datatype, fill value, filter pipleline, attribute */
 } pack_opt_t;
 
@@ -153,7 +153,7 @@ int copy_objects   (const char* fnamein,
 int do_copy_refobjs(hid_t fidin,
                     hid_t fidout,
                     trav_table_t *travt,
-                    pack_opt_t *options); 
+                    pack_opt_t *options);
 
 /*-------------------------------------------------------------------------
  * filters and verify module
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 73b201e..d8af162 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -269,7 +269,7 @@ out:
  *
  * Date: October, 23, 2003
  *
- * Modifications: 
+ * Modifications:
  *
  *  July 2004:     Introduced the extra EC or NN option for SZIP
  *
@@ -281,47 +281,47 @@ out:
  *  October 2006:  Read by hyperslabs for big datasets.
  *
  *  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
- *  i.e., if the memory needed to read a dataset is greater than this limit, 
- *  then hyperslab I/O is done instead of one operation I/O 
+ *  i.e., if the memory needed to read a dataset is greater than this limit,
+ *  then hyperslab I/O is done instead of one operation I/O
  *  For each dataset, the memory needed is calculated according to
  *
  *  memory needed = number of elements * size of each element
  *
- *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations 
+ *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
  *  are done
  *
  *  H5Dread( input_dataset1 )
  *  H5Dread( input_dataset2 )
  *
- *  with all elements in the datasets selected. If the memory needed is greater than 
+ *  with all elements in the datasets selected. If the memory needed is greater than
  *  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
  *
- *  a strip mine is defined for each dimension k (a strip mine is defined as a 
+ *  a strip mine is defined for each dimension k (a strip mine is defined as a
  *  hyperslab whose size is memory manageable) according to the formula
  *
  *  (1) strip_mine_size[k ] = MIN(dimension[k ], H5TOOLS_BUFSIZE / size of memory type)
  *
- *  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures 
- *  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip 
- *  mine size k is simply defined as its dimension k, but for larger datasets the 
+ *  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures
+ *  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip
+ *  mine size k is simply defined as its dimension k, but for larger datasets the
  *  hyperslab size is still memory manageable.
- *  a cycle is done until the number of elements in the dataset is reached. In each 
- *  iteration, two parameters are defined for the function H5Sselect_hyperslab, 
+ *  a cycle is done until the number of elements in the dataset is reached. In each
+ *  iteration, two parameters are defined for the function H5Sselect_hyperslab,
  *  the start and size of each hyperslab, according to
  *
  *  (2) hyperslab_size [k] = MIN(dimension[k] - hyperslab_offset[k], strip_mine_size [k])
  *
- *  where hyperslab_offset [k] is initially set to zero, and later incremented in 
- *  hyperslab_size[k] offsets. The reason for the operation 
+ *  where hyperslab_offset [k] is initially set to zero, and later incremented in
+ *  hyperslab_size[k] offsets. The reason for the operation
  *
  *  dimension[k] - hyperslab_offset[k]
  *
- *  in (2) is that, when using the strip mine size, it assures that the "remaining" part 
+ *  in (2) is that, when using the strip mine size, it assures that the "remaining" part
  *  of the dataset that does not fill an entire strip mine is processed.
  *
- *  November 2006:  Use H5Ocopy in the copy of objects. The logic for using 
- *   H5Ocopy or not is if a change of filters or layout is requested by the user 
- *   then use read/write else use H5Ocopy. 
+ *  November 2006:  Use H5Ocopy in the copy of objects. The logic for using
+ *   H5Ocopy or not is if a change of filters or layout is requested by the user
+ *   then use read/write else use H5Ocopy.
  *
  * May, 1, 2008: Add a printing of the compression ratio of old size / new size
  *
@@ -400,7 +400,7 @@ int do_copy_objects(hid_t fidin,
                         goto error;
 
                     if((grp_out = H5Gcreate2(fidout, travt->objs[i].name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0)
-                        goto error; 
+                        goto error;
                 }
                 else {
                     if((grp_out = H5Gcreate2(fidout, travt->objs[i].name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -447,7 +447,7 @@ int do_copy_objects(hid_t fidin,
                     goto error;
                 if(H5Dclose(dset_in) < 0)
                     goto error;
-                  
+
 
                 /*-------------------------------------------------------------------------
                  * check if we should use H5Ocopy or not
@@ -481,11 +481,11 @@ int do_copy_objects(hid_t fidin,
                     if(options->use_native == 1)
                         wtype_id = h5tools_get_native_type(ftype_id);
                     else
-                        wtype_id = H5Tcopy(ftype_id); 
+                        wtype_id = H5Tcopy(ftype_id);
 
                     if((msize = H5Tget_size(wtype_id)) == 0)
                         goto error;
-                      
+
                     /*-------------------------------------------------------------------------
                      * check if the dataset creation property list has filters that
                      * are not registered in the current configuration
@@ -529,7 +529,7 @@ int do_copy_objects(hid_t fidin,
                                 dset_out = H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id, H5P_DEFAULT, dcpl_out, H5P_DEFAULT);
                             } H5E_END_TRY;
 
-                            if(dset_out == FAIL) 
+                            if(dset_out == FAIL)
                             {
                                 if(options->verbose)
                                      printf(" warning: could not create dataset <%s>. Applying original settings\n",
@@ -556,7 +556,7 @@ int do_copy_objects(hid_t fidin,
                                         goto error;
                                     if (H5Dwrite(dset_out,wtype_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf) < 0)
                                         goto error;
-                                }      
+                                }
 
                                 else /* possibly not enough memory, read/write by hyperslabs */
                                 {
@@ -577,7 +577,7 @@ int do_copy_objects(hid_t fidin,
                                     hsize_t       hs_size[H5S_MAX_RANK];  /*size this pass */
                                     hsize_t       hs_nelmts;              /*elements in request */
                                     hsize_t       zero[8];                /*vector of zeros */
-                                    int           k;          
+                                    int           k;
 
                                     /* check if we have VL data in the dataset's datatype */
                                     if (H5Tdetect_class(wtype_id, H5T_VLEN) == TRUE)
@@ -603,12 +603,12 @@ int do_copy_objects(hid_t fidin,
                                     memset(hs_offset, 0, sizeof hs_offset);
                                     memset(zero, 0, sizeof zero);
 
-                                    for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) 
+                                    for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts)
                                     {
                                         /* calculate the hyperslab size */
-                                        if (rank > 0) 
+                                        if (rank > 0)
                                         {
-                                            for (k = 0, hs_nelmts = 1; k < rank; k++) 
+                                            for (k = 0, hs_nelmts = 1; k < rank; k++)
                                             {
                                                 hs_size[k] = MIN(dims[k] - hs_offset[k], sm_size[k]);
                                                 hs_nelmts *= hs_size[k];
@@ -618,8 +618,8 @@ int do_copy_objects(hid_t fidin,
                                                 goto error;
                                             if (H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL) < 0)
                                                 goto error;
-                                        } 
-                                        else 
+                                        }
+                                        else
                                         {
                                             H5Sselect_all(f_space_id);
                                             H5Sselect_all(sm_space);
@@ -627,9 +627,9 @@ int do_copy_objects(hid_t fidin,
                                         } /* rank */
 
                                         /* read/write */
-                                        if (H5Dread(dset_in, wtype_id, sm_space, f_space_id, H5P_DEFAULT, sm_buf) < 0) 
+                                        if (H5Dread(dset_in, wtype_id, sm_space, f_space_id, H5P_DEFAULT, sm_buf) < 0)
                                             goto error;
-                                        if (H5Dwrite(dset_out, wtype_id, sm_space, f_space_id, H5P_DEFAULT, sm_buf) < 0) 
+                                        if (H5Dwrite(dset_out, wtype_id, sm_space, f_space_id, H5P_DEFAULT, sm_buf) < 0)
                                             goto error;
 
                                         /* reclaim any VL memory, if necessary */
@@ -637,7 +637,7 @@ int do_copy_objects(hid_t fidin,
                                             H5Dvlen_reclaim(wtype_id, sm_space, H5P_DEFAULT, sm_buf);
 
                                         /* calculate the next hyperslab offset */
-                                        for (k = rank, carry = 1; k > 0 && carry; --k) 
+                                        for (k = rank, carry = 1; k > 0 && carry; --k)
                                         {
                                             hs_offset[k - 1] += hs_size[k - 1];
                                             if (hs_offset[k - 1] == dims[k - 1])
@@ -661,7 +661,7 @@ int do_copy_objects(hid_t fidin,
                              * amount of compression used
                              *-------------------------------------------------------------------------
                              */
-                            if (options->verbose) 
+                            if (options->verbose)
                             {
                                 double ratio=0;
 
@@ -678,13 +678,13 @@ int do_copy_objects(hid_t fidin,
                                     a = dsize_in; b = dsize_out;
                                     if (b!=0)
                                         ratio = (double) a / (double) b;
-                                  
+
                                     print_dataset_info(dcpl_out,travt->objs[i].name,ratio,1);
                                 }
                                 else
                                     print_dataset_info(dcpl_id,travt->objs[i].name,ratio,0);
 
-                                /* print a message that the filter was not applied 
+                                /* print a message that the filter was not applied
                                 (in case there was a filter)
                                 */
                                 if ( has_filter && apply_s == 0 )
@@ -735,16 +735,16 @@ int do_copy_objects(hid_t fidin,
                  * we do not have request for filter/chunking use H5Ocopy instead
                  *-------------------------------------------------------------------------
                  */
-                else 
+                else
                 {
                     hid_t        pid;
 
                     /* create property to pass copy options */
-                    if ( (pid = H5Pcreate(H5P_OBJECT_COPY)) < 0) 
+                    if ( (pid = H5Pcreate(H5P_OBJECT_COPY)) < 0)
                         goto error;
 
                     /* set options for object copy */
-                    if(H5Pset_copy_object(pid, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) 
+                    if(H5Pset_copy_object(pid, H5O_COPY_WITHOUT_ATTR_FLAG) < 0)
                         goto error;
 
                     /*-------------------------------------------------------------------------
@@ -757,7 +757,7 @@ int do_copy_objects(hid_t fidin,
                             fidout,                    /* Destination file or group identifier  */
                             travt->objs[i].name,       /* Name of the destination object  */
                             pid,                       /* Properties which apply to the copy   */
-                            H5P_DEFAULT) < 0)            /* Properties which apply to the new hard link */              
+                            H5P_DEFAULT) < 0)            /* Properties which apply to the new hard link */
                         goto error;
 
                     /* close property */
@@ -783,7 +783,7 @@ int do_copy_objects(hid_t fidin,
 
                     if (options->verbose)
                         printf(FORMAT_OBJ,"dset",travt->objs[i].name );
-                    
+
 
                 } /* end do we have request for filter/chunking */
 
@@ -820,7 +820,7 @@ int do_copy_objects(hid_t fidin,
                 if(H5Tclose(type_out) < 0)
                     goto error;
 
-              
+
 
                 break;
 
@@ -924,52 +924,52 @@ int copy_attr(hid_t loc_in,
     H5O_info_t oinfo;             /* object info */
     int        j;
     unsigned   u;
-    
+
     if(H5Oget_info(loc_in, &oinfo) < 0)
         goto error;
-    
+
    /*-------------------------------------------------------------------------
     * copy all attributes
     *-------------------------------------------------------------------------
     */
-    
+
     for ( u = 0; u < (unsigned)oinfo.num_attrs; u++)
     {
-        
+
         buf=NULL;
-        
+
         /* open attribute */
         if((attr_id = H5Aopen_by_idx(loc_in, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
-        
+
         /* get name */
         if (H5Aget_name( attr_id, (size_t)255, name ) < 0)
             goto error;
-        
+
         /* get the file datatype  */
         if ((ftype_id = H5Aget_type( attr_id )) < 0 )
             goto error;
-        
+
         /* get the dataspace handle  */
         if ((space_id = H5Aget_space( attr_id )) < 0 )
             goto error;
-        
+
         /* get dimensions  */
         if ( (rank = H5Sget_simple_extent_dims(space_id, dims, NULL)) < 0 )
             goto error;
-        
+
         nelmts=1;
         for (j=0; j<rank; j++)
             nelmts*=dims[j];
-        
+
         if (options->use_native==1)
             wtype_id = h5tools_get_native_type(ftype_id);
         else
-            wtype_id = H5Tcopy(ftype_id); 
-        
+            wtype_id = H5Tcopy(ftype_id);
+
         if ((msize=H5Tget_size(wtype_id))==0)
             goto error;
-        
+
        /*-------------------------------------------------------------------------
         * object references are a special case
         * we cannot just copy the buffers, but instead we recreate the reference
@@ -977,18 +977,18 @@ int copy_attr(hid_t loc_in,
         * the referenced objects
         *-------------------------------------------------------------------------
         */
-        
+
         if (H5T_REFERENCE==H5Tget_class(wtype_id))
         {
             ;
         }
-        else 
+        else
         {
           /*-------------------------------------------------------------------------
            * read to memory
            *-------------------------------------------------------------------------
            */
-            
+
             buf = (void *)HDmalloc((size_t)(nelmts * msize));
             if(buf == NULL) {
                 error_msg(progname, "cannot read into memory\n" );
@@ -996,46 +996,46 @@ int copy_attr(hid_t loc_in,
             }
             if(H5Aread(attr_id, wtype_id, buf) < 0)
                 goto error;
-            
+
            /*-------------------------------------------------------------------------
             * copy
             *-------------------------------------------------------------------------
             */
-            
+
             if((attr_out = H5Acreate2(loc_out, name, ftype_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                 goto error;
             if(H5Awrite(attr_out, wtype_id, buf) < 0)
                 goto error;
-            
+
             /*close*/
             if(H5Aclose(attr_out) < 0)
                 goto error;
-            
-            
+
+
             if(buf)
                 free(buf);
-            
+
         } /*H5T_REFERENCE*/
-        
-        
+
+
         if(options->verbose)
             printf(FORMAT_OBJ_ATTR, "attr", name);
-        
+
         /*-------------------------------------------------------------------------
          * close
          *-------------------------------------------------------------------------
          */
-        
+
         if (H5Tclose(ftype_id) < 0) goto error;
         if (H5Tclose(wtype_id) < 0) goto error;
         if (H5Sclose(space_id) < 0) goto error;
         if (H5Aclose(attr_id) < 0) goto error;
-        
+
     } /* u */
-    
-    
+
+
     return 0;
-    
+
 error:
     H5E_BEGIN_TRY {
         H5Tclose(ftype_id);
@@ -1075,27 +1075,27 @@ static void print_dataset_info(hid_t dcpl_id,
     size_t       cd_nelmts;      /* filter client number of values */
     char         f_objname[256];    /* filter objname */
     int          i;
-    
-    
+
+
     strcpy(strfilter,"\0");
-    
+
     /* get information about input filters */
     if((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
         return;
-    
+
     for(i = 0; i < nfilters; i++) {
         cd_nelmts = NELMTS(cd_values);
-        
+
         filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
             cd_values, sizeof(f_objname), f_objname, NULL);
-        
+
         switch(filtn) {
         default:
             break;
-            
+
         case H5Z_FILTER_DEFLATE:
             strcat(strfilter,"GZIP ");
-            
+
 #if defined (PRINT_DEBUG)
             {
                 unsigned level=cd_values[0];
@@ -1104,10 +1104,10 @@ static void print_dataset_info(hid_t dcpl_id,
             }
 #endif
             break;
-            
+
         case H5Z_FILTER_SZIP:
             strcat(strfilter,"SZIP ");
-            
+
 #if defined (PRINT_DEBUG)
             {
                 unsigned options_mask=cd_values[0]; /* from dcpl, not filt*/
@@ -1120,29 +1120,29 @@ static void print_dataset_info(hid_t dcpl_id,
                     strcpy(temp,"NN) ");
             }
             strcat(strfilter,temp);
-            
+
 #endif
-            
+
             break;
-            
+
         case H5Z_FILTER_SHUFFLE:
             strcat(strfilter,"SHUF ");
             break;
-            
+
         case H5Z_FILTER_FLETCHER32:
             strcat(strfilter,"FLET ");
             break;
-            
+
         case H5Z_FILTER_NBIT:
             strcat(strfilter,"NBIT ");
             break;
-            
+
         case H5Z_FILTER_SCALEOFFSET:
             strcat(strfilter,"SCALEOFFSET ");
             break;
         } /* switch */
     }/*i*/
-    
+
     if(!pr)
         printf(FORMAT_OBJ,"dset",objname );
     else
@@ -1157,13 +1157,13 @@ static void print_dataset_info(hid_t dcpl_id,
 }
 
 /*-------------------------------------------------------------------------
- * Function: copy_user_block 
+ * Function: copy_user_block
  *
  * Purpose: copy user block from one file to another
  *
  * Return: 0, ok, -1 no
  *
- * Programmer: Peter Cao 
+ * Programmer: Peter Cao
  *
  * Date: October, 25, 2007
  *
@@ -1237,6 +1237,6 @@ done:
     if(outfid > 0)
         HDclose(outfid);
 
-    return status;    
+    return status;
 }
 
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 98ef07e..cd4693e 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -41,10 +41,10 @@ int aux_find_obj(const char* name,          /* object name from traverse list */
          *obj =  options->op_tbl->objs[i];
          return i;
      }
-     
+
      pdest  = strstr(name,options->op_tbl->objs[i].path);
      result = (int)(pdest - name);
-     
+
      /* found at position 1, meaning without '/' */
      if( pdest != NULL && result==1 )
      {
@@ -72,19 +72,19 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
                    pack_opt_t *options,         /* repack options */
                    pack_info_t *obj /*OUT*/)    /* info about object to filter */
 {
-    
+
     int  idx, i;
     pack_info_t tmp;
-    
+
     init_packobject(&tmp);
-    
+
     idx = aux_find_obj(name,options,&tmp);
-    
+
     /* name was on input */
     if (idx>=0)
     {
-        
-        
+
+
         /* applying to all objects */
         if (options->all_layout)
         {
@@ -114,9 +114,9 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
             default:
                 break;
             }/*switch*/
-            
+
         }
-        
+
         /* applying to all objects */
         if (options->all_filter)
         {
@@ -132,16 +132,16 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
                 tmp.filter[i] = options->op_tbl->objs[idx].filter[i];
             }
         }
-        
-        
+
+
     } /* if idx */
-    
-    
+
+
     /* no input name */
-    
+
     else
     {
-        
+
         if (options->all_filter)
         {
             int k;
@@ -167,11 +167,11 @@ int aux_assign_obj(const char* name,            /* object name from traverse lis
             }/*switch*/
         }
     }
-    
+
     *obj = tmp;
     return 1;
-    
-}       
+
+}
 
 
 /*-------------------------------------------------------------------------
@@ -206,40 +206,40 @@ int apply_filters(const char* name,    /* object name from traverse list */
     pack_info_t  obj;
 
     *has_filter = 0;
-    
+
     if (rank==0) /* scalar dataset, do not apply */
         return 0;
-    
+
    /*-------------------------------------------------------------------------
     * initialize the assigment object
     *-------------------------------------------------------------------------
     */
     init_packobject(&obj);
-    
+
    /*-------------------------------------------------------------------------
     * find options
     *-------------------------------------------------------------------------
     */
     if (aux_assign_obj(name,options,&obj)==0)
         return 0;
-    
+
     /* get information about input filters */
     if ((nfilters = H5Pget_nfilters(dcpl_id))<0)
         return -1;
-    
+
    /*-------------------------------------------------------------------------
     * check if we have filters in the pipeline
     * we want to replace them with the input filters
     * only remove if we are inserting new ones
     *-------------------------------------------------------------------------
     */
-    if (nfilters && obj.nfilters ) 
+    if (nfilters && obj.nfilters )
     {
         *has_filter = 1;
         if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0)
             return -1;
     }
-    
+
    /*-------------------------------------------------------------------------
     * check if there is an existent chunk
     * read it only if there is not a requested layout
@@ -249,7 +249,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
     {
         if ((layout = H5Pget_layout(dcpl_id))<0)
             return -1;
-        
+
         if (layout==H5D_CHUNKED)
         {
             if ((rank = H5Pget_chunk(dcpl_id,NELMTS(chsize),chsize/*out*/))<0)
@@ -260,7 +260,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
                 obj.chunk.chunk_lengths[i] = chsize[i];
         }
     }
-    
+
     /*-------------------------------------------------------------------------
     * the type of filter and additional parameter
     * type can be one of the filters
@@ -273,10 +273,10 @@ int apply_filters(const char* name,    /* object name from traverse list */
     * H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
     *-------------------------------------------------------------------------
     */
-    
+
     if (obj.nfilters)
     {
-        
+
    /*-------------------------------------------------------------------------
     * filters require CHUNK layout; if we do not have one define a default
     *-------------------------------------------------------------------------
@@ -287,14 +287,14 @@ int apply_filters(const char* name,    /* object name from traverse list */
             for (i=0; i<rank; i++)
                 obj.chunk.chunk_lengths[i] = dims[i];
         }
-        
+
         for ( i=0; i<obj.nfilters; i++)
         {
             switch (obj.filter[i].filtn)
             {
             default:
                 break;
-                
+
            /*-------------------------------------------------------------------------
             * H5Z_FILTER_DEFLATE       1 , deflation like gzip
             *-------------------------------------------------------------------------
@@ -302,7 +302,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
             case H5Z_FILTER_DEFLATE:
                 {
                     unsigned     aggression;     /* the deflate level */
-                    
+
                     aggression = obj.filter[i].cd_values[0];
                     /* set up for deflated data */
                     if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
@@ -311,7 +311,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
                         return -1;
                 }
                 break;
-                
+
            /*-------------------------------------------------------------------------
             * H5Z_FILTER_SZIP       4 , szip compression
             *-------------------------------------------------------------------------
@@ -320,19 +320,19 @@ int apply_filters(const char* name,    /* object name from traverse list */
                 {
                     unsigned  options_mask;
                     unsigned  pixels_per_block;
-                    
+
                     options_mask     = obj.filter[i].cd_values[0];
                     pixels_per_block = obj.filter[i].cd_values[1];
-                    
+
                     /* set up for szip data */
                     if(H5Pset_chunk(dcpl_id,obj.chunk.rank,obj.chunk.chunk_lengths)<0)
                         return -1;
                     if (H5Pset_szip(dcpl_id,options_mask,pixels_per_block)<0)
                         return -1;
-                    
+
                 }
                 break;
-                
+
            /*-------------------------------------------------------------------------
             * H5Z_FILTER_SHUFFLE    2 , shuffle the data
             *-------------------------------------------------------------------------
@@ -343,7 +343,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
                 if (H5Pset_shuffle(dcpl_id)<0)
                     return -1;
                 break;
-                
+
            /*-------------------------------------------------------------------------
             * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
             *-------------------------------------------------------------------------
@@ -368,15 +368,15 @@ int apply_filters(const char* name,    /* object name from traverse list */
              * H5Z_FILTER_SCALEOFFSET , scale+offset compression
              *-------------------------------------------------------------------------
              */
-                
+
             case H5Z_FILTER_SCALEOFFSET:
                 {
                     H5Z_SO_scale_type_t scale_type;
                     int                 scale_factor;
-                    
+
                     scale_type   = obj.filter[i].cd_values[0];
                     scale_factor = obj.filter[i].cd_values[1];
-                    
+
                     if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
                         return -1;
                     if (H5Pset_scaleoffset(dcpl_id,scale_type,scale_factor)<0)
@@ -385,21 +385,21 @@ int apply_filters(const char* name,    /* object name from traverse list */
                 break;
             } /* switch */
         }/*i*/
-        
+
     }
     /*obj.nfilters*/
-    
+
     /*-------------------------------------------------------------------------
     * layout
     *-------------------------------------------------------------------------
     */
-    
+
     if (obj.layout>=0)
     {
         /* a layout was defined */
         if (H5Pset_layout(dcpl_id, obj.layout)<0)
             return -1;
-        
+
         if (H5D_CHUNKED==obj.layout) { /* set up chunk */
             if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
                 return -1;
@@ -408,7 +408,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
             if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY)<0)
                 return -1;
         }
-        
+
     }
 
  return 0;
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index d512923..37652d9 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -70,9 +70,9 @@ static struct long_options l_opts[] = {
  *
  * Comments:
  *
- * Modifications: 
+ * Modifications:
  *  July 2004: Introduced the extra EC or NN option for SZIP
- *  October 2006: Added a new switch -n, that allows to write the dataset 
+ *  October 2006: Added a new switch -n, that allows to write the dataset
  *                using a native type. The default to write is the file type.
  *
  * Modification:
@@ -83,7 +83,7 @@ static struct long_options l_opts[] = {
  *   PVN, November 28, 2007
  *    added support for multiple global filters
  *   PVN, May 16, 2008
- *    added  backward compatibility for -i infile -o outfile 
+ *    added  backward compatibility for -i infile -o outfile
   *-------------------------------------------------------------------------
  */
 int main(int argc, char **argv)
@@ -93,15 +93,15 @@ int main(int argc, char **argv)
     pack_opt_t    options;            /*the global options */
     int           ret;
     int           i;
-    
+
     /* initialize options  */
     h5repack_init (&options,0);
 
     /* detect -i or -o for file names */
     for ( i = 1; i < argc; i++)
     {
-        
-        if (strcmp(argv[i], "-i") == 0) 
+
+        if (strcmp(argv[i], "-i") == 0)
         {
             has_i_o = 1;
         }
@@ -113,104 +113,104 @@ int main(int argc, char **argv)
 
     if (has_i_o)
     {
-        
+
         for ( i = 1; i < argc; i++)
         {
-            if (strcmp(argv[i], "-h") == 0) 
+            if (strcmp(argv[i], "-h") == 0)
             {
                 usage(progname);
                 exit(0);
             }
-            if (strcmp(argv[i], "-i") == 0) 
+            if (strcmp(argv[i], "-i") == 0)
             {
                 infile = argv[++i];
             }
-            else if (strcmp(argv[i], "-o") == 0) 
+            else if (strcmp(argv[i], "-o") == 0)
             {
                 outfile = argv[++i];
             }
-            else if (strcmp(argv[i], "-v") == 0) 
+            else if (strcmp(argv[i], "-v") == 0)
             {
                 options.verbose = 1;
             }
-            else if (strcmp(argv[i], "-f") == 0) 
+            else if (strcmp(argv[i], "-f") == 0)
             {
-                
+
                 /* add the -f filter option */
                 if (h5repack_addfilter(argv[i+1],&options)<0)
                 {
                     error_msg(progname, "in parsing filter\n");
                     exit(1);
                 }
-                
+
                 /* jump to next */
                 ++i;
             }
-            else if (strcmp(argv[i], "-l") == 0) 
+            else if (strcmp(argv[i], "-l") == 0)
             {
-                
+
                 /* parse the -l layout option */
                 if (h5repack_addlayout(argv[i+1],&options)<0)
                 {
                     error_msg(progname, "in parsing layout\n");
                     exit(1);
                 }
-                
+
                 /* jump to next */
                 ++i;
             }
-            
-            else if (strcmp(argv[i], "-m") == 0) 
+
+            else if (strcmp(argv[i], "-m") == 0)
             {
                 options.threshold = parse_number(argv[i+1]);
-                if ((int)options.threshold==-1) 
+                if ((int)options.threshold==-1)
                 {
                     error_msg(progname, "invalid treshold size <%s>\n",argv[i+1]);
                     exit(1);
                 }
                 ++i;
             }
-            
-            else if (strcmp(argv[i], "-e") == 0) 
+
+            else if (strcmp(argv[i], "-e") == 0)
             {
                 read_info(argv[++i],&options);
             }
-            else if (strcmp(argv[i], "-n") == 0) 
+            else if (strcmp(argv[i], "-n") == 0)
             {
                 options.use_native = 1;
             }
 
-            else if (strcmp(argv[i], "-L") == 0) 
+            else if (strcmp(argv[i], "-L") == 0)
             {
                 options.latest = 1;
             }
-            else if (strcmp(argv[i], "-c") == 0) 
+            else if (strcmp(argv[i], "-c") == 0)
             {
                 options.grp_compact = atoi( argv[++i] );
                 if (options.grp_compact>0)
-                    options.latest = 1; /* must use latest format */ 
+                    options.latest = 1; /* must use latest format */
             }
-            else if (strcmp(argv[i], "-d") == 0) 
+            else if (strcmp(argv[i], "-d") == 0)
             {
                 options.grp_indexed = atoi( argv[++i] );
                 if (options.grp_indexed>0)
-                    options.latest = 1; /* must use latest format */ 
+                    options.latest = 1; /* must use latest format */
             }
-            else if (strcmp(argv[i], "-s") == 0) 
+            else if (strcmp(argv[i], "-s") == 0)
             {
-                
+
                 char *s = argv[++i];
                 int idx = 0;
                 int ssize = 0;
                 char *msgPtr = strchr( s, ':');
                 options.latest = 1; /* must use latest format */
-                if (msgPtr == NULL) 
+                if (msgPtr == NULL)
                 {
                     ssize = atoi( s );
                     for (idx=0; idx<5; idx++)
-                        options.msg_size[idx] = ssize; 
+                        options.msg_size[idx] = ssize;
                 }
-                else 
+                else
                 {
                     char msgType[10];
                     strcpy(msgType, msgPtr+1);
@@ -231,66 +231,66 @@ int main(int argc, char **argv)
                     else if (strncmp(msgType, "attr",4) == 0) {
                         options.msg_size[4] = ssize;
                     }
-                }            
-                
+                }
+
             }
 
-  
-            
+
+
             else if (argv[i][0] == '-') {
                 error_msg(progname, " - is not a valid argument\n");
                 usage(progname);
                 exit(1);
             }
         }
-        
+
         if (infile == NULL || outfile == NULL)
         {
             error_msg(progname, "file names missing\n");
             usage(progname);
             exit(1);
         }
-        
+
     }
-    
+
     else
-        
+
     {
-        
+
         parse_command_line(argc, argv, &options);
-        
-        
-        
-        if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL ) 
+
+
+
+        if ( argv[ opt_ind ] != NULL && argv[ opt_ind + 1 ] != NULL )
         {
             infile = argv[ opt_ind ];
             outfile = argv[ opt_ind + 1 ];
-            
+
             if ( strcmp( infile, outfile ) == 0 )
             {
                 error_msg(progname, "file names cannot be the same\n");
                 usage(progname);
                 exit(EXIT_FAILURE);
-                
+
             }
         }
-        
+
         else
         {
             error_msg(progname, "file names missing\n");
             usage(progname);
             exit(EXIT_FAILURE);
         }
-        
+
     }
 
-  
+
     /* pack it */
     ret=h5repack(infile,outfile,&options);
-    
+
     /* free tables */
     h5repack_end(&options);
-    
+
     if (ret==-1)
         return 1;
     else
@@ -326,7 +326,7 @@ static void usage(const char *prog)
  printf("   -e M, --file=M          Name of file M with the -f and -l options\n");
  printf("   -f FILT, --filter=FILT  Filter type\n");
  printf("   -l LAYT, --layout=LAYT  Layout type\n");
- 
+
  printf("\n");
 
  printf("  T - is an integer greater than 1, size of dataset in bytes \n");
@@ -416,13 +416,13 @@ static void usage(const char *prog)
 
 static void parse_command_line(int argc, const char* argv[], pack_opt_t* options)
 {
-    
+
     int opt;
-   
+
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) 
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF)
     {
-        switch ((char)opt) 
+        switch ((char)opt)
         {
         case 'h':
             usage(progname);
@@ -434,7 +434,7 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options
             options->verbose = 1;
             break;
         case 'f':
-            
+
             /* parse the -f filter option */
             if (h5repack_addfilter( opt_arg, options)<0)
             {
@@ -443,7 +443,7 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options
             }
             break;
         case 'l':
-            
+
             /* parse the -l layout option */
             if (h5repack_addlayout( opt_arg, options)<0)
             {
@@ -451,18 +451,18 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options
                 exit(EXIT_FAILURE);
             }
             break;
-            
+
 
         case 'm':
 
             options->threshold = parse_number( opt_arg );
-            if ((int)options->threshold==-1) 
+            if ((int)options->threshold==-1)
             {
                 error_msg(progname, "invalid treshold size <%s>\n", opt_arg );
                 exit(EXIT_FAILURE);
             }
             break;
-        
+
         case 'e':
             read_info( opt_arg, options);
             break;
@@ -470,19 +470,19 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options
         case 'n':
             options->use_native = 1;
             break;
-        
+
         case 'L':
-            options->latest = 1; 
+            options->latest = 1;
             break;
-        
+
         case 'c':
 
             options->grp_compact = atoi( opt_arg );
             if (options->grp_compact>0)
                 options->latest = 1; /* must use latest format */
             break;
-        
-        
+
+
         case 'd':
 
             options->grp_indexed = atoi( opt_arg );
@@ -493,18 +493,18 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options
         case 's':
 
             {
-                
+
                 int idx = 0;
                 int ssize = 0;
                 char *msgPtr = strchr( opt_arg, ':');
                 options->latest = 1; /* must use latest format */
-                if (msgPtr == NULL) 
+                if (msgPtr == NULL)
                 {
                     ssize = atoi( opt_arg );
                     for (idx=0; idx<5; idx++)
-                        options->msg_size[idx] = ssize; 
+                        options->msg_size[idx] = ssize;
                 }
-                else 
+                else
                 {
                     char msgType[10];
                     strcpy(msgType, msgPtr+1);
@@ -525,27 +525,27 @@ static void parse_command_line(int argc, const char* argv[], pack_opt_t* options
                     else if (strncmp(msgType, "attr", 4) == 0) {
                         options->msg_size[4] = ssize;
                     }
-                }            
+                }
             }
-            
+
             break;
 
         } /* switch */
-        
-        
+
+
     } /* while */
-    
+
     /* check for file names to be processed */
-    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL) 
+    if (argc <= opt_ind || argv[ opt_ind + 1 ] == NULL)
     {
         error_msg(progname, "missing file names\n");
         usage(progname);
         exit(EXIT_FAILURE);
     }
-      
 
- 
- 
+
+
+
 }
 
 /*-------------------------------------------------------------------------
@@ -569,7 +569,7 @@ int parse_number(char *str)
     int         n;
     char        c;
     size_t      len=strlen(str);
-    
+
     for ( i=0; i<len; i++)
     {
         c = str[i];
@@ -601,7 +601,7 @@ static
 void read_info(const char *filename,
                pack_opt_t *options)
 {
-    
+
     char stype[10];
     char comp_info[1024];
     FILE *fp;
@@ -609,33 +609,33 @@ void read_info(const char *filename,
     int  i, rc=1;
     char  *srcdir = getenv("srcdir"); /* the source directory */
     char  data_file[512]="";          /* buffer to hold name of existing file */
-    
+
     /* compose the name of the file to open, using the srcdir, if appropriate */
     if (srcdir){
         strcpy(data_file,srcdir);
         strcat(data_file,"/");
     }
     strcat(data_file,filename);
-    
-    
+
+
     if ((fp = fopen(data_file, "r")) == (FILE *)NULL) {
         error_msg(progname, "cannot open options file %s\n", filename);
         exit(1);
     }
-    
+
     /* cycle until end of file reached */
     while( 1 )
     {
         rc=fscanf(fp, "%s", stype);
         if (rc==-1)
             break;
-        
+
        /*-------------------------------------------------------------------------
         * filter
         *-------------------------------------------------------------------------
         */
         if (strcmp(stype,"-f") == 0) {
-            
+
             /* find begining of info */
             i=0; c='0';
             while( c!=' ' )
@@ -654,7 +654,7 @@ void read_info(const char *filename,
                 if (c==10 /*eol*/) break;
             }
             comp_info[i-1]='\0'; /*cut the last " */
-            
+
             if (h5repack_addfilter(comp_info,options)==-1){
                 error_msg(progname, "could not add compression option\n");
                 exit(1);
@@ -665,7 +665,7 @@ void read_info(const char *filename,
         *-------------------------------------------------------------------------
         */
         else if (strcmp(stype,"-l") == 0) {
-            
+
             /* find begining of info */
             i=0; c='0';
             while( c!=' ' )
@@ -684,7 +684,7 @@ void read_info(const char *filename,
                 if (c==10 /*eol*/) break;
             }
             comp_info[i-1]='\0'; /*cut the last " */
-            
+
             if (h5repack_addlayout(comp_info,options)==-1){
                 error_msg(progname, "could not add chunck option\n");
                 exit(1);
@@ -699,7 +699,7 @@ void read_info(const char *filename,
             exit(1);
         }
     }
-    
+
     fclose(fp);
     return;
 }
diff --git a/tools/h5repack/h5repack_opttable.c b/tools/h5repack/h5repack_opttable.c
index 4fd450d..bdcae02 100644
--- a/tools/h5repack/h5repack_opttable.c
+++ b/tools/h5repack/h5repack_opttable.c
@@ -33,7 +33,7 @@ extern char  *progname;
 void init_packobject(pack_info_t *obj)
 {
     int j, k;
-    
+
     strcpy(obj->path,"\0");
     for ( j=0; j<H5_REPACK_MAX_NFILTERS; j++)
     {
@@ -87,7 +87,7 @@ static void aux_tblinsert_layout(pack_opttbl_t *table,
                                  pack_info_t *pack)
 {
     int k;
-    
+
     table->objs[I].layout = pack->layout;
     if (H5D_CHUNKED==pack->layout)
     {
@@ -122,7 +122,7 @@ static void aux_tblinsert_layout(pack_opttbl_t *table,
 static int aux_inctable(pack_opttbl_t *table, int n_objs )
 {
     unsigned int i;
-    
+
     table->size += n_objs;
     table->objs = (pack_info_t*)realloc(table->objs, table->size * sizeof(pack_info_t));
     if (table->objs==NULL) {
@@ -154,7 +154,7 @@ int options_table_init( pack_opttbl_t **tbl )
         error_msg(progname, "not enough memory for options table\n");
         return -1;
     }
-    
+
     table->size   = 30;
     table->nelems = 0;
     table->objs   = (pack_info_t*) malloc(table->size * sizeof(pack_info_t));
@@ -162,12 +162,12 @@ int options_table_init( pack_opttbl_t **tbl )
         error_msg(progname, "not enough memory for options table\n");
         return -1;
     }
-    
+
     for ( i=0; i<table->size; i++)
     {
         init_packobject(&table->objs[i]);
     }
-    
+
     *tbl = table;
     return 0;
 }
@@ -207,14 +207,14 @@ int options_add_layout( obj_list_t *obj_list,
 {
     unsigned int i, I;
     int          j, added=0, found=0;
-    
+
     /* increase the size of the collection by N_OBJS if necessary */
     if (table->nelems+n_objs >= table->size)
     {
         if (aux_inctable(table,n_objs)<0)
             return -1;
     }
-    
+
     /* search if this object is already in the table; "path" is the key */
     if (table->nelems>0)
     {
@@ -242,7 +242,7 @@ int options_add_layout( obj_list_t *obj_list,
                     }
                 } /* if */
             } /* i */
-            
+
             if (found==0)
             {
                 /* keep the grow in a temp var */
@@ -266,7 +266,7 @@ int options_add_layout( obj_list_t *obj_list,
             }
         } /* j */
     }
-    
+
     /* first time insertion */
     else
     {
@@ -277,12 +277,12 @@ int options_add_layout( obj_list_t *obj_list,
             added++;
             strcpy(table->objs[I].path,obj_list[j].obj);
             aux_tblinsert_layout(table,I,pack);
-            
+
         }
     }
-    
+
     table->nelems+= added;
-    
+
     return 0;
 }
 
@@ -303,17 +303,17 @@ int options_add_filter(obj_list_t *obj_list,
                        filter_info_t filt,
                        pack_opttbl_t *table )
 {
-    
+
     unsigned int i, I;
     int          j, added=0, found=0;
-    
+
     /* increase the size of the collection by N_OBJS if necessary */
     if (table->nelems+n_objs >= table->size)
     {
         if (aux_inctable(table,n_objs)<0)
             return -1;
     }
-    
+
     /* search if this object is already in the table; "path" is the key */
     if (table->nelems>0)
     {
@@ -332,7 +332,7 @@ int options_add_filter(obj_list_t *obj_list,
                     break;
                 } /* if */
             } /* i */
-            
+
             if (found==0)
             {
                 /* keep the grow in a temp var */
@@ -356,7 +356,7 @@ int options_add_filter(obj_list_t *obj_list,
             }
         } /* j */
     }
-    
+
     /* first time insertion */
     else
     {
@@ -369,9 +369,9 @@ int options_add_filter(obj_list_t *obj_list,
             aux_tblinsert_filter(table,I,filt);
         }
     }
-    
+
     table->nelems+= added;
-    
+
     return 0;
 }
 
@@ -389,7 +389,7 @@ pack_info_t* options_get_object( const char *path,
                                  pack_opttbl_t *table )
 {
     unsigned int i;
-    
+
     for ( i = 0; i < table->nelems; i++)
     {
         /* found it */
@@ -398,7 +398,7 @@ pack_info_t* options_get_object( const char *path,
             return (&table->objs[i]);
         }
     }
-    
+
     return NULL;
 }
 
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index 2475068..f7188bf 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -67,12 +67,12 @@ obj_list_t* parse_filter(const char *str,
     char        smask[3];
     obj_list_t* obj_list=NULL;
     unsigned    pixels_per_block;
-    
-    
+
+
     /* initialize compression  info */
     memset(filt,0,sizeof(filter_info_t));
     *is_glb = 0;
-    
+
     /* check for the end of object list and number of objects */
     for ( i = 0, n = 0; i < len; i++)
     {
@@ -86,14 +86,14 @@ obj_list_t* parse_filter(const char *str,
             n++;
         }
     }
-    
+
     if (end_obj==-1) /* missing : */
-    { 
+    {
         /* apply to all objects */
         options->all_filter=1;
         *is_glb = 1;
     }
-    
+
     n++;
     obj_list = malloc(n*sizeof(obj_list_t));
     if (obj_list==NULL)
@@ -102,7 +102,7 @@ obj_list_t* parse_filter(const char *str,
         return NULL;
     }
     *n_objs=n;
-    
+
     /* get object list */
     for ( j = 0, k = 0, n = 0; j < end_obj; j++, k++)
     {
@@ -124,8 +124,8 @@ obj_list_t* parse_filter(const char *str,
         error_msg(progname, "input Error: Invalid compression type in <%s>\n",str);
         exit(1);
     }
-    
-    
+
+
     /* get filter additional parameters */
     m=0;
     for ( i=end_obj+1, k=0, j=0; i<len; i++,k++)
@@ -135,9 +135,9 @@ obj_list_t* parse_filter(const char *str,
         if ( c=='=' || i==len-1)
         {
             if ( c=='=') /*one more parameter */
-            {      
+            {
                 scomp[k]='\0';     /*cut space */
-                
+
                /*-------------------------------------------------------------------------
                 * H5Z_FILTER_SZIP
                 * szip has the format SZIP=<pixels per block,coding>
@@ -182,14 +182,14 @@ obj_list_t* parse_filter(const char *str,
                                     error_msg(progname, "szip mask must be 'NN' or 'EC' \n");
                                     exit(1);
                                 }
-                                
-                                
+
+
                             }
                         }
-                        
+
                     }  /* u */
                 } /*if */
-                
+
                   /*-------------------------------------------------------------------------
                   * H5Z_FILTER_SCALEOFFSET
                   * scaleoffset has the format SOFF=<scale_factor,scale_type>
@@ -204,7 +204,7 @@ obj_list_t* parse_filter(const char *str,
                   *  SOFF=3,DF
                   *-------------------------------------------------------------------------
                 */
-                
+
                 else if (strcmp(scomp,"SOFF")==0)
                 {
                     l=-1; /* mask index check */
@@ -242,19 +242,19 @@ obj_list_t* parse_filter(const char *str,
                                     error_msg(progname, "scale type must be 'IN' or 'DS' \n");
                                     exit(1);
                                 }
-                                
+
                             }
                         }
-                        
+
                     }  /* u */
                 } /*if */
-                
-                
+
+
                /*-------------------------------------------------------------------------
                 * all other filters
                 *-------------------------------------------------------------------------
                 */
-                
+
                 else
                 {
                     /* here we could have 1 or 2 digits  */
@@ -268,16 +268,16 @@ obj_list_t* parse_filter(const char *str,
                         }
                         stype[m]=c;
                     } /* u */
-                    
+
                     stype[m]='\0';
                 } /*if */
-                
-                
-                
+
+
+
                 filt->cd_values[j++]=atoi(stype);
                 i+=m; /* jump */
    }
-   else if (i==len-1) 
+   else if (i==len-1)
    { /*no more parameters */
        scomp[k+1]='\0';
        no_param=1;
@@ -287,7 +287,7 @@ obj_list_t* parse_filter(const char *str,
    * translate from string to filter symbol
    *-------------------------------------------------------------------------
    */
-   
+
   /*-------------------------------------------------------------------------
    * H5Z_FILTER_NONE
    *-------------------------------------------------------------------------
@@ -297,7 +297,7 @@ obj_list_t* parse_filter(const char *str,
        filt->filtn=H5Z_FILTER_NONE;
        filt->cd_nelmts = 0;
    }
-   
+
   /*-------------------------------------------------------------------------
    * H5Z_FILTER_DEFLATE
    *-------------------------------------------------------------------------
@@ -306,14 +306,14 @@ obj_list_t* parse_filter(const char *str,
    {
        filt->filtn=H5Z_FILTER_DEFLATE;
        filt->cd_nelmts = 1;
-       if (no_param) 
+       if (no_param)
        { /*no more parameters, GZIP must have parameter */
            if (obj_list) free(obj_list);
            error_msg(progname, "missing compression parameter in <%s>\n",str);
            exit(1);
        }
    }
-   
+
   /*-------------------------------------------------------------------------
    * H5Z_FILTER_SZIP
    *-------------------------------------------------------------------------
@@ -322,14 +322,14 @@ obj_list_t* parse_filter(const char *str,
    {
        filt->filtn=H5Z_FILTER_SZIP;
        filt->cd_nelmts = 2;
-       if (no_param) 
+       if (no_param)
        { /*no more parameters, SZIP must have parameter */
            if (obj_list) free(obj_list);
            error_msg(progname, "missing compression parameter in <%s>\n",str);
            exit(1);
        }
    }
-   
+
    /*-------------------------------------------------------------------------
    * H5Z_FILTER_SHUFFLE
    *-------------------------------------------------------------------------
@@ -383,7 +383,7 @@ obj_list_t* parse_filter(const char *str,
    {
        filt->filtn=H5Z_FILTER_SCALEOFFSET;
        filt->cd_nelmts = 2;
-       if (no_param) 
+       if (no_param)
        { /*no more parameters, SOFF must have parameter */
            if (obj_list) free(obj_list);
            error_msg(progname, "missing compression parameter in <%s>\n",str);
@@ -397,12 +397,12 @@ obj_list_t* parse_filter(const char *str,
    }
   }
  } /*i*/
- 
+
   /*-------------------------------------------------------------------------
    * check valid parameters
    *-------------------------------------------------------------------------
    */
-   
+
    switch (filt->filtn)
    {
 
@@ -410,7 +410,7 @@ obj_list_t* parse_filter(const char *str,
    * H5Z_FILTER_DEFLATE
    *-------------------------------------------------------------------------
    */
-       
+
    case H5Z_FILTER_DEFLATE:
        if (filt->cd_values[0]<0 || filt->cd_values[0]>9 )
        {
@@ -419,27 +419,27 @@ obj_list_t* parse_filter(const char *str,
            exit(1);
        }
        break;
-       
+
   /*-------------------------------------------------------------------------
    * H5Z_FILTER_SZIP
    *-------------------------------------------------------------------------
    */
-       
+
    case H5Z_FILTER_SZIP:
        pixels_per_block=filt->cd_values[0];
-       if ((pixels_per_block%2)==1) 
+       if ((pixels_per_block%2)==1)
        {
            if (obj_list) free(obj_list);
            error_msg(progname, "pixels_per_block is not even in <%s>\n",str);
            exit(1);
        }
-       if (pixels_per_block>H5_SZIP_MAX_PIXELS_PER_BLOCK) 
+       if (pixels_per_block>H5_SZIP_MAX_PIXELS_PER_BLOCK)
        {
            if (obj_list) free(obj_list);
            error_msg(progname, "pixels_per_block is too large in <%s>\n",str);
            exit(1);
        }
-       if ( (strcmp(smask,"NN")!=0) && (strcmp(smask,"EC")!=0) ) 
+       if ( (strcmp(smask,"NN")!=0) && (strcmp(smask,"EC")!=0) )
        {
            if (obj_list) free(obj_list);
            error_msg(progname, "szip mask must be 'NN' or 'EC' \n");
@@ -461,7 +461,7 @@ obj_list_t* parse_filter(const char *str,
        }
        break;
    };
-   
+
    return obj_list;
 }
 
@@ -501,12 +501,12 @@ obj_list_t* parse_layout(const char *str,
     char        sobj[MAX_NC_NAME];
     char        sdim[10];
     char        slayout[10];
-    
-    
+
+
     memset(sdim, '\0', sizeof(sdim));
     memset(sobj, '\0', sizeof(sobj));
     memset(slayout, '\0', sizeof(slayout));
-    
+
     /* check for the end of object list and number of objects */
     for ( i=0, n=0; i<len; i++)
     {
@@ -520,11 +520,11 @@ obj_list_t* parse_layout(const char *str,
             n++;
         }
     }
-    
+
     if (end_obj==-1) { /* missing : chunk all */
         options->all_layout=1;
     }
-    
+
     n++;
     obj_list=malloc(n*sizeof(obj_list_t));
     if (obj_list==NULL)
@@ -533,7 +533,7 @@ obj_list_t* parse_layout(const char *str,
         return NULL;
     }
     *n_objs=n;
-    
+
     /* get object list */
     for ( j=0, k=0, n=0; j<end_obj; j++,k++)
     {
@@ -548,7 +548,7 @@ obj_list_t* parse_layout(const char *str,
             k=-1;
         }
     }
-    
+
     /* nothing after : */
     if (end_obj+1==(int)len)
     {
@@ -556,7 +556,7 @@ obj_list_t* parse_layout(const char *str,
         error_msg(progname, "in parse layout, no characters after : in <%s>\n",str);
         exit(1);
     }
-    
+
     /* get layout info */
     for ( j=end_obj+1, n=0; n<=5; j++,n++)
     {
@@ -580,30 +580,30 @@ obj_list_t* parse_layout(const char *str,
             slayout[n]=c;
         }
     } /* j */
-    
-    
+
+
     if ( pack->layout==H5D_CHUNKED )
     {
-        
+
     /*-------------------------------------------------------------------------
     * get chunk info
     *-------------------------------------------------------------------------
         */
         k=0;
-        
+
         if (j>(int)len)
         {
             if (obj_list) free(obj_list);
             error_msg(progname, "in parse layout,  <%s> Chunk dimensions missing\n",str);
             exit(1);
         }
-        
+
         for ( i=j, c_index=0; i<len; i++)
         {
             c = str[i];
             sdim[k]=c;
             k++; /*increment sdim index */
-            
+
             if (!isdigit(c) && c!='x'
                 && c!='N' && c!='O' && c!='N' && c!='E'
                 ){
@@ -612,7 +612,7 @@ obj_list_t* parse_layout(const char *str,
                     sdim,str);
                 exit(1);
             }
-            
+
             if ( c=='x' || i==len-1)
             {
                 if ( c=='x') {
@@ -648,11 +648,11 @@ obj_list_t* parse_layout(const char *str,
                 } /*if */
             } /*if c=='x' || i==len-1 */
         } /*i*/
-        
-        
+
+
     } /*H5D_CHUNKED*/
-    
-    
+
+
     return obj_list;
 }
 
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 465fdbf..fed4499 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -27,7 +27,7 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
  *
  * Purpose: verify if filters and layout in the input file match the output file
  *
- * Return: 
+ * Return:
  *  1 match
  *  0 do not match
  * -1 error
@@ -39,7 +39,7 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
  *  Separate into 3 cases
  *  1) no filter input, get all datasets and compare DCPLs. TO DO
  *  2) filter input on selected datasets, get each one trough OBJ and match
- *  3) filter input on all datasets, get all objects and match 
+ *  3) filter input on all datasets, get all objects and match
  *
  *-------------------------------------------------------------------------
  */
@@ -55,16 +55,16 @@ int h5repack_verify(const char *fname,
     unsigned int i;
     trav_table_t *travt = NULL;
     int          ok = 1;
-    
+
     /* open the file */
     if((fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0 )
         return -1;
-    
-    for(i = 0; i < options->op_tbl->nelems; i++) 
+
+    for(i = 0; i < options->op_tbl->nelems; i++)
     {
         char* name = options->op_tbl->objs[i].path;
         pack_info_t *obj = &options->op_tbl->objs[i];
-        
+
        /*-------------------------------------------------------------------------
         * open
         *-------------------------------------------------------------------------
@@ -77,7 +77,7 @@ int h5repack_verify(const char *fname,
             goto error;
         if((tid = H5Dget_type(did)) < 0)
             goto error;
-       
+
        /*-------------------------------------------------------------------------
         * filter check
         *-------------------------------------------------------------------------
@@ -85,14 +85,14 @@ int h5repack_verify(const char *fname,
         if(has_filters(pid, tid, obj->nfilters, obj->filter) <= 0)
                 ok = 0;
 
-       
+
        /*-------------------------------------------------------------------------
         * layout check
         *-------------------------------------------------------------------------
         */
         if((obj->layout != -1) && (has_layout(pid, obj) == 0))
             ok = 0;
-        
+
        /*-------------------------------------------------------------------------
         * close
         *-------------------------------------------------------------------------
@@ -105,32 +105,32 @@ int h5repack_verify(const char *fname,
             goto error;
         if (H5Tclose(tid) < 0)
             goto error;
-        
+
     }
-    
-    
+
+
    /*-------------------------------------------------------------------------
     * check for the "all" objects option
     *-------------------------------------------------------------------------
     */
-    
-    if(options->all_filter == 1 || options->all_layout == 1) 
+
+    if(options->all_filter == 1 || options->all_layout == 1)
     {
-        
+
         /* init table */
         trav_table_init(&travt);
-        
+
         /* get the list of objects in the file */
         if(h5trav_gettable(fid, travt) < 0)
             goto error;
-        
-        for(i = 0; i < travt->nobjs; i++) 
+
+        for(i = 0; i < travt->nobjs; i++)
         {
             char *name = travt->objs[i].name;
-            
-            if(travt->objs[i].type == H5TRAV_TYPE_DATASET) 
+
+            if(travt->objs[i].type == H5TRAV_TYPE_DATASET)
             {
-                
+
                /*-------------------------------------------------------------------------
                 * open
                 *-------------------------------------------------------------------------
@@ -143,23 +143,23 @@ int h5repack_verify(const char *fname,
                     goto error;
                 if((tid = H5Dget_type(did)) < 0)
                     goto error;
-                
+
                /*-------------------------------------------------------------------------
                 * filter check
                 *-------------------------------------------------------------------------
                 */
                 if(options->all_filter == 1)
                 {
-                    
+
                     if(has_filters(pid, tid, options->n_filter_g, options->filter_g) <= 0)
                         ok = 0;
                 }
-                
+
                /*-------------------------------------------------------------------------
                 * layout check
                 *-------------------------------------------------------------------------
                 */
-                if(options->all_layout == 1) 
+                if(options->all_layout == 1)
                 {
                     pack_info_t pack;
                     init_packobject(&pack);
@@ -168,8 +168,8 @@ int h5repack_verify(const char *fname,
                     if(has_layout(pid, &pack) == 0)
                         ok = 0;
                 }
-                
-                
+
+
                /*-------------------------------------------------------------------------
                 * close
                 *-------------------------------------------------------------------------
@@ -183,23 +183,23 @@ int h5repack_verify(const char *fname,
                 if (H5Tclose(tid) < 0)
                     goto error;
             } /* if */
-            
+
         } /* i */
-        
+
         /* free table */
         trav_table_free(travt);
     }
-    
+
    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
-    
+
     if (H5Fclose(fid) < 0)
         return -1;
-    
+
     return ok;
-    
+
 error:
     H5E_BEGIN_TRY {
         H5Pclose(pid);
@@ -240,26 +240,26 @@ int has_layout(hid_t pid,
     int          nfilters;       /* number of filters */
     int          rank;           /* rank */
     int          i;              /* index */
-    
+
     /* if no information about the input layout is requested return exit */
     if (obj==NULL)
         return 1;
-    
+
     /* check if we have filters in the input object */
     if ((nfilters = H5Pget_nfilters(pid)) < 0)
         return -1;
-    
+
     /* a non chunked layout was requested on a filtered object; avoid the test */
     if (nfilters && obj->layout!=H5D_CHUNKED)
         return 1;
-    
+
     /* get layout */
     if ((layout = H5Pget_layout(pid)) < 0)
         return -1;
-    
+
     if (obj->layout != layout)
         return 0;
-    
+
     if (layout==H5D_CHUNKED)
     {
         if ((rank = H5Pget_chunk(pid,NELMTS(chsize),chsize/*out*/)) < 0)
@@ -270,7 +270,7 @@ int has_layout(hid_t pid,
             if (chsize[i] != obj->chunk.chunk_lengths[i])
                 return 0;
     }
-    
+
     return 1;
 }
 
@@ -301,16 +301,16 @@ int h5repack_cmpdcpl(const char *fname1,
     trav_table_t  *travt2=NULL;
     int           ret=1;
     unsigned int  i;
-    
+
    /*-------------------------------------------------------------------------
-    * open the files 
+    * open the files
     *-------------------------------------------------------------------------
     */
-    
+
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
-        
+
         /* Open the files */
         if ((fid1=H5Fopen(fname1,H5F_ACC_RDONLY,H5P_DEFAULT)) < 0 )
         {
@@ -325,7 +325,7 @@ int h5repack_cmpdcpl(const char *fname1,
         }
         /* enable error reporting */
     } H5E_END_TRY;
-    
+
    /*-------------------------------------------------------------------------
     * get file table list of objects
     *-------------------------------------------------------------------------
@@ -336,16 +336,16 @@ int h5repack_cmpdcpl(const char *fname1,
         goto error;
     if(h5trav_gettable(fid2, travt2) < 0)
         goto error;
-    
-    
+
+
    /*-------------------------------------------------------------------------
     * traverse the suppplied object list
     *-------------------------------------------------------------------------
     */
-    
-    for(i = 0; i < travt1->nobjs; i++) 
+
+    for(i = 0; i < travt1->nobjs; i++)
     {
-        if(travt1->objs[i].type == H5TRAV_TYPE_DATASET) 
+        if(travt1->objs[i].type == H5TRAV_TYPE_DATASET)
         {
             if((dset1 = H5Dopen2(fid1, travt1->objs[i].name, H5P_DEFAULT)) < 0)
                 goto error;
@@ -355,20 +355,20 @@ int h5repack_cmpdcpl(const char *fname1,
                 goto error;
             if((dcpl2 = H5Dget_create_plist(dset2)) < 0)
                 goto error;
-            
+
            /*-------------------------------------------------------------------------
             * compare the property lists
             *-------------------------------------------------------------------------
             */
             if((ret = H5Pequal(dcpl1, dcpl2)) < 0)
                 goto error;
-            
-            if(ret == 0) 
+
+            if(ret == 0)
             {
                 error_msg(progname, "property lists for <%s> are different\n",travt1->objs[i].name);
                 goto error;
             }
-            
+
            /*-------------------------------------------------------------------------
             * close
             *-------------------------------------------------------------------------
@@ -383,31 +383,31 @@ int h5repack_cmpdcpl(const char *fname1,
                 goto error;
         } /*if*/
     } /*i*/
-    
+
    /*-------------------------------------------------------------------------
     * free
     *-------------------------------------------------------------------------
     */
-    
+
     trav_table_free(travt1);
     trav_table_free(travt2);
-    
+
    /*-------------------------------------------------------------------------
     * close
     *-------------------------------------------------------------------------
     */
-    
+
     H5Fclose(fid1);
     H5Fclose(fid2);
     return ret;
-    
+
    /*-------------------------------------------------------------------------
     * error
     *-------------------------------------------------------------------------
     */
-    
+
 error:
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         H5Pclose(dcpl1);
         H5Pclose(dcpl2);
@@ -419,7 +419,7 @@ error:
         trav_table_free(travt2);
     } H5E_END_TRY;
     return -1;
-    
+
 }
 
 
@@ -430,7 +430,7 @@ error:
  *  from user input are present in the property list PID obtained from
  *  the output file
  *
- * Return: 
+ * Return:
  *  1 match
  *  0 do not match
  * -1 error
@@ -452,14 +452,14 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
     char          f_name[256];    /* filter name */
     size_t        size;           /* type size */
     unsigned      i, j;           /* index */
-  
+
     /* get information about filters */
     if((nfilters_dcpl = H5Pget_nfilters(pid)) < 0)
         return -1;
-  
+
     /* if we do not have filters and the requested filter is NONE, return 1 */
-    if(!nfilters_dcpl && 
-        nfilters == 1 && 
+    if(!nfilters_dcpl &&
+        nfilters == 1 &&
         filter[0].filtn == H5Z_FILTER_NONE )
         return 1;
 
@@ -472,12 +472,12 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
      *-------------------------------------------------------------------------
      */
 
-    for( i = 0; i < nfilters_dcpl; i++) 
+    for( i = 0; i < nfilters_dcpl; i++)
     {
         cd_nelmts = NELMTS(cd_values);
         filtn = H5Pget_filter2(pid, i, &filt_flags, &cd_nelmts,
             cd_values, sizeof(f_name), f_name, NULL);
-      
+
         /* filter ID */
         if (filtn != filter[i].filtn)
             return 0;
@@ -485,24 +485,24 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
         /* compare client data values. some filters do return local values */
         switch (filtn)
         {
-            
+
         case H5Z_FILTER_SHUFFLE:
-            
+
             /* 1 private client value is returned by DCPL */
             if ( cd_nelmts != H5Z_SHUFFLE_TOTAL_NPARMS && filter[i].cd_nelmts != H5Z_SHUFFLE_USER_NPARMS )
                 return 0;
-            
+
             /* get dataset's type size */
             if((size = H5Tget_size(tid)) <= 0)
                 return -1;
-            
+
             /* the private client value holds the dataset's type size */
             if ( size != cd_values[0] )
                 return 0;
-                        
-            
+
+
             break;
-            
+
         case H5Z_FILTER_SZIP:
 
             /* 4 private client values are returned by DCPL */
@@ -512,61 +512,61 @@ static int has_filters(hid_t pid, hid_t tid, unsigned nfilters, filter_info_t *f
             /* "User" parameter for pixels-per-block (index 1) */
             if ( cd_values[H5Z_SZIP_PARM_PPB] != filter[i].cd_values[H5Z_SZIP_PARM_PPB] )
                 return 0;
-           
-            
+
+
             break;
-            
+
         case H5Z_FILTER_NBIT:
-           
+
             /* only client data values number of values checked */
             if ( H5Z_NBIT_USER_NPARMS != filter[i].cd_nelmts)
                 return 0;
-           
-            
-            
+
+
+
             break;
-            
+
         case H5Z_FILTER_SCALEOFFSET:
 
             /* only client data values checked */
-            for( j = 0; j < H5Z_SCALEOFFSET_USER_NPARMS; j++) 
+            for( j = 0; j < H5Z_SCALEOFFSET_USER_NPARMS; j++)
             {
                 if (cd_values[j] != filter[i].cd_values[j])
                 {
-                    return 0; 
+                    return 0;
                 }
-                
+
             }
-                
-            
+
+
             break;
-            
+
         /* for these filters values must match, no local values set in DCPL */
         case H5Z_FILTER_FLETCHER32:
         case H5Z_FILTER_DEFLATE:
-            
+
             if ( cd_nelmts != filter[i].cd_nelmts)
                 return 0;
-            
-            for( j = 0; j < cd_nelmts; j++) 
+
+            for( j = 0; j < cd_nelmts; j++)
             {
                 if (cd_values[j] != filter[i].cd_values[j])
                 {
-                    return 0; 
+                    return 0;
                 }
-                
+
             }
-            
-            
-            
+
+
+
             break;
-            
-            
-            
+
+
+
         } /* switch */
 
     }
- 
+
     return 1;
 }
 
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 3796179..fc1656b 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -878,11 +878,11 @@ if (szip_can_encode) {
 
 /*-------------------------------------------------------------------------
  * the following tests assume the input files have filters
- * FNAME7     
- * FNAME8     
- * FNAME9     
- * FNAME10    
- * FNAME11    
+ * FNAME7
+ * FNAME8
+ * FNAME9
+ * FNAME10
+ * FNAME11
  *-------------------------------------------------------------------------
  */
 
@@ -1339,7 +1339,7 @@ if (szip_can_encode) {
  PASSED();
 
 /*-------------------------------------------------------------------------
- * test --latest options 
+ * test --latest options
  *-------------------------------------------------------------------------
  */
  TESTING("    latest file format options");
@@ -1371,7 +1371,7 @@ if (szip_can_encode) {
 
   TESTING("    several global filters");
 
-#if defined (H5_HAVE_FILTER_DEFLATE) && defined (H5_HAVE_FILTER_SHUFFLE) 
+#if defined (H5_HAVE_FILTER_DEFLATE) && defined (H5_HAVE_FILTER_SHUFFLE)
 
  if (h5repack_init (&pack_options, 0) < 0)
   GOERROR;
@@ -1400,12 +1400,12 @@ if (szip_can_encode) {
  */
  {
      hid_t       fapl;
-     
+
      /* setup */
      h5_reset();
      fapl = h5_fileaccess();
-     h5_cleanup(H5REPACK_FILENAMES, fapl); 
-     
+     h5_cleanup(H5REPACK_FILENAMES, fapl);
+
  }
 
  puts("All h5repack tests passed.");
@@ -2142,7 +2142,7 @@ int make_nbit(hid_t loc_id)
 #endif
 
 /*-------------------------------------------------------------------------
- * close 
+ * close
  *-------------------------------------------------------------------------
  */
  if(H5Sclose(sid) < 0)
@@ -2675,7 +2675,7 @@ out:
 }
 
 /*-------------------------------------------------------------------------
- * Function: make_big 
+ * Function: make_big
  *
  * Purpose: used in test read by hyperslabs. Creates a 128MB dataset.
  *  Only 1 1024Kb hyperslab is written.
@@ -2703,7 +2703,7 @@ int make_big(hid_t loc_id)
  hs_start[0] = 0;
  hs_size[0]  = 1024;
 
- /* create */ 
+ /* create */
  if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
   goto out;
  if(H5Pset_fill_value(dcpl, H5T_NATIVE_SCHAR, &fillvalue) < 0)
@@ -2714,19 +2714,19 @@ int make_big(hid_t loc_id)
   goto out;
  if((did = H5Dcreate2(loc_id, "dset", H5T_NATIVE_SCHAR, f_sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
   goto out;
- if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0) 
+ if((m_sid = H5Screate_simple(1, hs_size, hs_size)) < 0)
   goto out;
- if((tid = H5Dget_type(did)) < 0) 
+ if((tid = H5Dget_type(did)) < 0)
   goto out;
  if((size = H5Tget_size(tid))<=0)
   goto out;
- 
+
  /* initialize buffer to 0  */
  buf=(signed  char *) calloc( nelmts, size);
- 
- if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0) 
+
+ if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0)
   goto out;
- if (H5Dwrite (did,H5T_NATIVE_SCHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0) 
+ if (H5Dwrite (did,H5T_NATIVE_SCHAR,m_sid,f_sid,H5P_DEFAULT,buf) < 0)
   goto out;
 
  free(buf);
@@ -2757,7 +2757,7 @@ out:
 
 
 /*-------------------------------------------------------------------------
- * Function: make_external 
+ * Function: make_external
  *
  * Purpose: create a external dataset
  *
@@ -2776,11 +2776,11 @@ int make_external(hid_t loc_id)
 
  cur_size[0] = max_size[0] = 2;
  size = max_size[0] * sizeof(int);
- 
- /* create */ 
+
+ /* create */
  if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
   goto out;
- if(H5Pset_external(dcpl, H5REPACK_EXTFILE, (off_t)0, size) < 0) 
+ if(H5Pset_external(dcpl, H5REPACK_EXTFILE, (off_t)0, size) < 0)
   goto out;
  if((sid = H5Screate_simple(1,cur_size, max_size)) < 0)
   goto out;
@@ -4754,5 +4754,5 @@ out:
  return -1;
 }
 
- 
+
 
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index f03efd7..5a9d3f1 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -309,14 +309,14 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
  * Programmer: Quincey Koziol
  *             Tuesday, August 16, 2005
  *
- * Modifications: Refactored code from the walk_function 
- *                EIP, Wednesday, August 16, 2006 
+ * Modifications: Refactored code from the walk_function
+ *                EIP, Wednesday, August 16, 2006
  *
  *		  Vailin Choi 12 July 2007
  *		  1. Gathered storage info for btree and heap
  *		     (groups and attributes)
  *		  2. Gathered info for attributes
- *		  
+ *
  *		  Vailin Choi 14 July 2007
  *		  Cast "num_objs" and "num_attrs" to size_t
  *		  Due to the -Mbounds problem for the pgi-32 bit compiler on indexing
@@ -389,8 +389,8 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
  * Programmer:    Quincey Koziol
  *                Tuesday, August 16, 2005
  *
- * Modifications: Refactored code from the walk_function 
- *                EIP, Wednesday, August 16, 2006 
+ * Modifications: Refactored code from the walk_function
+ *                EIP, Wednesday, August 16, 2006
  *
  *                Vailin Choi 12 July 2007
  *                1. Gathered storage info for btree and heap
@@ -813,7 +813,7 @@ print_file_info(const iter_t *iter)
 
     return 0;
 }
-        
+
 
 /*-------------------------------------------------------------------------
  * Function: print_file_metadata
@@ -841,9 +841,9 @@ static herr_t
 print_file_metadata(const iter_t *iter)
 {
     printf("Object header size: (total/unused)\n");
-    HDfprintf(stdout, "\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size, 
+    HDfprintf(stdout, "\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
                                              iter->group_ohdr_info.free_size);
-    HDfprintf(stdout, "\tDatasets: %Hu/%Hu\n", iter->dset_ohdr_info.total_size, 
+    HDfprintf(stdout, "\tDatasets: %Hu/%Hu\n", iter->dset_ohdr_info.total_size,
                                                iter->dset_ohdr_info.free_size);
 
     printf("Storage information:\n");
@@ -911,7 +911,7 @@ print_group_info(const iter_t *iter)
     power = 1;
     for(u = 1; u < iter->group_nbins; u++) {
         if(iter->group_bins[u] > 0) {
-           printf("\t# of groups of size %lu - %lu: %lu\n", power, (power * 10) - 1, 
+           printf("\t# of groups of size %lu - %lu: %lu\n", power, (power * 10) - 1,
                     iter->group_bins[u]);
            total += iter->group_bins[u];
         } /* end if */
@@ -961,7 +961,7 @@ print_attr_info(const iter_t *iter)
     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, 
+           printf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
                     iter->attr_bins[u]);
            total += iter->attr_bins[u];
         } /* end if */
@@ -1012,7 +1012,7 @@ print_dataset_info(const iter_t *iter)
         total = 0;
         for(u = 0; u < SIZE_SMALL_DSETS; u++) {
             if(iter->small_dset_dims[u] > 0) {
-                printf("\t\t# of dataset dimensions of size %u: %lu\n", u, 
+                printf("\t\t# of dataset dimensions of size %u: %lu\n", u,
                          iter->small_dset_dims[u]);
                 total += iter->small_dset_dims[u];
             } /* end if */
@@ -1030,7 +1030,7 @@ print_dataset_info(const iter_t *iter)
             power = 1;
             for(u = 1; u < iter->dset_dim_nbins; u++) {
                 if(iter->dset_dim_bins[u] > 0) {
-                    printf("\t\t# of datasets of size %lu - %lu: %lu\n", power, (power * 10) - 1, 
+                    printf("\t\t# of datasets of size %lu - %lu: %lu\n", power, (power * 10) - 1,
                              iter->dset_dim_bins[u]);
                     total += iter->dset_dim_bins[u];
                 } /* end if */
@@ -1067,7 +1067,7 @@ print_dataset_info(const iter_t *iter)
                 H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
                 printf("\tDataset datatype #%u:\n", u);
                 printf("\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, 
+                printf("\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;
@@ -1143,7 +1143,7 @@ print_object_statistics(const char *name)
 /*-------------------------------------------------------------------------
  * Function: print_statistics
  *
- * Purpose: Prints statistics 
+ * Purpose: Prints statistics
  *
  * Return: Success: 0
  *
@@ -1159,7 +1159,7 @@ print_object_statistics(const char *name)
 static void
 print_statistics(const char *name, const iter_t *iter)
 {
-    if(display_object) 
+    if(display_object)
         print_object_statistics(name);
     else
         print_file_statistics(iter);
@@ -1199,7 +1199,7 @@ main(int argc, const char *argv[])
 
     /* Initialize iter structure */
     iter_init(&iter, fid);
-    
+
     /* Get storge info for SOHM's btree/list/heap and superblock extension */
     if(H5Fget_info(fid, &finfo) < 0)
 	warn_msg(progname, "Unable to retrieve SOHM info\n");
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index ef644d8..250226e 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -32,7 +32,7 @@
 #define NUM_GRPS 	35000
 #define NUM_ATTRS	100
 
-/* 
+/*
  * Generate 1.8 HDF5 file
  * with NUM_GRPS groups
  * with NUM_ATTRS attributes on the dataset
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 25e5f83..f0c6048 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -53,7 +53,7 @@ print_objname (diff_opt_t * options, hsize_t nfound)
 /*-------------------------------------------------------------------------
  * Function: do_print_objname
  *
- * Purpose: print object name 
+ * Purpose: print object name
  *
  *-------------------------------------------------------------------------
  */
@@ -195,7 +195,7 @@ hsize_t h5diff(const char *fname1,
 
     HDmemset(filenames, 0, 1024 * 2);
 
-    if(options->m_quiet && (options->m_verbose || options->m_report)) 
+    if(options->m_quiet && (options->m_verbose || options->m_report))
     {
         printf("Error: -q (quiet mode) cannot be added to verbose or report modes\n");
         options->err_stat=1;
@@ -208,10 +208,10 @@ hsize_t h5diff(const char *fname1,
     */
 
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         /* open the files */
-        if((file1_id = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) 
+        if((file1_id = H5Fopen(fname1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         {
             printf("h5diff: <%s>: unable to open file\n", fname1);
             options->err_stat = 1;
@@ -223,7 +223,7 @@ hsize_t h5diff(const char *fname1,
 #endif
             goto out;
         } /* end if */
-        if((file2_id = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) 
+        if((file2_id = H5Fopen(fname2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         {
             printf("h5diff: <%s>: unable to open file\n", fname2);
             options->err_stat = 1;
@@ -264,7 +264,7 @@ hsize_t h5diff(const char *fname1,
     * object name was supplied
     *-------------------------------------------------------------------------
     */
-    if( objname1 ) 
+    if( objname1 )
     {
 #ifdef H5_HAVE_PARALLEL
         if(g_Parallel)
@@ -273,13 +273,13 @@ hsize_t h5diff(const char *fname1,
 #endif
         assert(objname2);
         options->cmn_objs = 1; /* eliminate warning */
-        nfound = diff_compare(file1_id, 
-                              fname1, 
-                              objname1, 
+        nfound = diff_compare(file1_id,
+                              fname1,
+                              objname1,
                               info1,
-                              file2_id, 
-                              fname2, 
-                              objname2, 
+                              file2_id,
+                              fname2,
+                              objname2,
                               info2,
                               options);
     } /* end if */
@@ -289,14 +289,14 @@ hsize_t h5diff(const char *fname1,
     *-------------------------------------------------------------------------
     */
 
-    else 
+    else
     {
 #ifdef H5_HAVE_PARALLEL
-        if(g_Parallel) 
+        if(g_Parallel)
         {
             int i;
 
-            if((HDstrlen(fname1) > 1024) || (HDstrlen(fname2) > 1024)) 
+            if((HDstrlen(fname1) > 1024) || (HDstrlen(fname2) > 1024))
             {
                 fprintf(stderr, "The parallel diff only supports path names up to 1024 characters\n");
                 MPI_Abort(MPI_COMM_WORLD, 0);
@@ -311,10 +311,10 @@ hsize_t h5diff(const char *fname1,
         } /* end if */
 #endif
 
-        nfound = diff_match(file1_id, 
-                            info1, 
-                            file2_id, 
-                            info2, 
+        nfound = diff_match(file1_id,
+                            info1,
+                            file2_id,
+                            info2,
                             options);
     } /* end else */
 
@@ -323,7 +323,7 @@ hsize_t h5diff(const char *fname1,
 
 out:
     /* close */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         H5Fclose(file1_id);
         H5Fclose(file2_id);
@@ -347,7 +347,7 @@ out:
  *
  * Date: May 9, 2003
  *
- * Modifications: 
+ * Modifications:
  *
  * Jan 2005 Leon Arber, larber@uiuc.edu
  *    Added support for parallel diffing
@@ -355,7 +355,7 @@ out:
  * Aug 2008 Pedro Vicente, pvn@hdfgroup.org
  *    Added a "contents" mode check.
  *    If this mode is present, objects in both files must match (must be exactly the same)
- *    If this does not happen, the tool returns an error code of 1 
+ *    If this does not happen, the tool returns an error code of 1
  *    (instead of the success code of 0)
  *
  *-------------------------------------------------------------------------
@@ -381,7 +381,7 @@ hsize_t diff_match(hid_t file1_id,
 
     curr1 = 0;
     curr2 = 0;
-    while(curr1 < info1->nused && curr2 < info2->nused) 
+    while(curr1 < info1->nused && curr2 < info2->nused)
     {
         /* criteria is string compare */
         int cmp = HDstrcmp(info1->paths[curr1].path, info2->paths[curr2].path);
@@ -394,14 +394,14 @@ hsize_t diff_match(hid_t file1_id,
             curr1++;
             curr2++;
         } /* end if */
-        else if(cmp < 0) 
+        else if(cmp < 0)
         {
             infile[0] = 1;
             infile[1] = 0;
             trav_table_addflags(infile, info1->paths[curr1].path, info1->paths[curr1].type, table);
             curr1++;
         } /* end else-if */
-        else 
+        else
         {
             infile[0] = 0;
             infile[1] = 1;
@@ -413,7 +413,7 @@ hsize_t diff_match(hid_t file1_id,
     /* list1 did not end */
     infile[0] = 1;
     infile[1] = 0;
-    while(curr1 < info1->nused) 
+    while(curr1 < info1->nused)
     {
         trav_table_addflags(infile, info1->paths[curr1].path, info1->paths[curr1].type, table);
         curr1++;
@@ -422,7 +422,7 @@ hsize_t diff_match(hid_t file1_id,
     /* list2 did not end */
     infile[0] = 0;
     infile[1] = 1;
-    while(curr2 < info2->nused) 
+    while(curr2 < info2->nused)
     {
         trav_table_addflags(infile, info2->paths[curr2].path, info2->paths[curr2].type, table);
         curr2++;
@@ -432,7 +432,7 @@ hsize_t diff_match(hid_t file1_id,
     * print the list
     *-------------------------------------------------------------------------
     */
-    if(options->m_verbose) 
+    if(options->m_verbose)
     {
         printf("\n");
         printf("file1     file2\n");
@@ -458,22 +458,22 @@ hsize_t diff_match(hid_t file1_id,
     {
         /* assume equal contents initially */
         options->contents = 1;
-        
+
         /* number of different objects */
         if ( info1->nused != info2->nused )
         {
             options->contents = 0;
         }
-        
-        
-        for( i = 0; i < table->nobjs; i++) 
+
+
+        for( i = 0; i < table->nobjs; i++)
         {
-            if( table->objs[i].flags[0] != table->objs[i].flags[1] ) 
+            if( table->objs[i].flags[0] != table->objs[i].flags[1] )
             {
                 options->contents = 0;
             }
         }
-        
+
     }
 
 
@@ -495,12 +495,12 @@ hsize_t diff_match(hid_t file1_id,
     HDmemset(workerTasks, 1, (g_nTasks - 1));
 #endif
 
-    for(i = 0; i < table->nobjs; i++) 
+    for(i = 0; i < table->nobjs; i++)
     {
-        if( table->objs[i].flags[0] && table->objs[i].flags[1]) 
+        if( table->objs[i].flags[0] && table->objs[i].flags[1])
         {
             options->cmn_objs = 1;
-            if(!g_Parallel) 
+            if(!g_Parallel)
             {
                 nfound += diff(file1_id,
                         table->objs[i].name,
@@ -508,7 +508,7 @@ hsize_t diff_match(hid_t file1_id,
                         table->objs[i].name, options, table->objs[i].type);
             } /* end if */
 #ifdef H5_HAVE_PARALLEL
-            else 
+            else
             {
                 int workerFound = 0;
 
@@ -522,7 +522,7 @@ hsize_t diff_match(hid_t file1_id,
                 */
 
                 /*Set up args to pass to worker task. */
-                if(HDstrlen(table->objs[i].name) > 255) 
+                if(HDstrlen(table->objs[i].name) > 255)
                 {
                     printf("The parallel diff only supports object names up to 255 characters\n");
                     MPI_Abort(MPI_COMM_WORLD, 0);
@@ -534,7 +534,7 @@ hsize_t diff_match(hid_t file1_id,
 
                 h5diffdebug2("busyTasks=%d\n", busyTasks);
                 /* if there are any outstanding print requests, let's handle one. */
-                if(busyTasks > 0) 
+                if(busyTasks > 0)
                 {
                     int incomingMessage;
 
@@ -542,7 +542,7 @@ hsize_t diff_match(hid_t file1_id,
                     MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &incomingMessage, &Status);
 
                     /* first block*/
-                    if(incomingMessage) 
+                    if(incomingMessage)
                     {
                         workerTasks[Status.MPI_SOURCE - 1] = 1;
                         MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
@@ -552,7 +552,7 @@ hsize_t diff_match(hid_t file1_id,
                     } /* end if */
 
                     /* check to see if the print token was returned. */
-                    if(!havePrintToken) 
+                    if(!havePrintToken)
                     {
                         /* If we don't have the token, someone is probably sending us output */
                         print_incoming_data();
@@ -572,11 +572,11 @@ hsize_t diff_match(hid_t file1_id,
                     } /* end if */
 
                     /* check to see if anyone needs the print token. */
-                    if(havePrintToken) 
+                    if(havePrintToken)
                     {
                         /* check incoming queue for print token requests */
                         MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &incomingMessage, &Status);
-                        if(incomingMessage) 
+                        if(incomingMessage)
                         {
                             MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
                             MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
@@ -588,9 +588,9 @@ hsize_t diff_match(hid_t file1_id,
                 /* check array of tasks to see which ones are free.
                 * Manager task never does work, so freeTasks[0] is really
                 * worker task 0. */
-                for(n = 1; (n < g_nTasks) && !workerFound; n++) 
+                for(n = 1; (n < g_nTasks) && !workerFound; n++)
                 {
-                    if(workerTasks[n-1]) 
+                    if(workerTasks[n-1])
                     {
                         /* send file id's and names to first free worker */
                         MPI_Send(&args, sizeof(args), MPI_BYTE, n, MPI_TAG_ARGS, MPI_COMM_WORLD);
@@ -605,7 +605,7 @@ hsize_t diff_match(hid_t file1_id,
                 } /* end for */
 
                 h5diffdebug2("workerfound is %d \n", workerFound);
-                if(!workerFound) 
+                if(!workerFound)
                 {
                     /* if they were all busy, we've got to wait for one free up
                      *  before we can move on.  If we don't have the token, some
@@ -613,15 +613,15 @@ hsize_t diff_match(hid_t file1_id,
                      * return it.
                      */
 
-                    if(!havePrintToken) 
+                    if(!havePrintToken)
                     {
-                        while(!havePrintToken) 
+                        while(!havePrintToken)
                         {
                             int incomingMessage;
 
                             print_incoming_data();
                             MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
-                            if(incomingMessage) 
+                            if(incomingMessage)
                             {
                                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                                 havePrintToken = 1;
@@ -633,26 +633,26 @@ hsize_t diff_match(hid_t file1_id,
                         } /* end while */
                     } /* end if */
                     /* if we do have the token, check for task to free up, or wait for a task to request it */
-                    else 
+                    else
                     {
                         /* But first print all the data in our incoming queue */
                         print_incoming_data();
                         MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
-                        if(Status.MPI_TAG == MPI_TAG_DONE) 
+                        if(Status.MPI_TAG == MPI_TAG_DONE)
                         {
                             MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
                             nfound += nFoundbyWorker.nfound;
                             options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
                             MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
                         } /* end if */
-                        else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST) 
+                        else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
                         {
                             int incomingMessage;
 
                             MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
                             MPI_Send(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
 
-                            do 
+                            do
                             {
                                 MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
 
@@ -664,7 +664,7 @@ hsize_t diff_match(hid_t file1_id,
                             options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
                             MPI_Send(&args, sizeof(args), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_ARGS, MPI_COMM_WORLD);
                         } /* end else-if */
-                        else 
+                        else
                         {
                             printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG);
                             MPI_Abort(MPI_COMM_WORLD, 0);
@@ -679,20 +679,20 @@ hsize_t diff_match(hid_t file1_id,
     h5diffdebug("done with for loop\n");
 
 #ifdef H5_HAVE_PARALLEL
-    if(g_Parallel) 
+    if(g_Parallel)
     {
         /* make sure all tasks are done */
-        while(busyTasks > 0) 
+        while(busyTasks > 0)
         {
             MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &Status);
-            if(Status.MPI_TAG == MPI_TAG_DONE) 
+            if(Status.MPI_TAG == MPI_TAG_DONE)
             {
                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
                 nfound += nFoundbyWorker.nfound;
                 options->not_cmp = options->not_cmp | nFoundbyWorker.not_cmp;
                 busyTasks--;
             } /* end if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN) 
+            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
             {
                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_DONE, MPI_COMM_WORLD, &Status);
                 nfound += nFoundbyWorker.nfound;
@@ -700,10 +700,10 @@ hsize_t diff_match(hid_t file1_id,
                 busyTasks--;
                 havePrintToken = 1;
             } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST) 
+            else if(Status.MPI_TAG == MPI_TAG_TOK_REQUEST)
             {
                 MPI_Recv(NULL, 0, MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_REQUEST, MPI_COMM_WORLD, &Status);
-                if(havePrintToken) 
+                if(havePrintToken)
                 {
                     int incomingMessage;
 
@@ -721,12 +721,12 @@ hsize_t diff_match(hid_t file1_id,
                     busyTasks--;
                 } /* end if */
                 /* someone else must have it...wait for them to return it, then give it to the task that just asked for it. */
-                else 
+                else
                 {
                     int source = Status.MPI_SOURCE;
                     int incomingMessage;
 
-                    do 
+                    do
                     {
                         MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &incomingMessage, &Status);
 
@@ -741,7 +741,7 @@ hsize_t diff_match(hid_t file1_id,
                     MPI_Send(NULL, 0, MPI_BYTE, source, MPI_TAG_PRINT_TOK, MPI_COMM_WORLD);
                 } /* end else */
             } /* end else-if */
-            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN) 
+            else if(Status.MPI_TAG == MPI_TAG_TOK_RETURN)
             {
                 MPI_Recv(&nFoundbyWorker, sizeof(nFoundbyWorker), MPI_BYTE, Status.MPI_SOURCE, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD, &Status);
                 nfound += nFoundbyWorker.nfound;
@@ -758,7 +758,7 @@ hsize_t diff_match(hid_t file1_id,
 
                 printf("%s", data);
             } /* end else-if */
-            else 
+            else
             {
                 printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG);
                 MPI_Abort(MPI_COMM_WORLD, 0);
@@ -811,10 +811,10 @@ hsize_t diff_compare(hid_t file1_id,
     int     f1 = 0;
     int     f2 = 0;
     hsize_t nfound = 0;
-    
+
     ssize_t i = h5trav_getindex (info1, obj1_name);
     ssize_t j = h5trav_getindex (info2, obj2_name);
-    
+
     if (i == -1)
     {
         parallel_print ("Object <%s> could not be found in <%s>\n", obj1_name,
@@ -832,11 +832,11 @@ hsize_t diff_compare(hid_t file1_id,
         options->err_stat = 1;
         return 0;
     }
-    
+
     /* use the name with "/" first, as obtained by iterator function */
     obj1_name = info1->paths[i].path;
     obj2_name = info2->paths[j].path;
-    
+
     /* objects are not the same type */
     if (info1->paths[i].type != info2->paths[j].type)
     {
@@ -847,14 +847,14 @@ hsize_t diff_compare(hid_t file1_id,
         options->not_cmp=1;
         return 0;
     }
-    
-    nfound = diff(file1_id, 
-                  obj1_name, 
-                  file2_id, 
-                  obj2_name, 
-                  options, 
+
+    nfound = diff(file1_id,
+                  obj1_name,
+                  file2_id,
+                  obj2_name,
+                  options,
                   info1->paths[i].type);
-    
+
     return nfound;
 }
 
@@ -880,9 +880,9 @@ hsize_t diff_compare(hid_t file1_id,
 
 hsize_t diff(hid_t file1_id,
               const char *path1,
-              hid_t file2_id, 
-              const char *path2, 
-              diff_opt_t * options, 
+              hid_t file2_id,
+              const char *path2,
+              diff_opt_t * options,
               h5trav_type_t type)
 {
     hid_t   type1_id = (-1);
@@ -891,8 +891,8 @@ hsize_t diff(hid_t file1_id,
     hid_t   grp2_id = (-1);
     int     ret;
     hsize_t nfound = 0;
-    
-    switch(type) 
+
+    switch(type)
     {
        /*-------------------------------------------------------------------------
         * H5TRAV_TYPE_DATASET
@@ -903,7 +903,7 @@ hsize_t diff(hid_t file1_id,
             * verbose, always print name
             *-------------------------------------------------------------------------
             */
-            if(options->m_verbose) 
+            if(options->m_verbose)
             {
                 if(print_objname(options, (hsize_t)1))
                     do_print_objname("dataset", path1, path2);
@@ -916,9 +916,9 @@ hsize_t diff(hid_t file1_id,
             * disabling quiet mode
             *-------------------------------------------------------------------------
             */
-            else 
+            else
             {
-                if(options->m_quiet == 0) 
+                if(options->m_quiet == 0)
                 {
                     /* shut up temporarily */
                     options->m_quiet = 1;
@@ -926,7 +926,7 @@ hsize_t diff(hid_t file1_id,
 
                     /* print again */
                     options->m_quiet = 0;
-                    if(nfound) 
+                    if(nfound)
                     {
                         if(print_objname(options,nfound))
                             do_print_objname("dataset", path1, path2);
@@ -939,7 +939,7 @@ hsize_t diff(hid_t file1_id,
                     nfound = diff_dataset(file1_id, file2_id, path1, path2, options);
             } /* end else */
             break;
-            
+
        /*-------------------------------------------------------------------------
         * H5TRAV_TYPE_NAMED_DATATYPE
         *-------------------------------------------------------------------------
@@ -949,20 +949,20 @@ hsize_t diff(hid_t file1_id,
                 goto out;
             if((type2_id = H5Topen2(file2_id, path2, H5P_DEFAULT)) < 0)
                 goto out;
-            
+
             if((ret = H5Tequal(type1_id, type2_id)) < 0)
                 goto out;
-            
+
             /* if H5Tequal is > 0 then the datatypes refer to the same datatype */
             nfound = (ret > 0) ? 0 : 1;
-            
+
             if(print_objname(options,nfound))
                 do_print_objname("datatype", path1, path2);
 
             /* always print the number of differences found in verbose mode */
             if(options->m_verbose)
                 print_found(nfound);
-            
+
             /*-------------------------------------------------------------------------
              * compare attributes
              * the if condition refers to cases when the dataset is a referenced object
@@ -970,30 +970,30 @@ hsize_t diff(hid_t file1_id,
              */
             if(path1)
                 nfound += diff_attr(type1_id, type2_id, path1, path2, options);
-            
+
             if(H5Tclose(type1_id) < 0)
                 goto out;
             if(H5Tclose(type2_id) < 0)
                 goto out;
             break;
-            
+
        /*-------------------------------------------------------------------------
         * H5TRAV_TYPE_GROUP
         *-------------------------------------------------------------------------
         */
         case H5TRAV_TYPE_GROUP:
             ret = HDstrcmp(path1, path2);
-        
+
             /* if "path1" != "path2" then the groups are "different" */
             nfound = (ret != 0) ? 1 : 0;
-            
+
             if(print_objname(options, nfound))
                 do_print_objname("group", path1, path2);
 
             /* always print the number of differences found in verbose mode */
             if(options->m_verbose)
                 print_found(nfound);
-            
+
             if((grp1_id = H5Gopen2(file1_id, path1, H5P_DEFAULT)) < 0)
                 goto out;
             if((grp2_id = H5Gopen2(file2_id, path2, H5P_DEFAULT)) < 0)
@@ -1006,14 +1006,14 @@ hsize_t diff(hid_t file1_id,
              */
             if(path1)
                 nfound += diff_attr(grp1_id, grp2_id, path1, path2, options);
-            
+
             if(H5Gclose(grp1_id) < 0)
                 goto out;
             if(H5Gclose(grp2_id) < 0)
                 goto out;
             break;
-            
-            
+
+
        /*-------------------------------------------------------------------------
         * H5TRAV_TYPE_LINK
         *-------------------------------------------------------------------------
@@ -1022,37 +1022,37 @@ hsize_t diff(hid_t file1_id,
             {
             H5L_info_t li1, li2;
             char *buf1, *buf2;
-            
+
             if(H5Lget_info(file1_id, path1, &li1, H5P_DEFAULT) < 0)
                 goto out;
             if(H5Lget_info(file1_id, path1, &li2, H5P_DEFAULT) < 0)
                 goto out;
-            
+
             buf1 = HDmalloc(li1.u.val_size);
             buf2 = HDmalloc(li2.u.val_size);
-            
+
             if(H5Lget_val(file1_id, path1, buf1, li1.u.val_size, H5P_DEFAULT) < 0)
                 goto out;
             if(H5Lget_val(file2_id, path2, buf2, li2.u.val_size, H5P_DEFAULT) < 0)
                 goto out;
-            
+
             ret = HDstrcmp(buf1, buf2);
-            
+
             /* if "buf1" != "buf2" then the links are "different" */
             nfound = (ret != 0) ? 1 : 0;
-            
+
             if(print_objname(options, nfound))
                 do_print_objname("link", path1, path2);
 
             /* always print the number of differences found in verbose mode */
             if(options->m_verbose)
                 print_found(nfound);
-            
+
             HDfree(buf1);
             HDfree(buf2);
             }
             break;
-            
+
        /*-------------------------------------------------------------------------
         * H5TRAV_TYPE_UDLINK
         *-------------------------------------------------------------------------
@@ -1060,19 +1060,19 @@ hsize_t diff(hid_t file1_id,
         case H5TRAV_TYPE_UDLINK:
             {
             H5L_info_t li1, li2;
-            
+
             if(H5Lget_info(file1_id, path1, &li1, H5P_DEFAULT) < 0)
                 goto out;
             if(H5Lget_info(file1_id, path1, &li2, H5P_DEFAULT) < 0)
                 goto out;
-            
+
             /* Only external links will have a query function registered */
             if(li1.type == H5L_TYPE_EXTERNAL && li2.type == H5L_TYPE_EXTERNAL) {
                 char *buf1, *buf2;
 
                 buf1 = HDmalloc(li1.u.val_size);
                 buf2 = HDmalloc(li2.u.val_size);
-                
+
                 if(H5Lget_val(file1_id, path1, buf1, li1.u.val_size, H5P_DEFAULT) < 0) {
                     HDfree(buf1);
                     HDfree(buf2);
@@ -1083,7 +1083,7 @@ hsize_t diff(hid_t file1_id,
                     HDfree(buf2);
                     goto out;
                 } /* end if */
-                
+
                 /* If the buffers are the same size, compare them */
                 if(li1.u.val_size == li2.u.val_size) {
                     if(H5Lget_val(file1_id, path1, buf1, li1.u.val_size, H5P_DEFAULT) < 0) {
@@ -1100,20 +1100,20 @@ hsize_t diff(hid_t file1_id,
                 }
                 else
                     ret = 1;
-                
+
                 /* if "buf1" != "buf2" then the links are "different" */
                 nfound = (ret != 0) ? 1 : 0;
-                
+
                 if(print_objname(options, nfound))
                     do_print_objname("external link", path1, path2);
-            
+
                 HDfree(buf1);
                 HDfree(buf2);
             } /* end if */
             else {
                 /* If one or both of these links isn't an external link, we can only
                  * compare information from H5Lget_info since we don't have a query
-                 * function registered for them. 
+                 * function registered for them.
                  *
                  * If the link classes or the buffer length are not the
                  * same, the links are "different"
@@ -1122,17 +1122,17 @@ hsize_t diff(hid_t file1_id,
                     nfound = 1;
                 else
                     nfound = 0;
-                
+
                 if (print_objname (options, nfound))
                     do_print_objname ("user defined link", path1, path2);
             } /* end else */
-            
+
             /* always print the number of differences found in verbose mode */
             if(options->m_verbose)
                 print_found(nfound);
             }
             break;
-            
+
         default:
             if(options->m_verbose)
                 printf("Comparison not supported: <%s> and <%s> are of type %s\n",
@@ -1140,9 +1140,9 @@ hsize_t diff(hid_t file1_id,
             options->not_cmp = 1;
             break;
      }
- 
+
     return nfound;
- 
+
 out:
     options->err_stat = 1;
 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index c5646ed..5250c3c 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -71,9 +71,9 @@
 /*-------------------------------------------------------------------------
  * -p relative error formula
  *
- * We assume the true value of a quantity to be A (value in first dataset) 
- *  and the measured or inferred value to be B (value in second dataset). 
- *  The relative error is defined by 
+ * We assume the true value of a quantity to be A (value in first dataset)
+ *  and the measured or inferred value to be B (value in second dataset).
+ *  The relative error is defined by
  *
  *  B - A
  * --------
@@ -138,7 +138,7 @@ static int     ull2float(unsigned long_long ull_value, float *f_value);
  * NaN detection
  *-------------------------------------------------------------------------
  */
-typedef enum dtype_t 
+typedef enum dtype_t
 {
     FLT_FLOAT, FLT_DOUBLE,
 #if H5_SIZEOF_LONG_DOUBLE !=0
@@ -187,7 +187,7 @@ void print_pos( int        *ph,       /* print header */
                 const char *obj2 )
 {
     int i;
-    
+
     /* print header */
     if ( *ph==1 )
     {
@@ -198,7 +198,7 @@ void print_pos( int        *ph,       /* print header */
         parallel_print("%-11s","");
         print_dimensions (rank,dims);
         parallel_print("\n");
-        
+
         if (pp)
         {
             parallel_print("%-15s %-15s %-15s %-15s %-15s\n",
@@ -219,14 +219,14 @@ void print_pos( int        *ph,       /* print header */
             parallel_print("------------------------------------------------------------\n");
         }
     } /* end print header */
-    
+
     for ( i = 0; i < rank; i++)
     {
         pos[i] = curr_pos/acc[i];
         curr_pos -= acc[i]*pos[i];
     }
     assert( curr_pos == 0 );
-    
+
     parallel_print("[ " );
     for ( i = 0; i < rank; i++)
     {
@@ -272,11 +272,11 @@ hsize_t diff_array( void *_mem1,
     int           ph=1;       /* print header  */
     hsize_t       i;
     int           j;
-    
-    
+
+
     /* get the size. */
     size = H5Tget_size( m_type );
-    
+
     acc[rank-1]=1;
     for(j=(rank-2); j>=0; j--)
     {
@@ -284,7 +284,7 @@ hsize_t diff_array( void *_mem1,
     }
     for ( j = 0; j < rank; j++)
         pos[j]=0;
-    
+
     if(H5Tis_variable_str(m_type))
     {
         for ( i = 0; i < nelmts; i++)
@@ -308,7 +308,7 @@ hsize_t diff_array( void *_mem1,
                 return nfound;
         } /* i */
     }
-    
+
     else
     {
         switch (H5Tget_class(m_type))
@@ -316,22 +316,22 @@ hsize_t diff_array( void *_mem1,
         default:
             assert(0);
             break;
-            
+
        /*-------------------------------------------------------------------------
         * float and integer atomic types
         *-------------------------------------------------------------------------
         */
-            
+
         case H5T_FLOAT:
-            
-            if (H5Tequal(m_type, H5T_NATIVE_FLOAT))            
+
+            if (H5Tequal(m_type, H5T_NATIVE_FLOAT))
                 nfound=diff_float(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
             else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
                 nfound=diff_double(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
             break;
-            
+
         case H5T_INTEGER:
-            
+
             if (H5Tequal(m_type, H5T_NATIVE_SCHAR))
                 nfound=diff_schar(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
             else if (H5Tequal(m_type, H5T_NATIVE_UCHAR))
@@ -352,14 +352,14 @@ hsize_t diff_array( void *_mem1,
                 nfound=diff_llong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
             else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
                 nfound=diff_ullong(mem1,mem2,nelmts,hyper_start,rank,dims,acc,pos,options,name1,name2,&ph);
-            
+
             break;
-            
+
         /*-------------------------------------------------------------------------
          * Other types than float and integer
          *-------------------------------------------------------------------------
          */
-            
+
         case H5T_COMPOUND:
         case H5T_STRING:
         case H5T_BITFIELD:
@@ -368,7 +368,7 @@ hsize_t diff_array( void *_mem1,
         case H5T_ARRAY:
         case H5T_VLEN:
         case H5T_REFERENCE:
-            
+
             for ( i = 0; i < nelmts; i++)
             {
                 nfound+=diff_datum(
@@ -391,7 +391,7 @@ hsize_t diff_array( void *_mem1,
             } /* i */
         } /* switch */
     } /* else */
-    
+
     return nfound;
 }
 
@@ -467,9 +467,9 @@ hsize_t diff_datum(void       *_mem1,
     float         f1, f2;
     double        per;
     int           both_zero;
-    
+
     type_size = H5Tget_size( m_type );
-    
+
     switch (H5Tget_class(m_type))
     {
     default:
@@ -478,7 +478,7 @@ hsize_t diff_datum(void       *_mem1,
     case H5T_TIME:
         assert(0);
         break;
-        
+
    /*-------------------------------------------------------------------------
     * H5T_COMPOUND
     *-------------------------------------------------------------------------
@@ -509,7 +509,7 @@ hsize_t diff_datum(void       *_mem1,
             H5Tclose(memb_type);
         }
         break;
-        
+
    /*-------------------------------------------------------------------------
     * H5T_STRING
     *-------------------------------------------------------------------------
@@ -519,7 +519,7 @@ hsize_t diff_datum(void       *_mem1,
         {
             H5T_str_t pad;
             char      *s;
-            
+
             /* Get pointer to first string to compare */
             s = (char *)mem1;
 
@@ -530,9 +530,9 @@ hsize_t diff_datum(void       *_mem1,
                     size = HDstrlen(s);
                 else
                     size = H5Tget_size(m_type);
-                
+
                 pad = H5Tget_strpad(m_type);
-            
+
                 for (u=0; u<size && (s[u] || pad!=H5T_STR_NULLTERM); u++)
                     nfound+=character_compare(
                         mem1 + u,
@@ -547,16 +547,16 @@ hsize_t diff_datum(void       *_mem1,
                         obj2,
                         ph);
             }
-                
+
         }
         break;
-        
+
    /*-------------------------------------------------------------------------
     * H5T_BITFIELD
     *-------------------------------------------------------------------------
     */
     case H5T_BITFIELD:
-        
+
         /* byte-by-byte comparison */
         for (u=0; u<type_size; u++)
             nfound+=character_compare_opt(
@@ -571,15 +571,15 @@ hsize_t diff_datum(void       *_mem1,
             obj1,
             obj2,
             ph);
-        
+
         break;
-        
+
     /*-------------------------------------------------------------------------
      * H5T_OPAQUE
      *-------------------------------------------------------------------------
      */
     case H5T_OPAQUE:
-        
+
         /* byte-by-byte comparison */
         for (u=0; u<type_size; u++)
             nfound+=character_compare_opt(
@@ -594,29 +594,29 @@ hsize_t diff_datum(void       *_mem1,
             obj1,
             obj2,
             ph);
-        
+
         break;
-        
-        
+
+
    /*-------------------------------------------------------------------------
     * H5T_ENUM
     *-------------------------------------------------------------------------
     */
     case H5T_ENUM:
-        
+
     /* For enumeration types we compare the names instead of the
     integer values.  For each pair of elements being
     compared, we convert both bit patterns to their corresponding
     enumeration constant and do a string comparison
         */
-        
+
         {
             char enum_name1[1024];
             char enum_name2[1024];
-            
+
             /* disable error reporting */
             H5E_BEGIN_TRY {
-                
+
                 if ((H5Tenum_nameof(m_type, mem1, enum_name1, sizeof enum_name1) >= 0) &&
                     (H5Tenum_nameof(m_type, mem2, enum_name2, sizeof enum_name2) >= 0))
                 {
@@ -650,10 +650,10 @@ hsize_t diff_datum(void       *_mem1,
                 /* enable error reporting */
             } H5E_END_TRY;
         }
-        
-        
+
+
         break;
-        
+
    /*-------------------------------------------------------------------------
     * H5T_ARRAY
     *-------------------------------------------------------------------------
@@ -669,7 +669,7 @@ hsize_t diff_datum(void       *_mem1,
             ndims     = H5Tget_array_ndims(m_type);
             H5Tget_array_dims2(m_type, adims);
             assert(ndims >= 1 && ndims <= H5S_MAX_RANK);
-            
+
             /* calculate the number of array elements */
             for (u = 0, nelmts = 1; u <ndims; u++)
                 nelmts *= adims[u];
@@ -692,15 +692,15 @@ hsize_t diff_datum(void       *_mem1,
             H5Tclose(memb_type);
         }
         break;
-   
-        
+
+
    /*-------------------------------------------------------------------------
     * H5T_REFERENCE
     *-------------------------------------------------------------------------
     */
-        
+
     case H5T_REFERENCE:
-        
+
         iszero1=all_zero(_mem1, H5Tget_size(m_type));
         iszero2=all_zero(_mem2, H5Tget_size(m_type));
         if (iszero1 != iszero2)
@@ -709,18 +709,18 @@ hsize_t diff_datum(void       *_mem1,
         }
         else if (!iszero1 && !iszero2)
         {
-            
+
         /*-------------------------------------------------------------------------
         * H5T_STD_REF_DSETREG
         * Dataset region reference
         *-------------------------------------------------------------------------
             */
-            
+
             if (H5Tequal(m_type, H5T_STD_REF_DSETREG))
             {
                 hid_t  region1_id;
                 hid_t  region2_id;
-                
+
                 if ((obj1_id = H5Rdereference(container1_id, H5R_DATASET_REGION, _mem1))<0)
                     ret= -1;
                 if ((obj2_id = H5Rdereference(container2_id, H5R_DATASET_REGION, _mem2))<0)
@@ -729,22 +729,22 @@ hsize_t diff_datum(void       *_mem1,
                     ret= -1;
                 if ((region2_id = H5Rget_region(container2_id, H5R_DATASET_REGION, _mem2))<0)
                     ret= -1;
-                
+
                 if (ret==-1) {
                     options->err_stat=1;
                     return 0;
                 }
-                
+
                 nfound = diff_region(obj1_id,obj2_id,region1_id,region2_id,options);
-                
+
                 H5Oclose(obj1_id);
                 H5Oclose(obj2_id);
                 H5Sclose(region1_id);
                 H5Sclose(region2_id);
-                
+
             }/*dataset reference*/
-            
-            
+
+
            /*-------------------------------------------------------------------------
             * H5T_STD_REF_OBJ
             * Object references. get the type and OID of the referenced object
@@ -754,7 +754,7 @@ hsize_t diff_datum(void       *_mem1,
             {
                 H5O_type_t     obj1_type;
                 H5O_type_t     obj2_type;
-                
+
                 if(H5Rget_obj_type2(container1_id, H5R_OBJECT, _mem1, &obj1_type) < 0)
                     ret = -1;
                 if(H5Rget_obj_type2(container2_id, H5R_OBJECT, _mem2, &obj2_type) < 0)
@@ -763,7 +763,7 @@ hsize_t diff_datum(void       *_mem1,
                     options->err_stat = 1;
                     return 0;
                 } /* end if */
-                
+
                 /* check object type */
                 if(obj1_type != obj2_type)
                 {
@@ -771,7 +771,7 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp = 1;
                     return 0;
                 }
-                
+
                 if((obj1_id = H5Rdereference(container1_id, H5R_OBJECT, _mem1)) < 0)
                     ret = -1;
                 if((obj2_id = H5Rdereference(container2_id, H5R_OBJECT, _mem2)) < 0)
@@ -780,7 +780,7 @@ hsize_t diff_datum(void       *_mem1,
                     options->err_stat = 1;
                     return 0;
                 } /* end if */
-                
+
                 /* compare */
                 if(obj1_type == H5O_TYPE_DATASET)
                     nfound = diff_datasetid(obj1_id,
@@ -793,31 +793,31 @@ hsize_t diff_datum(void       *_mem1,
                         obj1, obj2);
                     options->not_cmp = 1;
                 }
-                
+
                 H5Oclose(obj1_id);
                 H5Oclose(obj2_id);
-                
+
             }/*object reference*/
-            
+
         }/*is zero*/
-        
-        
+
+
         break;
 
    /*-------------------------------------------------------------------------
     * H5T_VLEN
     *-------------------------------------------------------------------------
     */
-        
+
     case H5T_VLEN:
-        
+
         /* get the VL sequences's base datatype for each element */
         memb_type = H5Tget_super(m_type);
         size      = H5Tget_size(memb_type);
-        
+
         /* get the number of sequence elements */
         nelmts = ((hvl_t *)mem1)->len;
-        
+
         for (j = 0; j < (int)nelmts; j++)
             nfound+=diff_datum(
             ((char *)(((hvl_t *)mem1)->p)) + j * size,
@@ -834,21 +834,21 @@ hsize_t diff_datum(void       *_mem1,
             container1_id,
             container2_id,
             ph);
-        
+
         H5Tclose(memb_type);
-        
+
         break;
-        
 
-    
+
+
    /*-------------------------------------------------------------------------
     * H5T_INTEGER
     *-------------------------------------------------------------------------
-    */        
-        
+    */
+
     case H5T_INTEGER:
-        
-        
+
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_SCHAR
         *-------------------------------------------------------------------------
@@ -878,7 +878,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER(temp1_char,temp2_char);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -890,9 +890,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -908,7 +908,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER(temp1_char,temp2_char);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -920,9 +920,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && ABS(temp1_char-temp2_char) > options->delta )
                     {
                         if ( print_data(options) )
@@ -944,9 +944,9 @@ hsize_t diff_datum(void       *_mem1,
                 }
                 nfound++;
             }
-            
+
         } /*H5T_NATIVE_SCHAR*/
-        
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_UCHAR
         *-------------------------------------------------------------------------
@@ -956,7 +956,7 @@ hsize_t diff_datum(void       *_mem1,
             unsigned char      temp1_uchar;
             unsigned char      temp2_uchar;
             assert(type_size==sizeof(unsigned char));
-            
+
             memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
             memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
             /* -d and !-p */
@@ -977,7 +977,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -989,9 +989,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1007,7 +1007,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1019,9 +1019,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1043,21 +1043,21 @@ hsize_t diff_datum(void       *_mem1,
                 }
                 nfound++;
             }
-            
+
         } /*H5T_NATIVE_UCHAR*/
-        
-        
+
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_SHORT
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_SHORT))
         {
             short       temp1_short;
             short       temp2_short;
             assert(type_size==sizeof(short));
-            
+
             memcpy(&temp1_short, mem1, sizeof(short));
             memcpy(&temp2_short, mem2, sizeof(short));
             /* -d and !-p */
@@ -1078,7 +1078,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER(temp1_short,temp2_short);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1090,9 +1090,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1108,7 +1108,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER(temp1_short,temp2_short);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1120,9 +1120,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && ABS(temp1_short-temp2_short) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1144,21 +1144,21 @@ hsize_t diff_datum(void       *_mem1,
                 }
                 nfound++;
             }
-            
-            
+
+
         } /*H5T_NATIVE_SHORT*/
-        
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_USHORT
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_USHORT))
         {
             unsigned short       temp1_ushort;
             unsigned short       temp2_ushort;
             assert(type_size==sizeof(short));
-            
+
             memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
             memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
             /* -d and !-p */
@@ -1166,7 +1166,7 @@ hsize_t diff_datum(void       *_mem1,
             {
                 if ( PDIFF(temp1_ushort,temp2_ushort) > options->delta)
                 {
-                    
+
                     if ( print_data(options) )
                     {
                         print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
@@ -1180,7 +1180,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1193,9 +1193,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1211,7 +1211,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1223,9 +1223,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && PDIFF(temp1_ushort,temp2_ushort) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1248,19 +1248,19 @@ hsize_t diff_datum(void       *_mem1,
                 nfound++;
             }
         } /*H5T_NATIVE_USHORT*/
-        
-        
+
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_INT
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_INT))
         {
             int         temp1_int;
             int         temp2_int;
             assert(type_size==sizeof(int));
-            
+
             memcpy(&temp1_int, mem1, sizeof(int));
             memcpy(&temp2_int, mem2, sizeof(int));
             /* -d and !-p */
@@ -1281,7 +1281,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER(temp1_int,temp2_int);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1293,9 +1293,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1311,7 +1311,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER(temp1_int,temp2_int);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1323,9 +1323,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && ABS(temp1_int-temp2_int) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1348,19 +1348,19 @@ hsize_t diff_datum(void       *_mem1,
                 nfound++;
             }
         } /*H5T_NATIVE_INT*/
-        
-        
+
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_UINT
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_UINT))
         {
             unsigned int         temp1_uint;
             unsigned int         temp2_uint;
             assert(type_size==sizeof(int));
-            
+
             memcpy(&temp1_uint, mem1, sizeof(unsigned int));
             memcpy(&temp2_uint, mem2, sizeof(unsigned int));
             /* -d and !-p */
@@ -1381,7 +1381,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1393,9 +1393,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1411,7 +1411,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1423,9 +1423,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && PDIFF(temp1_uint,temp2_uint) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1448,19 +1448,19 @@ hsize_t diff_datum(void       *_mem1,
                 nfound++;
             }
         } /*H5T_NATIVE_UINT*/
-        
-        
+
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_LONG
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_LONG))
         {
             long        temp1_long;
             long        temp2_long;
             assert(type_size==sizeof(long));
-            
+
             memcpy(&temp1_long, mem1, sizeof(long));
             memcpy(&temp2_long, mem2, sizeof(long));
             /* -d and !-p */
@@ -1481,7 +1481,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER(temp1_long,temp2_long);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1494,9 +1494,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1512,7 +1512,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER(temp1_long,temp2_long);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1524,9 +1524,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && ABS(temp1_long-temp2_long) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1551,18 +1551,18 @@ hsize_t diff_datum(void       *_mem1,
                 nfound++;
             }
         } /*H5T_NATIVE_LONG*/
-        
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_ULONG
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_ULONG))
         {
             unsigned long        temp1_ulong;
             unsigned long        temp2_ulong;
             assert(type_size==sizeof(unsigned long));
-            
+
             memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
             memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
             /* -d and !-p */
@@ -1583,7 +1583,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1595,9 +1595,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1613,7 +1613,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1625,9 +1625,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && PDIFF(temp1_ulong,temp2_ulong) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1649,21 +1649,21 @@ hsize_t diff_datum(void       *_mem1,
                 }
                 nfound++;
             }
-            
-            
+
+
         } /*H5T_NATIVE_ULONG*/
-        
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_LLONG
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_LLONG))
         {
             long_long        temp1_llong;
             long_long        temp2_llong;
             assert(type_size==sizeof(long_long));
-            
+
             memcpy(&temp1_llong, mem1, sizeof(long_long));
             memcpy(&temp2_llong, mem2, sizeof(long_long));
             /* -d and !-p */
@@ -1684,7 +1684,7 @@ hsize_t diff_datum(void       *_mem1,
             else if (!options->d && options->p)
             {
                 PER(temp1_llong,temp2_llong);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1696,9 +1696,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -1714,7 +1714,7 @@ hsize_t diff_datum(void       *_mem1,
             else if ( options->d && options->p)
             {
                 PER(temp1_llong,temp2_llong);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1726,9 +1726,9 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent  && ABS(temp1_llong-temp2_llong) > options->delta )
                     {
                         if ( print_data(options) )
@@ -1750,20 +1750,20 @@ hsize_t diff_datum(void       *_mem1,
                 }
                 nfound++;
             }
-            
+
         } /*H5T_NATIVE_LLONG*/
-        
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_ULLONG
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_ULLONG))
         {
             unsigned long_long        temp1_ullong;
             unsigned long_long        temp2_ullong;
             assert(type_size==sizeof(unsigned long_long));
-            
+
             memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
             memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
             /* -d and !-p */
@@ -1786,7 +1786,7 @@ hsize_t diff_datum(void       *_mem1,
                 ull2float(temp1_ullong,&f1);
                 ull2float(temp2_ullong,&f2);
                 PER(f1,f2);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1798,12 +1798,12 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
-                        
+
                         if ( print_data(options) )
                         {
                             print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
@@ -1819,7 +1819,7 @@ hsize_t diff_datum(void       *_mem1,
                 ull2float(temp1_ullong,&f1);
                 ull2float(temp2_ullong,&f2);
                 PER(f1,f2);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -1831,16 +1831,16 @@ hsize_t diff_datum(void       *_mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
                     {
-                        
+
                         if ( print_data(options) )
                         {
                             print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-                            
+
                             parallel_print(SPACES);
                             parallel_print(ULLI_FORMAT_P,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong),per);
                         }
@@ -1857,22 +1857,22 @@ hsize_t diff_datum(void       *_mem1,
                 }
                 nfound++;
             }
-            
+
         } /*H5T_NATIVE_ULLONG*/
-        
-        
+
+
         break; /* H5T_INTEGER class */
 
-     
+
    /*-------------------------------------------------------------------------
     * H5T_FLOAT
     *-------------------------------------------------------------------------
     */
-        
+
     case H5T_FLOAT:
-        
-        
-        
+
+
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_FLOAT
         *-------------------------------------------------------------------------
@@ -1889,7 +1889,7 @@ hsize_t diff_datum(void       *_mem1,
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
 
-            /* logic for detecting NaNs is different with options -d, -p and no options */  
+            /* logic for detecting NaNs is different with options -d, -p and no options */
 
            /*-------------------------------------------------------------------------
             * -d and !-p
@@ -1897,18 +1897,18 @@ hsize_t diff_datum(void       *_mem1,
             */
             if (options->d && !options->p)
             {
-                
-                
+
+
                /*-------------------------------------------------------------------------
                 * detect NaNs
                 *-------------------------------------------------------------------------
                 */
                 isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
                 isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
-                
+
                 if ( !isnan1 && !isnan2)
-                {             
-                                    
+                {
+
                     if (ABS(temp1_float-temp2_float) > options->delta)
                     {
                         if ( print_data(options) )
@@ -1919,7 +1919,7 @@ hsize_t diff_datum(void       *_mem1,
                         }
                         nfound++;
                     }
-                    
+
                 } /* NaN */
             }
            /*-------------------------------------------------------------------------
@@ -1928,19 +1928,19 @@ hsize_t diff_datum(void       *_mem1,
             */
             else if (!options->d && options->p)
             {
-                
+
                /*-------------------------------------------------------------------------
                 * detect NaNs
                 *-------------------------------------------------------------------------
                 */
                 isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
                 isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
-                
+
                 if ( !isnan1 && !isnan2)
-                {   
-                    
+                {
+
                     PER(temp1_float,temp2_float);
-                    
+
                     if (not_comparable && !both_zero) /* not comparable */
                     {
                         if ( print_data(options) )
@@ -1952,9 +1952,9 @@ hsize_t diff_datum(void       *_mem1,
                         options->not_cmp=1;
                         nfound++;
                     }
-                    
+
                     else
-                        
+
                         if ( per > options->percent && ABS(temp1_float-temp2_float) > options->delta )
                         {
                             if ( print_data(options) )
@@ -1967,7 +1967,7 @@ hsize_t diff_datum(void       *_mem1,
                             }
                             nfound++;
                         }
-                        
+
                 } /* NaN */
             }
 
@@ -1975,22 +1975,22 @@ hsize_t diff_datum(void       *_mem1,
             * -d and -p
             *-------------------------------------------------------------------------
             */
-            
+
             else if ( options->d && options->p)
             {
-                
+
                /*-------------------------------------------------------------------------
                 * detect NaNs
                 *-------------------------------------------------------------------------
                 */
                 isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
                 isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
-                
+
                 if ( !isnan1 && !isnan2)
-                {   
-                    
+                {
+
                     PER(temp1_float,temp2_float);
-                    
+
                     if (not_comparable && !both_zero) /* not comparable */
                     {
                         if ( print_data(options) )
@@ -2003,9 +2003,9 @@ hsize_t diff_datum(void       *_mem1,
                         options->not_cmp=1;
                         nfound++;
                     }
-                    
+
                     else
-                        
+
                         if ( per > options->percent )
                         {
                             if ( print_data(options) )
@@ -2013,22 +2013,22 @@ hsize_t diff_datum(void       *_mem1,
                                 print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
                                 parallel_print(SPACES);
                                 parallel_print(F_FORMAT_P,temp1_float,temp2_float,
-                                    ABS(temp1_float-temp2_float), 
+                                    ABS(temp1_float-temp2_float),
                                     ABS(1-temp2_float/temp1_float));
                             }
                             nfound++;
                         }
-                        
+
                 } /* NaN */
             }
-            
+
            /*-------------------------------------------------------------------------
             * no -d and -p
             *-------------------------------------------------------------------------
             */
             else if (equal_float(temp1_float,temp2_float)==FALSE)
             {
-                
+
                 if ( print_data(options) )
                 {
                     print_pos(ph,0,i,acc,pos,rank,dims,obj1,obj2);
@@ -2038,12 +2038,12 @@ hsize_t diff_datum(void       *_mem1,
                 nfound++;
             }
         } /*H5T_NATIVE_FLOAT*/
-      
+
        /*-------------------------------------------------------------------------
         * H5T_NATIVE_DOUBLE
         *-------------------------------------------------------------------------
         */
-        
+
         else if (H5Tequal(m_type, H5T_NATIVE_DOUBLE))
         {
             double temp1_double;
@@ -2053,11 +2053,11 @@ hsize_t diff_datum(void       *_mem1,
 
 
             assert(type_size==sizeof(double));
-            
+
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
 
-           /* logic for detecting NaNs is different with options -d, -p and no options */  
+           /* logic for detecting NaNs is different with options -d, -p and no options */
 
            /*-------------------------------------------------------------------------
             * -d and !-p
@@ -2072,10 +2072,10 @@ hsize_t diff_datum(void       *_mem1,
                 */
                 isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
                 isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-                
+
                 if ( !isnan1 && !isnan2)
-                {           
-                    
+                {
+
                     if (ABS(temp1_double-temp2_double) > options->delta)
                     {
                         if ( print_data(options) )
@@ -2086,7 +2086,7 @@ hsize_t diff_datum(void       *_mem1,
                         }
                         nfound++;
                     }
-                    
+
                 } /* NaN */
             }
 
@@ -2103,12 +2103,12 @@ hsize_t diff_datum(void       *_mem1,
                 */
                 isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
                 isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-                
+
                 if ( !isnan1 && !isnan2)
-                {           
-                    
+                {
+
                     PER(temp1_double,temp2_double);
-                    
+
                     if (not_comparable && !both_zero) /* not comparable */
                     {
                         if ( print_data(options) )
@@ -2121,9 +2121,9 @@ hsize_t diff_datum(void       *_mem1,
                         options->not_cmp=1;
                         nfound++;
                     }
-                    
+
                     else
-                        
+
                         if ( per > options->percent )
                         {
                             if ( print_data(options) )
@@ -2136,12 +2136,12 @@ hsize_t diff_datum(void       *_mem1,
                             }
                             nfound++;
                         }
-                        
+
                 } /* NaN */
             }
-            
+
            /*-------------------------------------------------------------------------
-            * -d and -p 
+            * -d and -p
             *-------------------------------------------------------------------------
             */
             else if ( options->d && options->p)
@@ -2153,12 +2153,12 @@ hsize_t diff_datum(void       *_mem1,
                 */
                 isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
                 isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-                
+
                 if ( !isnan1 && !isnan2)
-                {           
-                    
+                {
+
                     PER(temp1_double,temp2_double);
-                    
+
                     if (not_comparable && !both_zero) /* not comparable */
                     {
                         if ( print_data(options) )
@@ -2171,10 +2171,10 @@ hsize_t diff_datum(void       *_mem1,
                         options->not_cmp=1;
                         nfound++;
                     }
-                    
+
                     else
-                        
-                        if ( per > options->percent && 
+
+                        if ( per > options->percent &&
                             ABS(temp1_double-temp2_double) > options->delta )
                         {
                             if ( print_data(options) )
@@ -2187,12 +2187,12 @@ hsize_t diff_datum(void       *_mem1,
                             }
                             nfound++;
                         }
-                        
+
                 } /* NaN */
             }
-            
+
            /*-------------------------------------------------------------------------
-            * no -d and -p 
+            * no -d and -p
             *-------------------------------------------------------------------------
             */
             else if (equal_double(temp1_double,temp2_double)==FALSE)
@@ -2206,12 +2206,12 @@ hsize_t diff_datum(void       *_mem1,
                 nfound++;
             }
     } /*H5T_NATIVE_DOUBLE*/
-    
-    
+
+
     break; /* H5T_FLOAT class */
-    
+
  } /* switch */
- 
+
  return nfound;
 }
 
@@ -2250,7 +2250,7 @@ static
 void print_region_block(int i, hsize_t *ptdata, int ndims)
 {
     int j;
-    
+
     parallel_print("        ");
     for (j = 0; j < ndims; j++)
         parallel_print("%s%lu", j ? "," : "   (",
@@ -2259,7 +2259,7 @@ void print_region_block(int i, hsize_t *ptdata, int ndims)
         parallel_print("%s%lu", j ? "," : ")-(",
         (unsigned long)ptdata[i * 2 * ndims + j + ndims]);
     parallel_print(")");
-    
+
 }
 
 
@@ -2277,13 +2277,13 @@ static
 void print_points(int i, hsize_t *ptdata, int ndims)
 {
     int j;
-    
+
     parallel_print("              ");
     for (j = 0; j < ndims; j++)
         parallel_print("%s%lu", j ? "," : "(",
         (unsigned long)(ptdata[i * ndims + j]));
     parallel_print(")");
-    
+
 }
 
 /*-------------------------------------------------------------------------
@@ -2492,10 +2492,10 @@ hsize_t character_compare(unsigned char *mem1,
     hsize_t            nfound=0;  /* differences found */
     unsigned char      temp1_uchar;
     unsigned char      temp2_uchar;
-    
+
     memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-    
+
     if (temp1_uchar != temp2_uchar)
     {
         if ( print_data(options) )
@@ -2506,7 +2506,7 @@ hsize_t character_compare(unsigned char *mem1,
         }
         nfound++;
     }
-    
+
     return nfound;
 }
 
@@ -2538,12 +2538,12 @@ hsize_t character_compare_opt(unsigned char *mem1,
     unsigned char      temp2_uchar;
     double             per;
     int                both_zero;
-    
+
     memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
     memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-    
+
     /* -d and !-p */
-    
+
     if (options->d && !options->p)
     {
         if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
@@ -2597,9 +2597,9 @@ hsize_t character_compare_opt(unsigned char *mem1,
         }
         nfound++;
     }
-    
+
     return nfound;
-    
+
 }
 
 
@@ -2634,13 +2634,13 @@ hsize_t diff_float(unsigned char *mem1,
     int         both_zero;
     int         isnan1;
     int         isnan2;
-    
+
 
  /*-------------------------------------------------------------------------
-  * -d and !-p 
+  * -d and !-p
   *-------------------------------------------------------------------------
   */
- 
+
     if (options->d && !options->p)
     {
         for ( i = 0; i < nelmts; i++)
@@ -2656,7 +2656,7 @@ hsize_t diff_float(unsigned char *mem1,
             isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
 
             if ( !isnan1 && !isnan2)
-            {             
+            {
                 if (ABS(temp1_float-temp2_float) > options->delta)
                 {
                     if ( print_data(options) )
@@ -2676,7 +2676,7 @@ hsize_t diff_float(unsigned char *mem1,
     }
 
  /*-------------------------------------------------------------------------
-  * !-d and -p 
+  * !-d and -p
   *-------------------------------------------------------------------------
   */
     else if (!options->d && options->p)
@@ -2685,19 +2685,19 @@ hsize_t diff_float(unsigned char *mem1,
         {
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
-            
+
            /*-------------------------------------------------------------------------
             * detect NaNs
             *-------------------------------------------------------------------------
             */
             isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
             isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
-            
+
             if ( !isnan1 && !isnan2)
-            {        
-                
+            {
+
                 PER(temp1_float,temp2_float);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -2710,9 +2710,9 @@ hsize_t diff_float(unsigned char *mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -2732,31 +2732,31 @@ hsize_t diff_float(unsigned char *mem1,
                 return nfound;
         } /* i */
     }
-    
+
  /*-------------------------------------------------------------------------
-  * -d and -p 
+  * -d and -p
   *-------------------------------------------------------------------------
   */
     else if ( options->d && options->p)
     {
-        
+
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
-            
+
             /*-------------------------------------------------------------------------
             * detect NaNs
             *-------------------------------------------------------------------------
             */
             isnan1 = my_isnan(FLT_FLOAT,&temp1_float);
             isnan2 = my_isnan(FLT_FLOAT,&temp2_float);
-            
+
             if ( !isnan1 && !isnan2)
-            {        
-                
+            {
+
                 PER(temp1_float,temp2_float);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -2769,9 +2769,9 @@ hsize_t diff_float(unsigned char *mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && ABS(temp1_float-temp2_float) > options->delta )
                     {
                         if ( print_data(options) )
@@ -2784,7 +2784,7 @@ hsize_t diff_float(unsigned char *mem1,
                         }
                         nfound++;
                     }
-                    
+
             } /* NaN */
             mem1+=sizeof(float);
             mem2+=sizeof(float);
@@ -2794,7 +2794,7 @@ hsize_t diff_float(unsigned char *mem1,
     }
 
  /*-------------------------------------------------------------------------
-  * no -d and -p 
+  * no -d and -p
   *-------------------------------------------------------------------------
   */
     else
@@ -2814,13 +2814,13 @@ hsize_t diff_float(unsigned char *mem1,
      #endif
 
 #endif
-        
+
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_float, mem1, sizeof(float));
             memcpy(&temp2_float, mem2, sizeof(float));
 
-            
+
             if (equal_float(temp1_float,temp2_float)==FALSE)
             {
                 if ( print_data(options) )
@@ -2831,7 +2831,7 @@ hsize_t diff_float(unsigned char *mem1,
                 }
                 nfound++;
             }
-            
+
             mem1+=sizeof(float);
             mem2+=sizeof(float);
             if (options->n && nfound>=options->count)
@@ -2854,9 +2854,9 @@ hsize_t diff_float(unsigned char *mem1,
 
 #endif
 
-        
+
     }
-    
+
     return nfound;
 }
 
@@ -2892,13 +2892,13 @@ hsize_t diff_double(unsigned char *mem1,
     int         both_zero;
     int         isnan1;
     int         isnan2;
-    
+
 
  /*-------------------------------------------------------------------------
-  * -d and !-p 
+  * -d and !-p
   *-------------------------------------------------------------------------
   */
- 
+
     if (options->d && !options->p)
     {
         for ( i = 0; i < nelmts; i++)
@@ -2914,7 +2914,7 @@ hsize_t diff_double(unsigned char *mem1,
             isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
 
             if ( !isnan1 && !isnan2)
-            {             
+            {
                 if (ABS(temp1_double-temp2_double) > options->delta)
                 {
                     if ( print_data(options) )
@@ -2934,7 +2934,7 @@ hsize_t diff_double(unsigned char *mem1,
     }
 
  /*-------------------------------------------------------------------------
-  * !-d and -p 
+  * !-d and -p
   *-------------------------------------------------------------------------
   */
     else if (!options->d && options->p)
@@ -2943,19 +2943,19 @@ hsize_t diff_double(unsigned char *mem1,
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
-            
+
            /*-------------------------------------------------------------------------
             * detect NaNs
             *-------------------------------------------------------------------------
             */
             isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
             isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-            
+
             if ( !isnan1 && !isnan2)
-            {        
-                
+            {
+
                 PER(temp1_double,temp2_double);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -2968,9 +2968,9 @@ hsize_t diff_double(unsigned char *mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent )
                     {
                         if ( print_data(options) )
@@ -2990,31 +2990,31 @@ hsize_t diff_double(unsigned char *mem1,
                 return nfound;
         } /* i */
     }
-    
+
  /*-------------------------------------------------------------------------
-  * -d and -p 
+  * -d and -p
   *-------------------------------------------------------------------------
   */
     else if ( options->d && options->p)
     {
-        
+
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
-            
+
             /*-------------------------------------------------------------------------
             * detect NaNs
             *-------------------------------------------------------------------------
             */
             isnan1 = my_isnan(FLT_DOUBLE,&temp1_double);
             isnan2 = my_isnan(FLT_DOUBLE,&temp2_double);
-            
+
             if ( !isnan1 && !isnan2)
-            {        
-                
+            {
+
                 PER(temp1_double,temp2_double);
-                
+
                 if (not_comparable && !both_zero) /* not comparable */
                 {
                     if ( print_data(options) )
@@ -3027,9 +3027,9 @@ hsize_t diff_double(unsigned char *mem1,
                     options->not_cmp=1;
                     nfound++;
                 }
-                
+
                 else
-                    
+
                     if ( per > options->percent && ABS(temp1_double-temp2_double) > options->delta )
                     {
                         if ( print_data(options) )
@@ -3042,7 +3042,7 @@ hsize_t diff_double(unsigned char *mem1,
                         }
                         nfound++;
                     }
-                    
+
             } /* NaN */
             mem1+=sizeof(double);
             mem2+=sizeof(double);
@@ -3052,17 +3052,17 @@ hsize_t diff_double(unsigned char *mem1,
     }
 
  /*-------------------------------------------------------------------------
-  * no -d and -p 
+  * no -d and -p
   *-------------------------------------------------------------------------
   */
     else
     {
-        
+
         for ( i = 0; i < nelmts; i++)
         {
             memcpy(&temp1_double, mem1, sizeof(double));
             memcpy(&temp2_double, mem2, sizeof(double));
-            
+
             if (equal_double(temp1_double,temp2_double)==FALSE)
             {
                 if ( print_data(options) )
@@ -3073,15 +3073,15 @@ hsize_t diff_double(unsigned char *mem1,
                 }
                 nfound++;
             }
-            
+
             mem1+=sizeof(double);
             mem2+=sizeof(double);
             if (options->n && nfound>=options->count)
                 return nfound;
         } /* nelmts */
-        
+
     }
-    
+
     return nfound;
 }
 
@@ -3117,17 +3117,17 @@ hsize_t diff_schar(unsigned char *mem1,
  hsize_t     i;
  double      per;
  int         both_zero;
- 
- 
+
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_char, mem1, sizeof(char));
          memcpy(&temp2_char, mem2, sizeof(char));
-         
+
          if (ABS(temp1_char-temp2_char) > options->delta)
          {
              if ( print_data(options) )
@@ -3144,18 +3144,18 @@ hsize_t diff_schar(unsigned char *mem1,
              return nfound;
      }
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_char, mem1, sizeof(char));
          memcpy(&temp2_char, mem2, sizeof(char));
-         
+
          PER(temp1_char,temp2_char);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3168,9 +3168,9 @@ hsize_t diff_schar(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -3189,18 +3189,18 @@ hsize_t diff_schar(unsigned char *mem1,
                  return nfound;
      }
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_char, mem1, sizeof(char));
          memcpy(&temp2_char, mem2, sizeof(char));
-         
+
          PER(temp1_char,temp2_char);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3213,9 +3213,9 @@ hsize_t diff_schar(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && ABS(temp1_char-temp2_char) > options->delta )
              {
                  if ( print_data(options) )
@@ -3233,16 +3233,16 @@ hsize_t diff_schar(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_char, mem1, sizeof(char));
          memcpy(&temp2_char, mem2, sizeof(char));
-         
+
          if (temp1_char != temp2_char)
          {
              if ( print_data(options) )
@@ -3253,15 +3253,15 @@ hsize_t diff_schar(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(char);
          mem2+=sizeof(char);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -3296,17 +3296,17 @@ hsize_t diff_uchar(unsigned char *mem1,
  hsize_t       i;
  double        per;
  int           both_zero;
-    
- 
+
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
          memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-         
+
          if ( PDIFF(temp1_uchar,temp2_uchar) > options->delta)
          {
              if ( print_data(options) )
@@ -3322,20 +3322,20 @@ hsize_t diff_uchar(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
          memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-         
+
          PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3348,9 +3348,9 @@ hsize_t diff_uchar(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -3369,18 +3369,18 @@ hsize_t diff_uchar(unsigned char *mem1,
                  return nfound;
      }
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
          memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-         
+
          PER_UNSIGN(signed char,temp1_uchar,temp2_uchar);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3393,9 +3393,9 @@ hsize_t diff_uchar(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && PDIFF(temp1_uchar,temp2_uchar) > options->delta )
              {
                  if ( print_data(options) )
@@ -3413,16 +3413,16 @@ hsize_t diff_uchar(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uchar, mem1, sizeof(unsigned char));
          memcpy(&temp2_uchar, mem2, sizeof(unsigned char));
-         
+
          if (temp1_uchar != temp2_uchar)
          {
              if ( print_data(options) )
@@ -3433,15 +3433,15 @@ hsize_t diff_uchar(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(unsigned char);
          mem2+=sizeof(unsigned char);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -3474,16 +3474,16 @@ hsize_t diff_short(unsigned char *mem1,
  hsize_t       i;
  double        per;
  int           both_zero;
- 
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_short, mem1, sizeof(short));
          memcpy(&temp2_short, mem2, sizeof(short));
-         
+
          if (ABS(temp1_short-temp2_short) > options->delta)
          {
              if ( print_data(options) )
@@ -3499,20 +3499,20 @@ hsize_t diff_short(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_short, mem1, sizeof(short));
          memcpy(&temp2_short, mem2, sizeof(short));
-         
+
          PER(temp1_short,temp2_short);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3525,9 +3525,9 @@ hsize_t diff_short(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -3545,21 +3545,21 @@ hsize_t diff_short(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_short, mem1, sizeof(short));
          memcpy(&temp2_short, mem2, sizeof(short));
-         
+
          PER(temp1_short,temp2_short);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3572,9 +3572,9 @@ hsize_t diff_short(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && ABS(temp1_short-temp2_short) > options->delta )
              {
                  if ( print_data(options) )
@@ -3592,16 +3592,16 @@ hsize_t diff_short(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_short, mem1, sizeof(short));
          memcpy(&temp2_short, mem2, sizeof(short));
-         
+
          if (temp1_short != temp2_short)
          {
              if ( print_data(options) )
@@ -3612,15 +3612,15 @@ hsize_t diff_short(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(short);
          mem2+=sizeof(short);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -3654,16 +3654,16 @@ hsize_t diff_ushort(unsigned char *mem1,
  hsize_t        i;
  double         per;
  int            both_zero;
-    
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
          memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-         
+
          if ( PDIFF(temp1_ushort,temp2_ushort) > options->delta)
          {
              if ( print_data(options) )
@@ -3679,20 +3679,20 @@ hsize_t diff_ushort(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
          memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-         
+
          PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3705,9 +3705,9 @@ hsize_t diff_ushort(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -3725,21 +3725,21 @@ hsize_t diff_ushort(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
          memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-         
+
          PER_UNSIGN(signed short,temp1_ushort,temp2_ushort);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3752,9 +3752,9 @@ hsize_t diff_ushort(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && PDIFF(temp1_ushort,temp2_ushort) > options->delta )
              {
                  if ( print_data(options) )
@@ -3772,16 +3772,16 @@ hsize_t diff_ushort(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ushort, mem1, sizeof(unsigned short));
          memcpy(&temp2_ushort, mem2, sizeof(unsigned short));
-         
+
          if (temp1_ushort != temp2_ushort)
          {
              if ( print_data(options) )
@@ -3792,15 +3792,15 @@ hsize_t diff_ushort(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(unsigned short);
          mem2+=sizeof(unsigned short);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -3835,16 +3835,16 @@ hsize_t diff_int(unsigned char *mem1,
  hsize_t       i;
  double        per;
  int           both_zero;
-    
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_int, mem1, sizeof(int));
          memcpy(&temp2_int, mem2, sizeof(int));
-         
+
          if (ABS(temp1_int-temp2_int) > options->delta)
          {
              if ( print_data(options) )
@@ -3860,20 +3860,20 @@ hsize_t diff_int(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_int, mem1, sizeof(int));
          memcpy(&temp2_int, mem2, sizeof(int));
-         
+
          PER(temp1_int,temp2_int);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3886,9 +3886,9 @@ hsize_t diff_int(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -3906,21 +3906,21 @@ hsize_t diff_int(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_int, mem1, sizeof(int));
          memcpy(&temp2_int, mem2, sizeof(int));
-         
+
          PER(temp1_int,temp2_int);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -3933,9 +3933,9 @@ hsize_t diff_int(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && ABS(temp1_int-temp2_int) > options->delta )
              {
                  if ( print_data(options) )
@@ -3953,16 +3953,16 @@ hsize_t diff_int(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_int, mem1, sizeof(int));
          memcpy(&temp2_int, mem2, sizeof(int));
-         
+
          if (temp1_int != temp2_int)
          {
              if ( print_data(options) )
@@ -3973,15 +3973,15 @@ hsize_t diff_int(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(int);
          mem2+=sizeof(int);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -4016,16 +4016,16 @@ hsize_t diff_uint(unsigned char *mem1,
  hsize_t        i;
  double         per;
  int            both_zero;
- 
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uint, mem1, sizeof(unsigned int));
          memcpy(&temp2_uint, mem2, sizeof(unsigned int));
-         
+
          if ( PDIFF(temp1_uint,temp2_uint) > options->delta)
          {
              if ( print_data(options) )
@@ -4041,20 +4041,20 @@ hsize_t diff_uint(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uint, mem1, sizeof(unsigned int));
          memcpy(&temp2_uint, mem2, sizeof(unsigned int));
-         
+
          PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4066,9 +4066,9 @@ hsize_t diff_uint(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -4086,21 +4086,21 @@ hsize_t diff_uint(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uint, mem1, sizeof(unsigned int));
          memcpy(&temp2_uint, mem2, sizeof(unsigned int));
-         
+
          PER_UNSIGN(signed int,temp1_uint,temp2_uint);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4112,9 +4112,9 @@ hsize_t diff_uint(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && PDIFF(temp1_uint,temp2_uint) > options->delta )
              {
                  if ( print_data(options) )
@@ -4132,16 +4132,16 @@ hsize_t diff_uint(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_uint, mem1, sizeof(unsigned int));
          memcpy(&temp2_uint, mem2, sizeof(unsigned int));
-         
+
          if (temp1_uint != temp2_uint)
          {
              if ( print_data(options) )
@@ -4152,15 +4152,15 @@ hsize_t diff_uint(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(unsigned int);
          mem2+=sizeof(unsigned int);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -4195,19 +4195,19 @@ hsize_t diff_long(unsigned char *mem1,
  hsize_t       i;
  double        per;
  int           both_zero;
- 
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
-         
+
          for ( i = 0; i < nelmts; i++)
          {
              memcpy(&temp1_long, mem1, sizeof(long));
              memcpy(&temp2_long, mem2, sizeof(long));
-             
+
              if (ABS(temp1_long-temp2_long) > options->delta)
              {
                  if ( print_data(options) )
@@ -4225,18 +4225,18 @@ hsize_t diff_long(unsigned char *mem1,
          }
      }
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_long, mem1, sizeof(long));
          memcpy(&temp2_long, mem2, sizeof(long));
-         
+
          PER(temp1_long,temp2_long);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4249,9 +4249,9 @@ hsize_t diff_long(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -4269,21 +4269,21 @@ hsize_t diff_long(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_long, mem1, sizeof(long));
          memcpy(&temp2_long, mem2, sizeof(long));
-         
+
          PER(temp1_long,temp2_long);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4296,9 +4296,9 @@ hsize_t diff_long(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && ABS(temp1_long-temp2_long) > options->delta )
              {
                  if ( print_data(options) )
@@ -4316,16 +4316,16 @@ hsize_t diff_long(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_long, mem1, sizeof(long));
          memcpy(&temp2_long, mem2, sizeof(long));
-         
+
          if (temp1_long != temp2_long)
          {
              if ( print_data(options) )
@@ -4336,15 +4336,15 @@ hsize_t diff_long(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(long);
          mem2+=sizeof(long);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -4380,20 +4380,20 @@ hsize_t diff_ulong(unsigned char *mem1,
  hsize_t        i;
  double         per;
  int            both_zero;
-    
- 
+
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
-         
+
          for ( i = 0; i < nelmts; i++)
          {
              memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
              memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-             
+
              if ( PDIFF(temp1_ulong,temp2_ulong) > options->delta)
              {
                  if ( print_data(options) )
@@ -4409,22 +4409,22 @@ hsize_t diff_ulong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
          }
-         
+
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
          memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-         
+
          PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4436,9 +4436,9 @@ hsize_t diff_ulong(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -4456,21 +4456,21 @@ hsize_t diff_ulong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
          memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-         
+
          PER_UNSIGN(signed long,temp1_ulong,temp2_ulong);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4482,9 +4482,9 @@ hsize_t diff_ulong(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && PDIFF(temp1_ulong,temp2_ulong) > options->delta )
              {
                  if ( print_data(options) )
@@ -4502,16 +4502,16 @@ hsize_t diff_ulong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ulong, mem1, sizeof(unsigned long));
          memcpy(&temp2_ulong, mem2, sizeof(unsigned long));
-         
+
          if (temp1_ulong != temp2_ulong)
          {
              if ( print_data(options) )
@@ -4522,15 +4522,15 @@ hsize_t diff_ulong(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(unsigned long);
          mem2+=sizeof(unsigned long);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -4565,16 +4565,16 @@ hsize_t diff_llong(unsigned char *mem1,
  hsize_t       i;
  double        per;
  int           both_zero;
- 
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_llong, mem1, sizeof(long_long));
          memcpy(&temp2_llong, mem2, sizeof(long_long));
-         
+
          if (ABS( temp1_llong-temp2_llong) > options->delta)
          {
              if ( print_data(options) )
@@ -4590,20 +4590,20 @@ hsize_t diff_llong(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_llong, mem1, sizeof(long_long));
          memcpy(&temp2_llong, mem2, sizeof(long_long));
-         
+
          PER(temp1_llong,temp2_llong);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4615,9 +4615,9 @@ hsize_t diff_llong(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -4633,21 +4633,21 @@ hsize_t diff_llong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_llong, mem1, sizeof(long_long));
          memcpy(&temp2_llong, mem2, sizeof(long_long));
-         
+
          PER(temp1_llong,temp2_llong);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4659,9 +4659,9 @@ hsize_t diff_llong(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && ABS(temp1_llong-temp2_llong) > options->delta )
              {
                  if ( print_data(options) )
@@ -4677,16 +4677,16 @@ hsize_t diff_llong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_llong, mem1, sizeof(long_long));
          memcpy(&temp2_llong, mem2, sizeof(long_long));
-         
+
          if (temp1_llong != temp2_llong)
          {
              if ( print_data(options) )
@@ -4697,15 +4697,15 @@ hsize_t diff_llong(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(long_long);
          mem2+=sizeof(long_long);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -4741,16 +4741,16 @@ hsize_t diff_ullong(unsigned char *mem1,
  float               f1, f2;
  double              per;
  int                 both_zero;
-    
+
  /* -d and !-p */
  if (options->d && !options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
          memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
-         
+
          if ( PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long) options->delta)
          {
              if ( print_data(options) )
@@ -4766,22 +4766,22 @@ hsize_t diff_ullong(unsigned char *mem1,
          if (options->n && nfound>=options->count)
              return nfound;
      }
-     
+
  }
- 
+
  /* !-d and -p */
  else if (!options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
          memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
-         
+
          ull2float(temp1_ullong,&f1);
          ull2float(temp2_ullong,&f2);
          PER(f1,f2);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4793,9 +4793,9 @@ hsize_t diff_ullong(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent )
              {
                  if ( print_data(options) )
@@ -4811,23 +4811,23 @@ hsize_t diff_ullong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
-     
+
+
  }
- 
+
  /* -d and -p */
  else if ( options->d && options->p)
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
          memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
-         
+
          ull2float(temp1_ullong,&f1);
          ull2float(temp2_ullong,&f2);
          PER(f1,f2);
-         
+
          if (not_comparable && !both_zero) /* not comparable */
          {
              if ( print_data(options) )
@@ -4839,9 +4839,9 @@ hsize_t diff_ullong(unsigned char *mem1,
              options->not_cmp=1;
              nfound++;
          }
-         
+
          else
-             
+
              if ( per > options->percent && PDIFF(temp1_ullong,temp2_ullong) > (unsigned long_long)options->delta )
              {
                  if ( print_data(options) )
@@ -4857,16 +4857,16 @@ hsize_t diff_ullong(unsigned char *mem1,
              if (options->n && nfound>=options->count)
                  return nfound;
      }
-     
+
  }
  else
  {
-     
+
      for ( i = 0; i < nelmts; i++)
      {
          memcpy(&temp1_ullong, mem1, sizeof(unsigned long_long));
          memcpy(&temp2_ullong, mem2, sizeof(unsigned long_long));
-         
+
          if (temp1_ullong != temp2_ullong)
          {
              if ( print_data(options) )
@@ -4877,15 +4877,15 @@ hsize_t diff_ullong(unsigned char *mem1,
              }
              nfound++;
          }
-         
+
          mem1+=sizeof(unsigned long_long);
          mem2+=sizeof(unsigned long_long);
          if (options->n && nfound>=options->count)
              return nfound;
      } /* nelmts */
-     
+
  }
- 
+
  return nfound;
 }
 
@@ -4945,8 +4945,8 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    equal_double
  *
- * Purpose:     use a relative error formula to deal with floating point 
- *              uncertainty 
+ * Purpose:     use a relative error formula to deal with floating point
+ *              uncertainty
  *
  * Programmer:  pvn
  *              October 24, 2006
@@ -4956,8 +4956,8 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-static 
-hbool_t equal_double(double value, double expected)                               
+static
+hbool_t equal_double(double value, double expected)
 {
     int both_zero;
     int is_zero;
@@ -4972,7 +4972,7 @@ hbool_t equal_double(double value, double expected)
     int isnan2 = my_isnan(FLT_DOUBLE,&expected);
 
    /*-------------------------------------------------------------------------
-    * we consider NaN == NaN to be true 
+    * we consider NaN == NaN to be true
     *-------------------------------------------------------------------------
     */
     if ( isnan1 && isnan2 )
@@ -5008,14 +5008,14 @@ hbool_t equal_double(double value, double expected)
         return TRUE;
     else
         return FALSE;
-    
+
 }
 
 /*-------------------------------------------------------------------------
  * Function:    equal_float
  *
- * Purpose:     use a relative error formula to deal with floating point 
- *              uncertainty 
+ * Purpose:     use a relative error formula to deal with floating point
+ *              uncertainty
  *
  * Programmer:  pvn
  *              October 24, 2006
@@ -5025,8 +5025,8 @@ hbool_t equal_double(double value, double expected)
  *
  *-------------------------------------------------------------------------
  */
-static 
-hbool_t equal_float(float value, float expected)                               
+static
+hbool_t equal_float(float value, float expected)
 {
     int both_zero;
     int is_zero;
@@ -5041,7 +5041,7 @@ hbool_t equal_float(float value, float expected)
     int isnan2 = my_isnan(FLT_FLOAT,&expected);
 
    /*-------------------------------------------------------------------------
-    * we consider NaN == NaN to be true 
+    * we consider NaN == NaN to be true
     *-------------------------------------------------------------------------
     */
     if ( isnan1 && isnan2 )
@@ -5064,7 +5064,7 @@ hbool_t equal_float(float value, float expected)
     */
 
 #endif
-    
+
     BOTH_ZERO(value,expected)
     if (both_zero)
         return TRUE;
@@ -5077,7 +5077,7 @@ hbool_t equal_float(float value, float expected)
         return TRUE;
     else
         return FALSE;
-    
+
 }
 
 
@@ -5103,73 +5103,73 @@ my_isnan(dtype_t type, void *val)
 {
     int retval = 0;
     char s[256];
-    
-    if (FLT_FLOAT==type) 
+
+    if (FLT_FLOAT==type)
     {
         float x;
         HDmemcpy(&x, val, sizeof(float));
         retval = (x!=x);
 
 
- 
-    } 
-    else if (FLT_DOUBLE==type) 
+
+    }
+    else if (FLT_DOUBLE==type)
     {
         double x;
         HDmemcpy(&x, val, sizeof(double));
         retval = (x!=x);
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
-    } 
-    else if (FLT_LDOUBLE==type) 
+    }
+    else if (FLT_LDOUBLE==type)
     {
         long double x;
         HDmemcpy(&x, val, sizeof(long double));
         retval = (x!=x);
 #endif
-    } 
-    else 
+    }
+    else
     {
         return 0;
     }
-    
+
    /*
     * Sometimes NaN==NaN (e.g., DEC Alpha) so we try to print it and see if
     * the result contains a NaN string.
     */
-    if (!retval) 
+    if (!retval)
     {
-        if (FLT_FLOAT==type) 
+        if (FLT_FLOAT==type)
         {
             float x;
             HDmemcpy(&x, val, sizeof(float));
             sprintf(s, "%g", x);
 
 
-        } 
-        else if (FLT_DOUBLE==type) 
+        }
+        else if (FLT_DOUBLE==type)
         {
             double x;
             HDmemcpy(&x, val, sizeof(double));
             sprintf(s, "%g", x);
 #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE && H5_SIZEOF_LONG_DOUBLE!=0
-        } 
-        else if (FLT_LDOUBLE==type) 
+        }
+        else if (FLT_LDOUBLE==type)
         {
             long double x;
             HDmemcpy(&x, val, sizeof(long double));
             sprintf(s, "%Lg", x);
 #endif
-        } 
-        else 
+        }
+        else
         {
             return 0;
         }
-     
 
-        if ( HDstrstr(s, "NaN") || 
-             HDstrstr(s, "NAN") || 
-             HDstrstr(s, "nan") || 
-             HDstrstr(s, "-1.#IND") /* WIN32 */ 
+
+        if ( HDstrstr(s, "NaN") ||
+             HDstrstr(s, "NAN") ||
+             HDstrstr(s, "nan") ||
+             HDstrstr(s, "-1.#IND") /* WIN32 */
            )
         {
 
@@ -5180,13 +5180,13 @@ my_isnan(dtype_t type, void *val)
 
 
     }
-    
+
 #ifdef H5_VMS
     /* For "float" and "double" on OpenVMS/Alpha, NaN is
     * actually a valid value of maximal value.*/
-    if(!retval) 
+    if(!retval)
     {
-        if (FLT_FLOAT==type) 
+        if (FLT_FLOAT==type)
         {
             float x;
             HDmemcpy(&x, val, sizeof(float));
@@ -5195,17 +5195,17 @@ my_isnan(dtype_t type, void *val)
             double x;
             HDmemcpy(&x, val, sizeof(double));
             retval = (x==DBL_MAX || x==-DBL_MAX);
-        } else 
+        } else
         {
             return 0;
         }
     }
 #endif /*H5_VMS*/
-    
+
     return retval;
 }
 
 
 
 
- 
+
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index d53b656..cfe98b2 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -93,7 +93,7 @@ hsize_t diff_attr(hid_t loc1_id,
    goto error;
 
   /* use the name on the first file to open the second file */
-  H5E_BEGIN_TRY 
+  H5E_BEGIN_TRY
   {
    if((attr2_id = H5Aopen(loc2_id, name1, H5P_DEFAULT)) < 0)
     goto error;
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 3f4e6a3..6048796 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -43,35 +43,35 @@ hsize_t diff_dataset( hid_t file1_id,
     hid_t   dcpl1 = -1;
     hid_t   dcpl2 = -1;
     hsize_t nfound = 0;
-    
+
    /*-------------------------------------------------------------------------
     * open the handles
     *-------------------------------------------------------------------------
     */
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         /* open the datasets */
-        if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0) 
+        if((did1 = H5Dopen2(file1_id, obj1_name, H5P_DEFAULT)) < 0)
         {
             printf("Cannot open dataset <%s>\n", obj1_name);
             goto error;
         }
-        
-        if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0) 
+
+        if((did2 = H5Dopen2(file2_id, obj2_name, H5P_DEFAULT)) < 0)
         {
             printf("Cannot open dataset <%s>\n", obj2_name);
             goto error;
         }
         /* enable error reporting */
     } H5E_END_TRY;
-    
-    
+
+
     if ((dcpl1 = H5Dget_create_plist(did1)) < 0)
         goto error;
     if ((dcpl2 = H5Dget_create_plist(did2)) < 0)
         goto error;
-    
+
    /*-------------------------------------------------------------------------
     * check if the dataset creation property list has filters that
     * are not registered in the current configuration
@@ -93,7 +93,7 @@ hsize_t diff_dataset( hid_t file1_id,
     *-------------------------------------------------------------------------
     */
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         H5Pclose(dcpl1);
         H5Pclose(dcpl2);
@@ -101,13 +101,13 @@ hsize_t diff_dataset( hid_t file1_id,
         H5Dclose(did2);
         /* enable error reporting */
     } H5E_END_TRY;
-    
+
     return nfound;
-    
+
 error:
     options->err_stat=1;
     /* disable error reporting */
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
         H5Pclose(dcpl1);
         H5Pclose(dcpl2);
@@ -115,7 +115,7 @@ error:
         H5Dclose(did2);
         /* enable error reporting */
     } H5E_END_TRY;
-    
+
     return nfound;
 }
 
@@ -131,47 +131,47 @@ error:
  *
  * Date: May 9, 2003
  *
- * Modifications: 
+ * Modifications:
  *
  * October 2006:  Read by hyperslabs for big datasets.
  *
  *  A threshold of H5TOOLS_MALLOCSIZE (128 MB) is the limit upon which I/O hyperslab is done
- *  i.e., if the memory needed to read a dataset is greater than this limit, 
- *  then hyperslab I/O is done instead of one operation I/O 
+ *  i.e., if the memory needed to read a dataset is greater than this limit,
+ *  then hyperslab I/O is done instead of one operation I/O
  *  For each dataset, the memory needed is calculated according to
  *
  *  memory needed = number of elements * size of each element
  *
- *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations 
+ *  if the memory needed is lower than H5TOOLS_MALLOCSIZE, then the following operations
  *  are done
  *
  *  H5Dread( input_dataset1 )
  *  H5Dread( input_dataset2 )
  *
- *  with all elements in the datasets selected. If the memory needed is greater than 
+ *  with all elements in the datasets selected. If the memory needed is greater than
  *  H5TOOLS_MALLOCSIZE, then the following operations are done instead:
  *
- *  a strip mine is defined for each dimension k (a strip mine is defined as a 
+ *  a strip mine is defined for each dimension k (a strip mine is defined as a
  *  hyperslab whose size is memory manageable) according to the formula
  *
  *  (1) strip_mine_size[k ] = MIN(dimension[k ], H5TOOLS_BUFSIZE / size of memory type)
  *
- *  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures 
- *  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip 
- *  mine size k is simply defined as its dimension k, but for larger datasets the 
+ *  where H5TOOLS_BUFSIZE is a constant currently defined as 1MB. This formula assures
+ *  that for small datasets (small relative to the H5TOOLS_BUFSIZE constant), the strip
+ *  mine size k is simply defined as its dimension k, but for larger datasets the
  *  hyperslab size is still memory manageable.
- *  a cycle is done until the number of elements in the dataset is reached. In each 
- *  iteration, two parameters are defined for the function H5Sselect_hyperslab, 
+ *  a cycle is done until the number of elements in the dataset is reached. In each
+ *  iteration, two parameters are defined for the function H5Sselect_hyperslab,
  *  the start and size of each hyperslab, according to
  *
  *  (2) hyperslab_size [k] = MIN(dimension[k] - hyperslab_offset[k], strip_mine_size [k])
  *
- *  where hyperslab_offset [k] is initially set to zero, and later incremented in 
- *  hyperslab_size[k] offsets. The reason for the operation 
+ *  where hyperslab_offset [k] is initially set to zero, and later incremented in
+ *  hyperslab_size[k] offsets. The reason for the operation
  *
  *  dimension[k] - hyperslab_offset[k]
  *
- *  in (2) is that, when using the strip mine size, it assures that the "remaining" part 
+ *  in (2) is that, when using the strip mine size, it assures that the "remaining" part
  *  of the dataset that does not fill an entire strip mine is processed.
  *
  *-------------------------------------------------------------------------
@@ -185,13 +185,13 @@ hsize_t diff_datasetid( hid_t did1,
     hid_t      sid1=-1;
     hid_t      sid2=-1;
     hid_t      f_tid1=-1;
-    hid_t      f_tid2=-1;                
+    hid_t      f_tid2=-1;
     hid_t      m_tid1=-1;
-    hid_t      m_tid2=-1;                
+    hid_t      m_tid2=-1;
     size_t     m_size1;
-    size_t     m_size2;               
+    size_t     m_size2;
     H5T_sign_t sign1;
-    H5T_sign_t sign2;                 
+    H5T_sign_t sign2;
     int        rank1;
     int        rank2;
     hsize_t    nelmts1;
@@ -206,60 +206,60 @@ hsize_t diff_datasetid( hid_t did1,
     hsize_t    storage_size2;
     hsize_t    nfound=0;               /* number of differences found */
     int        cmp=1;                  /* do diff or not */
-    void       *buf1=NULL;                  
-    void       *buf2=NULL; 
-    void       *sm_buf1=NULL;                
+    void       *buf1=NULL;
+    void       *buf2=NULL;
+    void       *sm_buf1=NULL;
     void       *sm_buf2=NULL;
     size_t     need;                   /* bytes needed for malloc */
     int        i;
-    
+
     /* get the dataspace handle */
     if ( (sid1 = H5Dget_space(did1)) < 0 )
         goto error;
-    
+
     /* get rank */
     if ( (rank1 = H5Sget_simple_extent_ndims(sid1)) < 0 )
         goto error;
-    
+
     /* get the dataspace handle */
     if ( (sid2 = H5Dget_space(did2)) < 0 )
         goto error;
-    
+
     /* get rank */
     if ( (rank2 = H5Sget_simple_extent_ndims(sid2)) < 0 )
         goto error;
-    
+
     /* get dimensions */
     if ( H5Sget_simple_extent_dims(sid1,dims1,maxdim1) < 0 )
         goto error;
-    
+
     /* get dimensions */
     if ( H5Sget_simple_extent_dims(sid2,dims2,maxdim2) < 0 )
         goto error;
-    
+
     /*-------------------------------------------------------------------------
      * get the file data type
      *-------------------------------------------------------------------------
      */
-    
+
     /* get the data type */
     if ( (f_tid1 = H5Dget_type(did1)) < 0 )
         goto error;
-    
+
     /* get the data type */
     if ( (f_tid2 = H5Dget_type(did2)) < 0 )
         goto error;
-    
+
     /*-------------------------------------------------------------------------
      * check for empty datasets
      *-------------------------------------------------------------------------
      */
-    
+
     storage_size1=H5Dget_storage_size(did1);
     storage_size2=H5Dget_storage_size(did2);
     if (storage_size1<0 || storage_size2<0)
         goto error;
-    
+
     if (storage_size1==0 || storage_size2==0)
     {
         if (options->m_verbose && obj1_name && obj2_name)
@@ -267,12 +267,12 @@ hsize_t diff_datasetid( hid_t did1,
         cmp=0;
         options->not_cmp=1;
     }
-    
+
    /*-------------------------------------------------------------------------
     * check for comparable TYPE and SPACE
     *-------------------------------------------------------------------------
     */
-    
+
     if (diff_can_type(f_tid1,
         f_tid2,
         rank1,
@@ -288,46 +288,46 @@ hsize_t diff_datasetid( hid_t did1,
         cmp=0;
         options->not_cmp=1;
     }
-    
+
    /*-------------------------------------------------------------------------
     * memory type and sizes
     *-------------------------------------------------------------------------
     */
     if ((m_tid1=h5tools_get_native_type(f_tid1)) < 0)
         goto error;
-    
+
     if ((m_tid2=h5tools_get_native_type(f_tid2)) < 0)
         goto error;
-    
+
     m_size1 = H5Tget_size( m_tid1 );
     m_size2 = H5Tget_size( m_tid2 );
-    
+
    /*-------------------------------------------------------------------------
     * check for different signed/unsigned types
     *-------------------------------------------------------------------------
     */
-    
+
     sign1=H5Tget_sign(m_tid1);
     sign2=H5Tget_sign(m_tid2);
     if ( sign1 != sign2 )
     {
-        if (options->m_verbose && obj1_name) 
+        if (options->m_verbose && obj1_name)
         {
             parallel_print("Comparison not supported: <%s> has sign %s ", obj1_name, get_sign(sign1));
             parallel_print("and <%s> has sign %s\n", obj2_name, get_sign(sign2));
         }
-        
+
         cmp=0;
         options->not_cmp=1;
     }
-    
+
    /*-------------------------------------------------------------------------
     * only attempt to compare if possible
     *-------------------------------------------------------------------------
     */
     if (cmp)
     {
-        
+
        /*-------------------------------------------------------------------------
         * get number of elements
         *-------------------------------------------------------------------------
@@ -337,43 +337,43 @@ hsize_t diff_datasetid( hid_t did1,
         {
             nelmts1 *= dims1[i];
         }
-        
+
         nelmts2 = 1;
         for (i = 0; i < rank2; i++)
         {
             nelmts2 *= dims2[i];
         }
-        
+
         assert(nelmts1==nelmts2);
-        
+
        /*-------------------------------------------------------------------------
         * "upgrade" the smaller memory size
         *-------------------------------------------------------------------------
         */
-        
+
         if ( m_size1 != m_size2 )
         {
             if ( m_size1 < m_size2 )
             {
                 H5Tclose(m_tid1);
-                
+
                 if ((m_tid1=h5tools_get_native_type(f_tid2)) < 0)
                     goto error;
-                
+
                 m_size1 = H5Tget_size( m_tid1 );
             }
             else
             {
                 H5Tclose(m_tid2);
-                
+
                 if ((m_tid2=h5tools_get_native_type(f_tid1)) < 0)
                     goto error;
-                
+
                 m_size2 = H5Tget_size( m_tid2 );
             }
         }
         assert(m_size1==m_size2);
-        
+
         /* print names */
         if (obj1_name) {
             name1=diff_basename(obj1_name);
@@ -381,27 +381,27 @@ hsize_t diff_datasetid( hid_t did1,
         if (obj2_name) {
             name2=diff_basename(obj2_name);
         }
-        
-        
+
+
        /*-------------------------------------------------------------------------
         * read/compare
         *-------------------------------------------------------------------------
         */
-        
+
         need = (size_t)(nelmts1*m_size1);  /* bytes needed */
         if ( need < H5TOOLS_MALLOCSIZE)
         {
             buf1 = HDmalloc(need);
             buf2 = HDmalloc(need);
         }
-        
+
         if ( buf1!=NULL && buf2!=NULL)
         {
             if ( H5Dread(did1,m_tid1,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf1) < 0 )
                 goto error;
             if ( H5Dread(did2,m_tid2,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf2) < 0 )
                 goto error;
-            
+
             /* array diff */
             nfound = diff_array(buf1,
                 buf2,
@@ -416,61 +416,61 @@ hsize_t diff_datasetid( hid_t did1,
                 did1,
                 did2);
         }
-        
+
         else /* possibly not enough memory, read/compare by hyperslabs */
-            
+
         {
             size_t        p_type_nbytes = m_size1; /*size of memory type */
             hsize_t       p_nelmts = nelmts1;      /*total selected elmts */
             hsize_t       elmtno;                  /*counter  */
             int           carry;                   /*counter carry value */
             unsigned int  vl_data = 0;             /*contains VL datatypes */
-            
+
             /* stripmine info */
             hsize_t       sm_size[H5S_MAX_RANK];   /*stripmine size */
             hsize_t       sm_nbytes;               /*bytes per stripmine */
             hsize_t       sm_nelmts;               /*elements per stripmine*/
             hid_t         sm_space;                /*stripmine data space */
-            
+
             /* hyperslab info */
             hsize_t       hs_offset[H5S_MAX_RANK]; /*starting offset */
             hsize_t       hs_size[H5S_MAX_RANK];   /*size this pass */
             hsize_t       hs_nelmts;               /*elements in request */
             hsize_t       zero[8];                 /*vector of zeros */
-            
+
             /* check if we have VL data in the dataset's datatype */
             if (H5Tdetect_class(m_tid1, H5T_VLEN) == TRUE)
                 vl_data = TRUE;
-            
+
             /*
              * determine the strip mine size and allocate a buffer. The strip mine is
              * a hyperslab whose size is manageable.
              */
             sm_nbytes = p_type_nbytes;
-            
-            for (i = rank1; i > 0; --i) 
+
+            for (i = rank1; i > 0; --i)
             {
                 sm_size[i - 1] = MIN(dims1[i - 1], H5TOOLS_BUFSIZE / sm_nbytes);
                 sm_nbytes *= sm_size[i - 1];
                 assert(sm_nbytes > 0);
             }
-            
+
             sm_buf1 = malloc((size_t)sm_nbytes);
             sm_buf2 = malloc((size_t)sm_nbytes);
-            
+
             sm_nelmts = sm_nbytes / p_type_nbytes;
             sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
-            
+
             /* the stripmine loop */
             memset(hs_offset, 0, sizeof hs_offset);
             memset(zero, 0, sizeof zero);
-            
-            for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) 
+
+            for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts)
             {
                 /* calculate the hyperslab size */
-                if (rank1 > 0) 
+                if (rank1 > 0)
                 {
-                    for (i = 0, hs_nelmts = 1; i < rank1; i++) 
+                    for (i = 0, hs_nelmts = 1; i < rank1; i++)
                     {
                         hs_size[i] = MIN(dims1[i] - hs_offset[i], sm_size[i]);
                         hs_nelmts *= hs_size[i];
@@ -481,22 +481,22 @@ hsize_t diff_datasetid( hid_t did1,
                         goto error;
                     if (H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, zero, NULL, &hs_nelmts, NULL) < 0)
                         goto error;
-                } 
-                else 
+                }
+                else
                 {
                     H5Sselect_all(sid1);
                     H5Sselect_all(sid2);
                     H5Sselect_all(sm_space);
                     hs_nelmts = 1;
                 } /* rank */
-                
+
                 if ( H5Dread(did1,m_tid1,sm_space,sid1,H5P_DEFAULT,sm_buf1) < 0 )
                     goto error;
                 if ( H5Dread(did2,m_tid2,sm_space,sid2,H5P_DEFAULT,sm_buf2) < 0 )
                     goto error;
-                
-                /* get array differences. in the case of hyperslab read, increment the 
-                   number of differences found in each hyperslab and pass the 
+
+                /* get array differences. in the case of hyperslab read, increment the
+                   number of differences found in each hyperslab and pass the
                    position at the beggining for printing
                  */
                 nfound += diff_array(sm_buf1,
@@ -511,16 +511,16 @@ hsize_t diff_datasetid( hid_t did1,
                     m_tid1,
                     did1,
                     did2);
-                
+
                 /* reclaim any VL memory, if necessary */
                 if(vl_data)
                 {
                     H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf1);
                     H5Dvlen_reclaim(m_tid1, sm_space, H5P_DEFAULT, sm_buf2);
                 }
-                
+
                 /* calculate the next hyperslab offset */
-                for (i = rank1, carry = 1; i > 0 && carry; --i) 
+                for (i = rank1, carry = 1; i > 0 && carry; --i)
                 {
                     hs_offset[i - 1] += hs_size[i - 1];
                     if (hs_offset[i - 1] == dims1[i - 1])
@@ -529,7 +529,7 @@ hsize_t diff_datasetid( hid_t did1,
                         carry = 0;
                 } /* i */
             } /* elmtno */
-            
+
             H5Sclose(sm_space);
             /* free */
             if (sm_buf1!=NULL)
@@ -542,24 +542,24 @@ hsize_t diff_datasetid( hid_t did1,
                 free(sm_buf2);
                 sm_buf2=NULL;
             }
-            
+
   } /* hyperslab read */
  }/*cmp*/
- 
+
  /*-------------------------------------------------------------------------
   * compare attributes
   * the if condition refers to cases when the dataset is a referenced object
   *-------------------------------------------------------------------------
   */
-  
+
   if (obj1_name)
       nfound += diff_attr(did1,did2,obj1_name,obj2_name,options);
-  
+
  /*-------------------------------------------------------------------------
   * close
   *-------------------------------------------------------------------------
   */
-  
+
   /* free */
   if (buf1!=NULL)
   {
@@ -581,8 +581,8 @@ hsize_t diff_datasetid( hid_t did1,
       free(sm_buf2);
       sm_buf2=NULL;
   }
-  
-  H5E_BEGIN_TRY 
+
+  H5E_BEGIN_TRY
   {
       H5Sclose(sid1);
       H5Sclose(sid2);
@@ -591,12 +591,12 @@ hsize_t diff_datasetid( hid_t did1,
       H5Tclose(m_tid1);
       H5Tclose(m_tid2);
   } H5E_END_TRY;
-  
+
   return nfound;
-  
+
 error:
   options->err_stat=1;
-  
+
   /* free */
   if (buf1!=NULL)
   {
@@ -618,9 +618,9 @@ error:
       free(sm_buf2);
       sm_buf2=NULL;
   }
-  
+
   /* disable error reporting */
-  H5E_BEGIN_TRY 
+  H5E_BEGIN_TRY
   {
       H5Sclose(sid1);
       H5Sclose(sid2);
@@ -630,7 +630,7 @@ error:
       H5Tclose(m_tid2);
       /* enable error reporting */
   } H5E_END_TRY;
-  
+
   return nfound;
 }
 
@@ -668,21 +668,21 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     int          maxdim_diff=0;          /* maximum dimensions are different */
     int          dim_diff=0;             /* current dimensions are different */
     int          i;
-    
+
    /*-------------------------------------------------------------------------
     * check for the same class
     *-------------------------------------------------------------------------
     */
-    
+
     if ((tclass1=H5Tget_class(f_tid1)) < 0)
         return -1;
-    
+
     if ((tclass2=H5Tget_class(f_tid2)) < 0)
         return -1;
-    
+
     if ( tclass1 != tclass2 )
     {
-        if (options->m_verbose && obj1_name) 
+        if (options->m_verbose && obj1_name)
         {
             printf("Comparison not possible: <%s> is of class %s and <%s> is of class %s\n",
                 obj1_name, get_class(tclass1),
@@ -690,12 +690,12 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         }
         return 0;
     }
-    
+
    /*-------------------------------------------------------------------------
     * check for non supported classes
     *-------------------------------------------------------------------------
     */
-    
+
     assert(tclass1==tclass2);
     switch (tclass1)
     {
@@ -709,21 +709,21 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
     case H5T_ENUM:
     case H5T_VLEN:
     case H5T_REFERENCE:
-        
+
         break;
-        
+
     default: /*H5T_TIME */
         if (options->m_verbose && obj1_name )
             printf("Comparison not supported: <%s> and <%s> are of class %s\n",
             obj1_name,obj2_name,get_class(tclass2) );
         return 0;
     }
-    
+
    /*-------------------------------------------------------------------------
     * check for equal file datatype; warning only
     *-------------------------------------------------------------------------
     */
-    
+
     if ( (H5Tequal(f_tid1, f_tid2)==0) && options->m_verbose && obj1_name)
     {
         printf("Warning: different storage datatype\n");
@@ -734,15 +734,15 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         print_type(f_tid2);
         printf("\n");
     }
-    
+
    /*-------------------------------------------------------------------------
     * check for the same rank
     *-------------------------------------------------------------------------
     */
-    
+
     if ( rank1 != rank2 )
     {
-        if (options->m_verbose && obj1_name) 
+        if (options->m_verbose && obj1_name)
         {
             printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
             print_dimensions(rank1,dims1);
@@ -756,12 +756,12 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         }
         return 0;
     }
-    
+
    /*-------------------------------------------------------------------------
     * check for different dimensions
     *-------------------------------------------------------------------------
     */
-    
+
     assert(rank1==rank2);
     for ( i=0; i<rank1; i++)
     {
@@ -773,19 +773,19 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         if ( dims1[i] != dims2[i] )
             dim_diff=1;
     }
-    
+
    /*-------------------------------------------------------------------------
     * current dimensions
     *-------------------------------------------------------------------------
     */
-    
+
     if (dim_diff==1)
     {
-        if (options->m_verbose && obj1_name) 
+        if (options->m_verbose && obj1_name)
         {
             printf("Comparison not supported: <%s> has rank %d, dimensions ", obj1_name, rank1);
             print_dimensions(rank1,dims1);
-            if (maxdim1 && maxdim2) 
+            if (maxdim1 && maxdim2)
             {
                 printf(", max dimensions ");
                 print_dimensions(rank1,maxdim1);
@@ -798,14 +798,14 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
         }
         return 0;
     }
-    
+
    /*-------------------------------------------------------------------------
     * maximum dimensions; just give a warning
     *-------------------------------------------------------------------------
     */
     if (maxdim1 && maxdim2 && maxdim_diff==1 && obj1_name )
     {
-        if (options->m_verbose) 
+        if (options->m_verbose)
         {
             printf( "Warning: different maximum dimensions\n");
             printf("<%s> has max dimensions ", obj1_name);
@@ -816,7 +816,7 @@ int diff_can_type( hid_t       f_tid1, /* file data type */
             printf("\n");
         }
     }
-    
+
     return 1;
 }
 
@@ -878,7 +878,7 @@ void print_sizes( const char *obj1,
 /*-------------------------------------------------------------------------
  * Function: print_size
  *
- * Purpose: print dimensions 
+ * Purpose: print dimensions
  *
  *-------------------------------------------------------------------------
  */
@@ -896,7 +896,7 @@ print_size (int rank, hsize_t *dims)
     }
     parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
     parallel_print("]\n" );
-    
+
 }
 #endif /* H5DIFF_DEBUG */
 
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 4cddbfb..f1e5f54 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -93,7 +93,7 @@ void parallel_print(const char* format, ...)
 /*-------------------------------------------------------------------------
  * Function: print_dimensions
  *
- * Purpose: print dimensions 
+ * Purpose: print dimensions
  *
  *-------------------------------------------------------------------------
  */
@@ -110,7 +110,7 @@ print_dimensions (int rank, hsize_t *dims)
     }
     parallel_print("%"H5_PRINTF_LL_WIDTH"u", (unsigned long_long)dims[rank-1]);
     parallel_print("]" );
-    
+
 }
 
 
@@ -192,7 +192,7 @@ void print_type(hid_t type)
             printf("undefined integer");
         }
         break;
-        
+
     case H5T_FLOAT:
         if (H5Tequal(type, H5T_IEEE_F32BE)) {
             printf("H5T_IEEE_F32BE");
@@ -214,7 +214,7 @@ void print_type(hid_t type)
             printf("undefined float");
         }
         break;
-        
+
     }/*switch*/
 }
 
@@ -233,19 +233,19 @@ const char*
 diff_basename(const char *name)
 {
     size_t i;
-    
+
     if (name==NULL)
         return NULL;
-    
+
     /* Find the end of the base name */
     i = strlen(name);
     while (i>0 && '/'==name[i-1])
         --i;
-    
+
     /* Skip backward over base name */
     while (i>0 && '/'!=name[i-1])
         --i;
-    
+
     return(name+i);
 }
 
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 120d433..71a2449 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -556,11 +556,11 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
                                     *to the ctx->size_last_dim.   */
 
      /* binary dump */
-    if(bin_output) 
+    if(bin_output)
     {
         do_bin_output(stream, nelmts, type, _mem);
     } /* end if */
-    else 
+    else
     {
         /* setup */
         HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -712,7 +712,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
  *
  *  Select a hyperslab from the dataset DSET using the parameters
  *   specified in SSET. Dump this out to STREAM.
- *      
+ *
  *  Hyperslabs select "count" blocks of size "block", spaced "stride" elements
  *   from each other, starting at coordinate "start".
  *
@@ -727,22 +727,22 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai
  *
  * Algorithm
  *
- * In a inner loop, the parameters from SSET are translated into temporary 
- * variables so that 1 row is printed at a time (getting the coordinate indices 
+ * In a inner loop, the parameters from SSET are translated into temporary
+ * variables so that 1 row is printed at a time (getting the coordinate indices
  * at each row).
- * We define the stride, count and block to be 1 in the row dimension to achieve 
- * this and advance until all points are printed. 
- * An outer loop for cases where dimensionality is greater than 2D is made. 
- * In each iteration, the 2D block is displayed in the inner loop. The remaining 
+ * We define the stride, count and block to be 1 in the row dimension to achieve
+ * this and advance until all points are printed.
+ * An outer loop for cases where dimensionality is greater than 2D is made.
+ * In each iteration, the 2D block is displayed in the inner loop. The remaining
  * slower dimensions above the first 2 are incremented one at a time in the outer loop
  *
  * The element position is obtained from the matrix according to:
- *       Given an index I(z,y,x) its position from the beginning of an array 
+ *       Given an index I(z,y,x) its position from the beginning of an array
  *       of sizes A(size_z, size_y,size_x) is given by
- *       Position of I(z,y,x) = index_z * size_y * size_x 
+ *       Position of I(z,y,x) = index_z * size_y * size_x
  *                             + index_y * size_x
  *                             + index_x
- * 
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -784,14 +784,14 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
     hsize_t total_points = 1; /* to print */
     hsize_t printed_points = 0; /* printed */
 #endif
-    
+
 
     ret = FAIL;     /* be pessimistic */
     f_space = H5Dget_space(dset);
-    
+
     if (f_space == FAIL)
         goto done;
-    
+
     /*
      * check that everything looks okay. the dimensionality must not be too
      * great and the dimensionality of the items selected for printing must
@@ -838,7 +838,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
         total_points *= sset->count[ i ] * sset->block[ i ];;
     }
 #endif
-    
+
 
 
     /* initialize temporary start, count and maximum start */
@@ -857,55 +857,55 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
         {
             max_start[ i ] = temp_start[ i ] + sset->count[ i ];
             temp_count[ i ] = 1;
-            
+
         }
     }
 
-      
+
     /* offset loop */
     for (n = 0; n < outer_count; n++)
     {
 
-        hsize_t row_counter = 0; 
+        hsize_t row_counter = 0;
 
         /* number of read iterations in inner loop, read by rows, to match 2D display */
         if (ctx.ndims > 1)
         {
-            
+
         /* count is the number of iterations to display all the rows,
             the block size count times */
             count = sset->count[ row_dim ] * sset->block[ row_dim ];
-            
+
             /* always 1 row_counter at a time, that is a block of size 1, 1 time */
-            temp_count[ row_dim ] = 1; 
-            temp_block[ row_dim ] = 1;  
-            
+            temp_count[ row_dim ] = 1;
+            temp_block[ row_dim ] = 1;
+
             /* advance 1 row_counter at a time  */
             if (sset->block[ row_dim ] > 1 )
                 temp_stride[ row_dim ] = 1;
-            
-            
+
+
         }
         /* for the 1D case */
         else
         {
             count = 1;
         }
-        
-        
+
+
         size_row_block = sset->block[ row_dim ];
 
-   
+
         /* display loop */
-        for (; count > 0; 
+        for (; count > 0;
                temp_start[ row_dim ] += temp_stride[ row_dim ],
                count--)
                {
 
-     
+
                    /* jump rows if size of block exceeded
                       cases where block > 1 only and stride > block */
-                   if ( size_row_block > 1 && 
+                   if ( size_row_block > 1 &&
                         row_counter == size_row_block  &&
                         sset->stride[ row_dim ] > sset->block[ row_dim ]
                         )
@@ -917,7 +917,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
                        temp_start[ row_dim ] += increase_rows;
 
                        row_counter = 0;
-                           
+
                    }
 
                    row_counter++;
@@ -930,32 +930,32 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
                 temp_count,
                 temp_block);
             sm_nelmts = H5Sget_select_npoints(f_space);
-             
+
             if (sm_nelmts == 0) {
                 /* nothing to print */
                 ret = SUCCEED;
                 goto done_close;
             }
-            
+
             /*
             * determine the strip mine size and allocate a buffer. the strip mine is
             * a hyperslab whose size is manageable.
             */
             sm_nbytes = p_type_nbytes = H5Tget_size(p_type);
-            
+
             if (ctx.ndims > 0)
                 for (i = ctx.ndims; i > 0; --i) {
                     sm_size[i - 1] = MIN(total_size[i - 1], H5TOOLS_BUFSIZE / sm_nbytes);
                     sm_nbytes *= sm_size[i - 1];
                     assert(sm_nbytes > 0);
                 }
-                
+
                 assert(sm_nbytes == (hsize_t)((size_t)sm_nbytes)); /*check for overflow*/
                 sm_buf = malloc((size_t)sm_nelmts * p_type_nbytes);
                 sm_space = H5Screate_simple(1, &sm_nelmts, NULL);
-                
+
                 H5Sselect_hyperslab(sm_space, H5S_SELECT_SET, &zero, NULL, &sm_nelmts, NULL);
-                
+
                 /* read the data */
                 if (H5Dread(dset, p_type, sm_space, f_space, H5P_DEFAULT, sm_buf) < 0) {
                     H5Sclose(f_space);
@@ -963,43 +963,43 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
                     free(sm_buf);
                     return FAIL;
                 }
-                
+
                 /* print the data */
                 flags = START_OF_DATA;
-                
+
                 if (count == 1)
                     flags |= END_OF_DATA;
-                
+
                 for (i = 0; i < ctx.ndims; i++)
                     ctx.p_max_idx[i] = ctx.p_min_idx[i] + MIN(total_size[i], sm_size[i]);
-                
+
                 /* print array indices. get the lower bound of the hyperslab and calulate
                 the element position at the start of hyperslab */
                 H5Sget_select_bounds(f_space,low,high);
                 elmtno=0;
-                for (i = 0; i < (size_t)ctx.ndims-1; i++) 
+                for (i = 0; i < (size_t)ctx.ndims-1; i++)
                 {
                     hsize_t offset = 1; /* accumulation of the previous dimensions */
-                    for (j = i+1; j < (size_t)ctx.ndims; j++) 
+                    for (j = i+1; j < (size_t)ctx.ndims; j++)
                         offset *= total_size[j];
                     elmtno+= low[i] * offset;
                 }
                 elmtno+= low[ctx.ndims - 1];
-                
+
                 /* initialize the current stripmine position; this is necessary to print the array
                 indices */
                 ctx.sm_pos = elmtno;
-                
+
                 h5tools_dump_simple_data(stream, info, dset, &ctx, flags, sm_nelmts,
                     p_type, sm_buf);
                 free(sm_buf);
-                
+
                 /* we need to jump to next line and update the index */
                 ctx.need_prefix = 1;
-                
+
                 ctx.continuation++;
-                
-                
+
+
 #if defined (SANITY_CHECK)
                 printed_points += sm_nelmts;
 #endif
@@ -1011,14 +1011,14 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
         {
             /* dimension for start */
             current_outer_dim = (ctx.ndims - 2) -1;
-            
+
             /* set start to original from current_outer_dim up */
             for (i = current_outer_dim + 1; i < ctx.ndims; i++)
             {
                 temp_start[ i ] = sset->start[ i ];
             }
 
-            
+
             /* increment start dimension */
             do
             {
@@ -1037,9 +1037,9 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
                 }
             }
             while (current_outer_dim >= 0 && reset_dim);
-            
+
         } /* ctx.ndims > 1 */
-        
+
     } /* outer_count */
 
 #if defined (SANITY_CHECK)
@@ -1053,9 +1053,9 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, hid_t dset
         putc('\n', stream);
         fputs(OPT(info->line_sep, ""), stream);
     }
-    
+
     ret = SUCCEED;
-    
+
 done_close:
     H5Sclose(f_space);
 done:
@@ -1128,7 +1128,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, hid_t dset,
     ctx.indent_level = indentlevel;
     ctx.need_prefix = 1;
     ctx.ndims = H5Sget_simple_extent_ndims(f_space);
-    
+
     if ((size_t)ctx.ndims > NELMTS(sm_size)) {
         H5Sclose(f_space);
         return FAIL;
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index dad73e7..fb24f76 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -40,7 +40,7 @@
 #define H5TOOLS_BUFSIZE         (1024 * 1024)
 #else
 #define H5TOOLS_BUFSIZE         (1024)
-#endif 
+#endif
 
 /*
  * Maximum size used in a call to malloc
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 80839ce..5d42307 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -338,7 +338,7 @@ h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info,
 
             h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT),
                                (hsize_t)ctx->pos[i]);
-            
+
         }
     } else {
         /* Scalar */
@@ -851,7 +851,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
             obj = H5Rdereference(container, H5R_DATASET_REGION, vp);
             region = H5Rget_region(container, H5R_DATASET_REGION, vp);
-            
+
             /* get name of the dataset the region reference points to using H5Rget_name */
             H5Rget_name(obj, H5R_DATASET_REGION, vp, (char*)ref_name, 1024);
             h5tools_str_append(str, info->dset_format, ref_name);
diff --git a/tools/lib/h5tools_type.c b/tools/lib/h5tools_type.c
index b4e6d08..bbd1b8d 100644
--- a/tools/lib/h5tools_type.c
+++ b/tools/lib/h5tools_type.c
@@ -75,7 +75,7 @@ h5tools_get_little_endian_type(hid_t tid)
  size       = H5Tget_size(tid);
  sign       = H5Tget_sign(tid);
 
- switch( type_class ) 
+ switch( type_class )
  {
  case H5T_INTEGER:
   {
@@ -88,7 +88,7 @@ h5tools_get_little_endian_type(hid_t tid)
    else if ( size == 8 && sign == H5T_SGN_2)
     p_type=H5Tcopy(H5T_STD_I64LE);
    else if ( size == 1 && sign == H5T_SGN_NONE)
-    p_type=H5Tcopy(H5T_STD_U8LE); 
+    p_type=H5Tcopy(H5T_STD_U8LE);
    else if ( size == 2 && sign == H5T_SGN_NONE)
     p_type=H5Tcopy(H5T_STD_U16LE);
    else if ( size == 4 && sign == H5T_SGN_NONE)
@@ -97,14 +97,14 @@ h5tools_get_little_endian_type(hid_t tid)
     p_type=H5Tcopy(H5T_STD_U64LE);
   }
   break;
-  
+
  case H5T_FLOAT:
   if ( size == 4)
    p_type=H5Tcopy(H5T_IEEE_F32LE);
   else if ( size == 8)
    p_type=H5Tcopy(H5T_IEEE_F64LE);
   break;
-  
+
  case H5T_TIME:
  case H5T_BITFIELD:
  case H5T_OPAQUE:
@@ -115,10 +115,10 @@ h5tools_get_little_endian_type(hid_t tid)
  case H5T_VLEN:
  case H5T_ARRAY:
   break;
-   
+
  default:
   break;
-  
+
  }
 
  return(p_type);
@@ -152,7 +152,7 @@ h5tools_get_big_endian_type(hid_t tid)
  size       = H5Tget_size(tid);
  sign       = H5Tget_sign(tid);
 
- switch( type_class ) 
+ switch( type_class )
  {
  case H5T_INTEGER:
   {
@@ -165,7 +165,7 @@ h5tools_get_big_endian_type(hid_t tid)
    else if ( size == 8 && sign == H5T_SGN_2)
     p_type=H5Tcopy(H5T_STD_I64BE);
    else if ( size == 1 && sign == H5T_SGN_NONE)
-    p_type=H5Tcopy(H5T_STD_U8BE); 
+    p_type=H5Tcopy(H5T_STD_U8BE);
    else if ( size == 2 && sign == H5T_SGN_NONE)
     p_type=H5Tcopy(H5T_STD_U16BE);
    else if ( size == 4 && sign == H5T_SGN_NONE)
@@ -174,14 +174,14 @@ h5tools_get_big_endian_type(hid_t tid)
     p_type=H5Tcopy(H5T_STD_U64BE);
   }
   break;
-  
+
  case H5T_FLOAT:
   if ( size == 4)
    p_type=H5Tcopy(H5T_IEEE_F32BE);
   else if ( size == 8)
    p_type=H5Tcopy(H5T_IEEE_F64BE);
   break;
-  
+
  case H5T_TIME:
  case H5T_BITFIELD:
  case H5T_OPAQUE:
@@ -192,13 +192,13 @@ h5tools_get_big_endian_type(hid_t tid)
  case H5T_VLEN:
  case H5T_ARRAY:
   break;
-   
+
  default:
   break;
-  
+
  }
 
- 
+
  return(p_type);
 }
 
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index fbb6163..1452a64 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -303,22 +303,22 @@ main(int argc, const char *argv[])
         error_msg(progname, "Could not close link creation property list\n");
         leave(EXIT_FAILURE);
     } /* end if */
-  
+
     /* Close file */
     if(H5Fclose(fid) < 0) {
         error_msg(progname, "Could not close output file '%s'??\n", params.fname);
         leave(EXIT_FAILURE);
     } /* end if */
-  
+
     /* Close file access property list */
     if(H5Pclose(fapl_id) < 0) {
         error_msg(progname, "Could not close file access property list\n");
         leave(EXIT_FAILURE);
     } /* end if */
-  
+
     /* Shut down h5tools lib */
     h5tools_close();
- 
+
     return 0;
 } /* end main() */
 
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 62bb0a9..e3fae4d 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -379,7 +379,7 @@
 /* #undef H5_MPI_FILE_SET_SIZE_BIG */
 
 /* Define if shared writing must be disabled (CodeWarrior only) */
-#define H5_NO_SHARED_WRITING 
+#define H5_NO_SHARED_WRITING
 
 /* Name of package */
 #define H5_PACKAGE "hdf5"
@@ -475,7 +475,7 @@
 #define H5_SIZEOF_UINT16_T 2
 
 /* The size of a `uint32_t', as computed by sizeof. */
-#define H5_SIZEOF_UINT32_T 4 
+#define H5_SIZEOF_UINT32_T 4
 
 /* The size of a `uint64_t', as computed by sizeof. */
 #define H5_SIZEOF_UINT64_T 8
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 7ccfef1..3ca17c0 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -19,7 +19,7 @@
 /*
  * End of Windows Specific Definitions
  */
- 
+
 /* Define if your system generates wrong code for log2 routine. */
 /* #undef H5_BAD_LOG2_CODE_GENERATED */