240 files changed, 4810 insertions, 4810 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 404aec9..fd08744 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 71658df..80efc5d 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 db7e358..2f87feb 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 */
@@ -227,7 +227,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 c9f70e7..e9c1615 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 71b16a6..2c22903 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) {
@@ -108,7 +108,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) {
@@ -172,7 +172,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;
 	size_t mem_used = 0;	// Memory used during allocation
@@ -239,7 +239,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
@@ -305,11 +305,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
@@ -594,7 +594,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
@@ -671,7 +671,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;
@@ -689,7 +689,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/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/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/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/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/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/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/H5Pf.c b/fortran/src/H5Pf.c
index e466152..befb1cd 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
    */
   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/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/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/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/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/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/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index da84006..9c48f77 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/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/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/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/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 bcddfdc..a6a7fa1 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>
@@ -122,7 +122,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 */
@@ -144,7 +144,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
@@ -187,7 +187,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++){
@@ -217,14 +217,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");
@@ -276,7 +276,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:
@@ -320,8 +320,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;
@@ -422,7 +422,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
@@ -461,7 +461,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;
@@ -469,7 +469,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];
@@ -486,7 +486,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) {
@@ -499,7 +499,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 */
@@ -513,7 +513,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
             GOTOERROR(FAIL);
         }
 
-        break;        
+        break;
     } /* end switch */
 
 
@@ -563,7 +563,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);
@@ -625,7 +625,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:
@@ -640,11 +640,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);
@@ -682,7 +682,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");
 
@@ -701,7 +701,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
@@ -765,7 +765,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
@@ -796,7 +796,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;
@@ -823,7 +823,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 */
@@ -837,7 +837,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
             GOTOERROR(FAIL);
         }
 
-        break;        
+        break;
     } /* end switch */
 
 
@@ -935,12 +935,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);
@@ -966,7 +966,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])
@@ -1028,7 +1028,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);
@@ -1093,18 +1093,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
@@ -1281,7 +1281,7 @@ do_cleanupfile(iotype iot, char *filename)
             }
             H5Pclose(fapl);
             break;
-      }   
+      }
 }
 }
 
diff --git a/perform/sio_perf.c b/perform/sio_perf.c
index 389d6f0..b0f81f4 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");
@@ -951,7 +951,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;
@@ -967,7 +967,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 dd2bbc5..bfe1b9b 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
@@ -1411,7 +1411,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
@@ -2397,7 +2397,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:
@@ -2435,7 +2435,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 406dad3..8597a6f 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -748,9 +748,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
  *
  *-------------------------------------------------------------------------
@@ -832,15 +832,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;
@@ -864,8 +864,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 ) &&
@@ -1004,8 +1004,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 ) ) {
@@ -1283,8 +1283,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
@@ -1371,8 +1371,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 */
@@ -1419,8 +1419,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 ) &&
@@ -1541,7 +1541,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 ) &&
@@ -1673,7 +1673,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.
      */
@@ -1778,7 +1778,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 ) &&
@@ -1875,11 +1875,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.
  *
  *-------------------------------------------------------------------------
@@ -1919,9 +1919,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 ) &&
@@ -1988,7 +1988,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));
     }
@@ -2032,8 +2032,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 ) &&
@@ -2143,7 +2143,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 ) &&
@@ -2304,7 +2304,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 ) &&
@@ -2415,8 +2415,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);
@@ -2541,11 +2541,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
@@ -2810,7 +2810,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
@@ -2818,15 +2818,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.
  *
  *-------------------------------------------------------------------------
@@ -2973,16 +2973,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),
@@ -3050,9 +3050,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
@@ -3105,7 +3105,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.
 	 */
@@ -3131,7 +3131,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->incr_mode != H5C_decr__off ) ) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h
index 0e75117..3c62fbf 100644
--- a/src/H5ACpublic.h
+++ b/src/H5ACpublic.h
@@ -57,7 +57,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.
  *
@@ -82,7 +82,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
@@ -100,7 +100,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.
  *
@@ -108,12 +108,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.
@@ -179,7 +179,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
@@ -216,7 +216,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:
@@ -241,20 +241,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
@@ -294,7 +294,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 340b4c7..aadf79c 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 * const *)attr1)->shared->name, 
+    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr1)->shared->name,
             (*(const H5A_t * const *)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 * const *)attr2)->shared->name, 
+    FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr2)->shared->name,
             (*(const H5A_t * const *)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/H5B2int.c b/src/H5B2int.c
index 0a95461..d1def45 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)
@@ -583,7 +583,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)
@@ -3160,22 +3160,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/H5C.c b/src/H5C.c
index e32c29b..382f104 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/H5Cpkg.h b/src/H5Cpkg.h
index a2dadf1..cf3f86b 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 b6545f8..0692774 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -1314,12 +1314,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);
@@ -1370,13 +1370,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 */
@@ -2420,7 +2420,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);
@@ -4103,7 +4103,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 78f4e05..8469442 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 7f17d98..88ffdc6 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -242,7 +242,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;
@@ -542,7 +542,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")
 
@@ -1155,7 +1155,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 */
@@ -1276,7 +1276,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 22b3146..e8990b9 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -165,7 +165,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,
@@ -236,9 +236,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 0f3ff58..ab21a6f 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -1142,7 +1142,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 49fdba9..45fa21a 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -164,9 +164,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;
 
@@ -254,11 +254,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 868fbe0..04be442 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 */
@@ -803,7 +803,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
  *
@@ -829,15 +829,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 */
@@ -860,7 +860,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) {
@@ -904,7 +904,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 */
@@ -912,7 +912,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 */
@@ -936,7 +936,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,
@@ -949,7 +949,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);
@@ -1003,7 +1003,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 */
@@ -1059,7 +1059,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
  *
@@ -1068,7 +1068,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)
 {
@@ -1088,7 +1088,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)
 
@@ -1109,7 +1109,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 */
@@ -1153,7 +1153,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.
          */
@@ -1162,7 +1162,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;
@@ -1183,7 +1183,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];
 
@@ -1196,7 +1196,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)
@@ -1322,14 +1322,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
  *
@@ -1338,7 +1338,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)
 {
@@ -1352,7 +1352,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)
 
@@ -1362,7 +1362,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 */
@@ -1409,7 +1409,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,
@@ -1422,7 +1422,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/ */
@@ -1531,7 +1531,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)
 {
@@ -1539,7 +1539,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)
@@ -1558,7 +1558,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;
@@ -1602,11 +1602,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;
 
@@ -1635,7 +1635,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)
@@ -1656,8 +1656,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
@@ -1667,7 +1667,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)
 {
@@ -1682,14 +1682,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.
      */
@@ -1703,7 +1703,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
 
@@ -1741,12 +1741,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 */
@@ -1778,7 +1778,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_sort_chunk() */
-    
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5D_obtain_mpio_mode
@@ -1789,7 +1789,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
@@ -1816,7 +1816,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[])
 {
@@ -1827,7 +1827,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;
@@ -1843,7 +1843,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 */
@@ -1851,7 +1851,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);
@@ -1859,22 +1859,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. */
@@ -1894,7 +1894,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)
@@ -1907,7 +1907,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)
@@ -1982,7 +1982,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;
@@ -2011,12 +2011,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 */
 
@@ -2029,7 +2029,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 fa1a516..9f02dbc 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -189,7 +189,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 */
@@ -253,7 +253,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,
@@ -556,7 +556,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 */
@@ -564,7 +564,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 9f98622..cb07708 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
@@ -811,7 +811,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;
@@ -837,9 +837,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;
@@ -856,7 +856,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.
  *
  *
@@ -888,7 +888,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/H5EAdbg.c b/src/H5EAdbg.c
index f36a65b..c75ced7 100644
--- a/src/H5EAdbg.c
+++ b/src/H5EAdbg.c
@@ -215,7 +215,7 @@ H5EA__iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int inde
         HDfprintf(stream, "%*sElements in Index Block:\n", indent, "");
         for(u = 0; u < MIN(hdr->idx_blk_elmts, hdr->max_idx_set); u++) {
             /* Call the class's 'debug' callback */
-            if((hdr->cls->debug)(stream, (indent + 6), MAX(0, (fwidth - 6)), 
+            if((hdr->cls->debug)(stream, (indent + 6), MAX(0, (fwidth - 6)),
                     (hsize_t)u,
                     ((uint8_t *)iblock->elmts) + (hdr->cls->nat_elmt_size * u)) < 0)
                 H5E_THROW(H5E_CANTGET, "can't get element for debugging")
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 7595e7f..24c165f 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -21,194 +21,194 @@
 #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_EARRAY_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_EARRAY_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=    
+/* 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=
 
-/* 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=    
+/* 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=
 
-/* 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 96d3516..396bfd3 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -42,7 +42,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			*/
@@ -1373,7 +1373,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
     /* formulate the absolute path for later search of target file for external link */
     if (H5_build_extpath(name, &file->extpath) < 0)
 	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build extpath")
-    
+
     /* Success */
     ret_value = file;
 
@@ -2127,7 +2127,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.
@@ -2180,7 +2180,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:
diff --git a/src/H5FD.c b/src/H5FD.c
index 1fdf6ae..3973037 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 5c6dc1a..deef3ed 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 1d12086..980b16f 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

path: root/doc/src/snippets/code/doc_src_emb-features.qdoc

/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
** contained in the Technology Preview License Agreement accompanying
** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file.  Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights.  These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

//! [0]
configure.exe -D QT_NO_THREAD
//! [0]


//! [1]
./configure -no-feature-thread
//! [1]


//! [2]
configure.exe -qconfig myfile
//! [2]


//! [3]
./configure -qconfig myfile
//! [3]