[svn-r15628] Description:

    Remove trailing whitespace from C/C++ source files, with the following
script:

    foreach f (*.[ch] *.cpp)
        sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
    end

Tested on:
    Mac OS X/32 10.5.5 (amazon)
    No need for h5committest, just whitespace changes...

95 files changed, 867 insertions, 867 deletions

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
                 file->fa.must_align = TRUE;
         } else {
             file->fa.must_align = FALSE;
@@ -583,7 +583,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
         if(read(file->fd, (void*)buf1, sizeof(int))<0) {
             if(read(file->fd, (void*)buf2, file->fa.fbsize)<0)
                 HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "file system may not support Direct I/O")
-            else 
+            else
                 file->fa.must_align = TRUE;
         } else
             file->fa.must_align = FALSE;
@@ -929,20 +929,20 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
     if (addr+size>file->eoa)
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow")
 
-    /* If the system doesn't require data to be aligned, read the data in 
+    /* If the system doesn't require data to be aligned, read the data in
      * the same way as sec2 driver.
      */
     _must_align = file->fa.must_align;
 
-    /* Get the memory boundary for alignment, file system block size, and maximal 
+    /* Get the memory boundary for alignment, file system block size, and maximal
      * copy buffer size.
      */
     _boundary = file->fa.mboundary;
     _fbsize = file->fa.fbsize;
     _cbsize = file->fa.cbsize;
 
-    /* if the data is aligned or the system doesn't require data to be aligned, 
-     * read it directly from the file.  If not, read a bigger 
+    /* if the data is aligned or the system doesn't require data to be aligned,
+     * read it directly from the file.  If not, read a bigger
      * and aligned data first, then copy the data into memory buffer.
      */
     if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) {
@@ -950,7 +950,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 	    if ((addr!=file->pos || OP_READ!=file->op) &&
 		    file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0)
 		HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
- 	    /* Read the aligned data in file first, being careful of interrupted 
+ 	    /* Read the aligned data in file first, being careful of interrupted
 	     * system calls and partial results. */
 	    while (size>0) {
 		do {
@@ -972,8 +972,8 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 		buf = (char*)buf + nbytes;
 	    }
     } else {
-	    /* allocate memory needed for the Direct IO option up to the maximal 
-	     * copy buffer size. Make a bigger buffer for aligned I/O if size is 
+	    /* allocate memory needed for the Direct IO option up to the maximal
+	     * copy buffer size. Make a bigger buffer for aligned I/O if size is
 	     * smaller than maximal copy buffer. */
 	    if(size < _cbsize)
 	    	alloc_size = ((size / _fbsize) * _fbsize) + _fbsize;
@@ -987,15 +987,15 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 		HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 
 	    /*
-	     * Read the aligned data in file into aligned buffer first, then copy the data 
+	     * Read the aligned data in file into aligned buffer first, then copy the data
 	     * into the final buffer.  If the data size is bigger than maximal copy buffer
 	     * size, do the reading by segment (the outer while loop).  If not, do one step
-	     * reading.  
+	     * reading.
 	     */
 	    p3 = buf;
 	    do {
- 	    	/* Read the aligned data in file first.  Not able to handle interrupted 
-		 * system calls and partial results like sec2 driver does because the 
+ 	    	/* Read the aligned data in file first.  Not able to handle interrupted
+		 * system calls and partial results like sec2 driver does because the
 		 * data may no longer be aligned. It's expecially true when the data in
 		 * file is smaller than ALLOC_SIZE. */
 	    	HDmemset(copy_buf, 0, alloc_size);
@@ -1008,7 +1008,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 		    HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
 
 	    	/* look for the right position and copy the data to the original buffer.
-		 * Consider all possible situations here: file address is not aligned on 
+		 * Consider all possible situations here: file address is not aligned on
 		 * file block size; the end of data address is not aligned; the end of data
 		 * address is aligned; data size is smaller or bigger than maximal copy size.*/
 	    	p2 = (unsigned char*)copy_buf + (size_t)(copy_addr % _fbsize);
@@ -1018,7 +1018,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
 	    	    HDmemcpy(p3, p2, copy_size);
 	    	else if(size >= _cbsize && copy_size > (alloc_size-(size_t)(copy_addr%_fbsize))) {
 	    	    HDmemcpy(p3, p2, (alloc_size - (size_t)(copy_addr % _fbsize)));
-	    	    p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize)); 
+	    	    p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize));
 	    	}
 
 		/* update the size and address of data being read. */
@@ -1099,20 +1099,20 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
     if (addr+size>file->eoa)
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow")
 
-    /* If the system doesn't require data to be aligned, read the data in 
+    /* If the system doesn't require data to be aligned, read the data in
      * the same way as sec2 driver.
      */
     _must_align = file->fa.must_align;
 
-    /* Get the memory boundary for alignment, file system block size, and maximal 
+    /* Get the memory boundary for alignment, file system block size, and maximal
      * copy buffer size.
      */
     _boundary = file->fa.mboundary;
     _fbsize = file->fa.fbsize;
     _cbsize = file->fa.cbsize;
 
-    /* if the data is aligned or the system doesn't require data to be aligned, 
-     * write it directly to the file.  If not, read a bigger and aligned data 
+    /* if the data is aligned or the system doesn't require data to be aligned,
+     * write it directly to the file.  If not, read a bigger and aligned data
      * first, update buffer with user data, then write the data out.
      */
     if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) {
@@ -1140,7 +1140,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 	     * copy buffer size. Make a bigger buffer for aligned I/O if size is
 	     * smaller than maximal copy buffer.
 	     */
-	    if(size < _cbsize) 
+	    if(size < _cbsize)
 	    	alloc_size = ((size / _fbsize) * _fbsize) + _fbsize;
 	    else
 		alloc_size = _cbsize;
@@ -1156,8 +1156,8 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 	    do {
 	    	/*
 	     	 * Read the aligned data first if the aligned region doesn't fall
-	    	 * entirely in the range to be writen.  Not able to handle interrupted 
-		 * system calls and partial results like sec2 driver does because the 
+	    	 * entirely in the range to be writen.  Not able to handle interrupted
+		 * system calls and partial results like sec2 driver does because the
 		 * data may no longer be aligned. It's expecially true when the data in
 		 * file is smaller than ALLOC_SIZE.
 	    	 */
@@ -1172,7 +1172,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 		    	HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
 		}
 
-	    	/* look for the right position and append or copy the data to be written to 
+	    	/* look for the right position and append or copy the data to be written to
 	     	 * the aligned buffer.
             	 * Consider all possible situations here: file address is not aligned on
             	 * file block size; the end of data address is not aligned; the end of data
@@ -1187,13 +1187,13 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 		    HDmemcpy(p1, p3, (alloc_size - (size_t)(copy_addr % _fbsize)));
 		    p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize));
 	    	}
- 
+
 	    	/*look for the aligned position for writing the data*/
 	    	if(file_seek(file->fd, (file_offset_t)(copy_addr - copy_addr % _fbsize), SEEK_SET) < 0)
 		    HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 
 	    	/*
-	     	 * Write the data. It doesn't truncate the extra data introduced by 
+	     	 * Write the data. It doesn't truncate the extra data introduced by
 		 * alignment because that step is done in H5FD_direct_flush.
 	    	 */
 		do {
@@ -1215,7 +1215,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 	/*Update the address and size*/
 	addr += (haddr_t)size;
 	buf = (const char*)buf + size;
-	
+
 	if(copy_buf)
 	    HDfree(copy_buf);
     }
@@ -1290,15 +1290,15 @@ H5FD_direct_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
         file->op = OP_UNKNOWN;
-    } 
-    else if (file->fa.must_align){ 
+    }
+    else if (file->fa.must_align){
 	/*Even though eof is equal to eoa, file is still truncated because Direct I/O
 	 *write introduces some extra data for alignment.
 	 */
         if (-1==file_truncate(file->fd, (file_offset_t)file->eof))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
     }
-    
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
diff --git a/src/H5FDdirect.h b/src/H5FDdirect.h
index 79886e7..26c70f3 100644
--- a/src/H5FDdirect.h
+++ b/src/H5FDdirect.h
@@ -43,9 +43,9 @@ extern "C" {
 
 H5_DLL hid_t H5FD_direct_init(void);
 H5_DLL void H5FD_direct_term(void);
-H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size, 
+H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size,
 			size_t cbuf_size);
-H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, 
+H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/,
 			size_t *block_size/*out*/, size_t *cbuf_size/*out*/);
 
 #ifdef __cplusplus
diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h
index 0384018..885e844 100644
--- a/src/H5FDmpi.h
+++ b/src/H5FDmpi.h
@@ -22,8 +22,8 @@
 #ifndef H5FDmpi_H
 #define H5FDmpi_H
 
-/***** Macros for One linked collective IO case. *****/ 
-/* The default value to do one linked collective IO for all chunks. 
+/***** Macros for One linked collective IO case. *****/
+/* The default value to do one linked collective IO for all chunks.
    If the average number of chunks per process is greater than this value,
       the library will create an MPI derived datatype to link all chunks to do collective IO.
       The user can set this value through an API. */
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 4e02a6c..2bc0754 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -544,14 +544,14 @@ Description:
         The library won't behave as it asks for only when we find
         that the low-level MPI-IO package doesn't support this.
 
-Parameters: 
+Parameters:
         hid_t dxpl_id	      		in: Data transfer property list identifier
 	H5FD_mpio_chunk_opt_t   	in: The optimization flag for linked chunk IO
                                             or multi-chunk IO.
-                                                
 
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 *
  *-------------------------------------------------------------------------
  */
@@ -596,14 +596,14 @@ Description:
         The library won't behave as it asks for only when we find
         that the low-level MPI-IO package doesn't support this.
 
-Parameters: 
+Parameters:
         hid_t dxpl_id	      		in: Data transfer property list identifier
 	H5FD_mpio_chunk_opt_t   	in: The optimization flag for linked chunk IO
                                             or multi-chunk IO.
-                                                
 
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 *
  *-------------------------------------------------------------------------
  */
@@ -643,15 +643,15 @@ Purpose:
 	To set a threshold for doing linked chunk IO
 
 Description:
-        If the number is greater than the threshold set by the user, 
+        If the number is greater than the threshold set by the user,
         the library will do linked chunk IO; otherwise, IO will be done for every chunk.
 
-Parameters: 
+Parameters:
         hid_t dxpl_id	      		in: Data transfer property list identifier
-	unsigned num_proc_per_chunk	in: the threshold of the average number of chunks selected by each process 
+	unsigned num_proc_per_chunk	in: the threshold of the average number of chunks selected by each process
 
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 *
  *-------------------------------------------------------------------------
  */
@@ -690,13 +690,13 @@ Purpose:
 	To set a threshold for doing collective IO for each chunk
 Description:
 	The library will calculate the percentage of the number of process holding selections at each chunk. If that percentage of number of process in the individual chunk is greater than the threshold set by the user, the library will do collective chunk IO for this chunk; otherwise, independent IO will be done for this chunk.
-Parameters: 
-	hid_t dxpl_id	         				
+Parameters:
+	hid_t dxpl_id
 		in: Data transfer property list identifier
-	unsigned percent_num_proc_per_chunk	
+	unsigned percent_num_proc_per_chunk
 		in: the threshold of the percentage of the number of process holding selections per chunk
-Returns: 
-Returns a non-negative value if successful. Otherwise returns a negative value. 
+Returns:
+Returns a non-negative value if successful. Otherwise returns a negative value.
 
 
 *
@@ -941,7 +941,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
 #ifndef H5_HAVE_MPI_GET_SIZE
     struct stat                 stat_buf;
 #endif
- 
+
     FUNC_ENTER_NOAPI(H5FD_mpio_open, NULL)
 
 #ifdef H5FDmpio_DEBUG
@@ -1016,7 +1016,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     /* Only processor p0 will get the filesize and broadcast it. */
     if (mpi_rank == 0) {
         /* Get current file size.  If MPI_File_get_size is disabled in configuration
-         * because it doesn't return correct value (SGI Altix Propack 4), 
+         * because it doesn't return correct value (SGI Altix Propack 4),
          * use stat to get the file size. */
 #ifdef H5_HAVE_MPI_GET_SIZE
         if (MPI_SUCCESS != (mpi_code=MPI_File_get_size(fh, &size)))
@@ -1514,7 +1514,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
             if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
         } /* end else */
- 
+
         /*
          * Reset the file view when we used MPI derived types
          */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 2d6d793..27a7cac 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1471,7 +1471,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
      * However, the library sometimes queries it through H5F_get_eoa.
      * Here the code finds the biggest EOA for individual file if
      * the query is from H5F_get_eoa (TYPE is H5FD_MEM_DEFAULT).
-     */ 
+     */
     if(H5FD_MEM_DEFAULT == type) {
         UNIQUE_MEMBERS(file->fa.memb_map, mt) {
 	    if (file->memb[mt]) {
@@ -1498,7 +1498,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
         } END_MEMBERS;
     } else {
         H5FD_mem_t mmt = file->fa.memb_map[type];
-        if (H5FD_MEM_DEFAULT==mmt) mmt = type;        
+        if (H5FD_MEM_DEFAULT==mmt) mmt = type;
 
 	if (file->memb[mmt]) {
             H5E_BEGIN_TRY {
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 2a260f8..0bbf160 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -1659,7 +1659,7 @@ done:
  *              5 January 2007
  *              Due to the complexity EOA for Multi driver, this function
  *              is made failed for now.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 hssize_t
@@ -1684,7 +1684,7 @@ H5FD_get_freespace(const H5FD_t *file)
      * It doesn't have eoa for the whole file. */
     if(file->driver_id == H5FD_MULTI)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "Multi driver doesn't support this function")
-    
+
     /* Retrieve the 'eoa' for the file */
     eoa = file->cls->get_eoa(file, H5FD_MEM_DEFAULT);
 
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index f3c59b0..46c8e81 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -539,8 +539,8 @@ H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */)
 /*-------------------------------------------------------------------------
  * Function:	H5FD_stdio_alloc
  *
- * Purpose:	Allocates file memory. If fseeko isn't available, makes 
- *              sure the file size isn't bigger than 2GB because the 
+ * Purpose:	Allocates file memory. If fseeko isn't available, makes
+ *              sure the file size isn't bigger than 2GB because the
  *              parameter OFFSET of fseek is of the type LONG INT, limiting
  *              the file size to 2GB.
  *
@@ -584,7 +584,7 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
     /* If fseeko isn't available, big files (>2GB) won't be supported. */
     if((addr + size) > BIG_FILE)
         H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "can't write file bigger than 2GB because fseeko isn't available", HADDR_UNDEF)
-#endif 
+#endif
 
     file->eoa = addr + size;
 
diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c
index 3b7e0ed..bbae92c 100644
--- a/src/H5FDwindows.c
+++ b/src/H5FDwindows.c
@@ -20,11 +20,11 @@
  *
  * Purpose:	We would like to create a driver specifically for Windows
  *			to utilize the Win32 API, and reduce the maintenence demands
- *			for the other file drivers.  Our other motivation is that 
+ *			for the other file drivers.  Our other motivation is that
  *			the Windows system calls of the existing sec2 driver differ
  *			from those on other platforms, and are not 64-bit compatible.
- *			From the start, this will have the structure very similar 
- *			to our sec2 driver, but make system calls more similar to 
+ *			From the start, this will have the structure very similar
+ *			to our sec2 driver, but make system calls more similar to
  *			our stdio driver.
  */
 
@@ -66,7 +66,7 @@ static hid_t H5FD_WINDOWS_g = 0;
  */
 typedef struct H5FD_windows_t {
     H5FD_t	pub;			/*public stuff, must be first	*/
-	/* 
+	/*
 	 * .NET doesn't support our 64-bit safe stdio functions,
 	 * so we will use io.h functions instead.
      */
@@ -96,7 +96,7 @@ typedef struct H5FD_windows_t {
 
 
 /* These are used by the macros below */
-#define file_offset_t		__int64 
+#define file_offset_t		__int64
 #define fseek_offset_t		__int64
 
 /*
@@ -128,7 +128,7 @@ static H5FD_t *H5FD_windows_open(const char *name, unsigned flags, hid_t fapl_id
 static herr_t H5FD_windows_close(H5FD_t *_file);
 static int H5FD_windows_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
 static herr_t H5FD_windows_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD_windows_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, 
+static haddr_t H5FD_windows_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id,
 			      hsize_t size);
 static haddr_t H5FD_windows_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
 static herr_t H5FD_windows_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
@@ -346,7 +346,7 @@ H5FD_windows_open(const char *name, unsigned flags, hid_t UNUSED fapl_id,
     if (H5F_ACC_CREAT & flags) o_flags |= O_CREAT;
     if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL;
 	/* Windows needs O_BINARY to correctly handle eol characters */
-	o_flags |= O_BINARY; 
+	o_flags |= O_BINARY;
 
     /* Open the file */
     if ((fd=_open(name, o_flags, 0666))<0)
@@ -388,7 +388,7 @@ H5FD_windows_open(const char *name, unsigned flags, hid_t UNUSED fapl_id,
     H5_ASSIGN_OVERFLOW(file->eof,sb.st_size,h5_stat_size_t,haddr_t);
     file->pos = HADDR_UNDEF;
     file->op = OP_UNKNOWN;
-    
+
 #ifndef WINDOWS_USE_STDIO
     file->fd = fd;
 #else
@@ -815,7 +815,7 @@ H5FD_windows_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
 				/* end of file but not end of format address space */
 				HDmemset(buf, 0, size);
 				break;
-			}	
+			}
 		}
 #endif /* WINDOWS_USE_STDIO */
         assert(nbytes>=0);
@@ -982,7 +982,7 @@ H5FD_windows_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
 		/* Extend the file to make sure it's large enough */
 		if( (filehandle = (HANDLE)_get_osfhandle(file->fd)) == INVALID_HANDLE_VALUE)
 			HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to get file handle for file")
-		
+
 		li.QuadPart = (__int64)file->eoa;
 		(void)SetFilePointer((HANDLE)filehandle,li.LowPart,&li.HighPart,FILE_BEGIN);
 		if(SetEndOfFile(filehandle) == 0)
@@ -1010,7 +1010,7 @@ H5FD_windows_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
 		/* Reset last file I/O information */
 		file->pos = HADDR_UNDEF;
 		file->op = OP_UNKNOWN;
-	
+
 	}
 
 done:
diff --git a/src/H5FS.c b/src/H5FS.c
index 4cd5d0a..47ac7ef 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -473,7 +473,7 @@ done:
  *
  * Purpose:     Collect meta storage info used by the free space manager
  *
- * Return:      Success:        non-negative 
+ * Return:      Success:        non-negative
  *              Failure:        negative
  *
  * Programmer:  Vailin Choi
@@ -495,8 +495,8 @@ H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size)
 
     /* Get the free space size info */
     *meta_size += H5FS_HEADER_SIZE(f) + fspace->alloc_sect_size;
- 
-    FUNC_LEAVE_NOAPI(SUCCEED) 
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FS_size() */
 
 #ifdef H5FS_DEBUG
diff --git a/src/H5FScache.c b/src/H5FScache.c
index 600fb3c..0af87d9 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -555,7 +555,7 @@ HDfprintf(stderr, "%s: Load free space sections, addr = %a\n", FUNC, addr);
     /* Allocate a new free space section info */
     if(NULL == (sinfo = H5FS_sinfo_new(f, fspace)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    
+
     /* Link free space manager to section info */
     /* (for deserializing sections) */
     HDassert(fspace->sinfo == NULL);
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index f36757e..6aad881 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -1766,7 +1766,7 @@ HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC
     /* Update current space used for free space sections */
     if(H5FS_sect_serialize_size(f, dxpl_id, fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
-    
+
     /* Mark free space sections as dirty */
     if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace->sinfo) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 74674c6..0c31be6 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -159,7 +159,7 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
      * user from doing this.
      */
     if(mp_loc.oloc->holding_file != FALSE)
-        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files")    
+        HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files")
 
     /* Open the mount point group */
     if(NULL == (mount_point = H5G_open(&mp_loc, dxpl_id)))
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index e133b68..5036a4f 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -722,14 +722,14 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
         HDassert(super_vers >= HDF5_SUPERBLOCK_VERSION_2);
         need_ext = TRUE;
     } /* end if */
-    /* If we're going to use a version of the superblock format which allows 
+    /* If we're going to use a version of the superblock format which allows
      *  for the superblock extension, check for non-default values to store
      *  in it.
      */
     else if(super_vers >= HDF5_SUPERBLOCK_VERSION_2) {
         /* Check for non-default v1 B-tree 'K' values to store */
         if(f->shared->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
-                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || 
+                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF ||
                 f->shared->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF)
             need_ext = TRUE;
         /* Check for driver info to store */
@@ -771,7 +771,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
 
         /* Check for non-default v1 B-tree 'K' values to store */
         if(f->shared->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF ||
-                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || 
+                f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF ||
                 f->shared->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF) {
             H5O_btreek_t btreek;        /* v1 B-tree 'K' value message for superblock extension */
 
diff --git a/src/H5G.c b/src/H5G.c
index a89f11d..4a49663 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -1004,7 +1004,7 @@ H5G_create(H5F_t *file, hid_t gcpl_id, hid_t dxpl_id)
 
     /* Set the count of times the object is opened */
     grp->shared->fo_count = 1;
-    
+
     /* Set return value */
     ret_value = grp;
 
@@ -1768,7 +1768,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
 
     /* Build the link's relative path name */
     HDassert(udata->path[old_path_len] == '\0');
-    HDstrcpy(&(udata->path[old_path_len]), lnk->name); 
+    HDstrcpy(&(udata->path[old_path_len]), lnk->name);
     udata->curr_path_len += link_name_len;
 
     /* Construct the link info from the link message */
@@ -1831,9 +1831,9 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
 
                 /* Add the path separator to the current path */
                 HDassert(udata->path[udata->curr_path_len] == '\0');
-                HDstrcpy(&(udata->path[udata->curr_path_len]), "/"); 
+                HDstrcpy(&(udata->path[udata->curr_path_len]), "/");
                 udata->curr_path_len++;
-                    
+
                 /* Attempt to get the link info for this group */
                 if(H5G_obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) {
                     /* Check for creation order tracking, if creation order index lookup requested */
diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c
index f15301e..6b41007 100644
--- a/src/H5Gcompact.c
+++ b/src/H5Gcompact.c
@@ -406,7 +406,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, 
+H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
     H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
     H5G_lib_iterate_t op, void *op_data)
 {
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 6b18c0c..9527521 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -319,7 +319,7 @@ H5G_ent_to_info(H5F_t *f, H5L_info_t *info, const H5HL_t *heap,
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_to_info
  *
- * Purpose:	Retrieve information from a link object 
+ * Purpose:	Retrieve information from a link object
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -392,7 +392,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_link_to_loc
  *
- * Purpose:	Build group location from group and link object 
+ * Purpose:	Build group location from group and link object
  *
  * Return:	Non-negative on success/Negative on failure
  *
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 7d03d7c..d745b87 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -460,7 +460,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id,
                 H5I_dec_ref(file, FALSE);
 		HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't determine name")
             } /* end if */
-	
+
             /* Close file ID used for search */
 	    if(H5I_dec_ref(file, FALSE) < 0)
 		HGOTO_ERROR(H5E_SYM, H5E_CANTCLOSEFILE, FAIL, "can't determine name")
@@ -470,7 +470,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id,
         ret_value = len;
     } /* end if */
 
-done: 
+done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_name() */
 
@@ -914,7 +914,7 @@ done:
  */
 herr_t
 H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
-    H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r, 
+    H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r,
     hid_t dxpl_id)
 {
     herr_t ret_value = SUCCEED;
@@ -1086,8 +1086,8 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
             HGOTO_DONE(H5_ITER_STOP)
         } /* end if */
     } /* end if */
-   
-done:    
+
+done:
     if(obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
@@ -1137,7 +1137,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
         udata.lapl_id = lapl_id;
         udata.dxpl_id = dxpl_id;
         udata.path = NULL;
-        
+
         /* Visit all the links in the file */
         if((status = H5G_visit(file, "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5G_get_name_by_addr_cb, &udata, lapl_id, dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group traversal failed while looking for object name")
@@ -1166,8 +1166,8 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
     } /* end if */
     else
         ret_value = 0;
-   
-done:    
+
+done:
     /* Release resources */
     H5MM_xfree(udata.path);
 
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index 76223b7..a9d6e1a 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -182,7 +182,7 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
                     ginfo_size +
                     (ginfo->est_num_entries * link_size);
     } /* end if */
-    else 
+    else
         hdr_size = 4 + 2 * H5F_SIZEOF_ADDR(f);
 
     /*
@@ -326,7 +326,7 @@ H5O_linfo_t *
 H5G_obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
 {
     H5O_linfo_t *ret_value;     /* Return value */
-    
+
     FUNC_ENTER_NOAPI(H5G_obj_get_linfo, NULL)
 
     /* check arguments */
diff --git a/src/H5Goh.c b/src/H5Goh.c
index 0ea1799..4f4b651 100644
--- a/src/H5Goh.c
+++ b/src/H5Goh.c
@@ -272,7 +272,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
     HDassert(bh_info);
 
     /* Check for "new style" group info */
-    if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_LINFO_ID, &linfo)) { 
+    if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_LINFO_ID, &linfo)) {
         H5O_stab_t          stab;       	/* Info about symbol table */
 
         /* Must be "old style" group, clear error stack */
@@ -281,7 +281,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
         /* Get symbol table message */
         if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_STAB_ID, &stab))
 	    HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't find LINFO nor STAB messages")
-	
+
         /* Get symbol table size info */
         if(H5G_stab_bh_size(f, dxpl_id, &stab, bh_info) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve symbol table size info")
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 5ba7050..5b8b054 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -86,7 +86,7 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name,
 H5_DLL herr_t H5Gclose(hid_t group_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 85cd086..8ab9deb 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -651,7 +651,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_get_name_by_idx_cb
  *
- * Purpose:     Callback for B-tree iteration 'by index' info query to 
+ * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the name of a link
  *
  * Return:	Success:        Non-negative
@@ -871,7 +871,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_lookup_by_idx_cb
  *
- * Purpose:     Callback for B-tree iteration 'by index' info query to 
+ * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the link
  *
  * Return:	Success:        Non-negative
@@ -987,7 +987,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5G_stab_get_type_by_idx_cb
  *
- * Purpose:     Callback for B-tree iteration 'by index' info query to 
+ * Purpose:     Callback for B-tree iteration 'by index' info query to
  *              retrieve the type of an object
  *
  * Return:	Success:        Non-negative
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index ab46839..7693343 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -422,7 +422,7 @@ H5G_traverse_mount(H5G_loc_t *obj_loc/*in,out*/)
     if(0 == cmp) {
         /* Get the child file */
         child = parent->shared->mtab.child[md].file;
-        
+
         /* Get the location for the root group in the child's file */
         oloc = H5G_oloc(child->shared->root_grp);
 
@@ -739,7 +739,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
                     linfo = &def_linfo;
                 } /* end if */
                 else {
-                    /* Only keep the creation order information from the parent 
+                    /* Only keep the creation order information from the parent
                      *  group's link info
                      */
                     HDmemcpy(&tmp_linfo, &def_linfo, sizeof(H5O_linfo_t));
@@ -814,7 +814,7 @@ done:
         H5G_loc_free(&obj_loc);
     if(group_copy && !(own_loc & H5G_OWN_GRP_LOC))
         H5G_loc_free(&grp_loc);
-    
+
     /* If there's valid information in the link, reset it */
     if(link_valid)
         H5O_msg_reset(H5O_LINK_ID, &lnk);
diff --git a/src/H5HF.c b/src/H5HF.c
index 83b29f1..79032d3 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -635,7 +635,7 @@ done:
  *
  * Purpose:	Perform an operation directly on a heap object
  *
- * Note:	The library routines currently assume that the 'op' callback 
+ * Note:	The library routines currently assume that the 'op' callback
  *		won't modify the object.  This can easily be changed later for
  *		"managed" heap objects, and, with some difficulty, for 'huge'
  *		and 'tiny' heap objects.
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 23e63ca..0e31f9d 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -395,7 +395,7 @@ HDfprintf(stderr, "%s: Load heap header, addr = %a\n", FUNC, addr);
         /* Release the space allocated for the I/O pipeline filters */
         H5O_msg_free(H5O_PLINE_ID, pline);
     } /* end if */
-    else 
+    else
         /* Set the heap header's size */
         hdr->heap_size = size;
 
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 60d5002..ffd90e8 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -415,7 +415,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "can't finish phase #1 of header final initialization")
 
     /* Copy any I/O filter pipeline */
-    /* (This code is not in the "finish init phase" routines because those 
+    /* (This code is not in the "finish init phase" routines because those
      *  routines are also called from the cache 'load' callback, and the filter
      *  length is already set in that case (its stored in the header on disk))
      */
@@ -448,7 +448,7 @@ HDfprintf(stderr, "%s: hdr->filter_len = %u\n", FUNC, hdr->filter_len);
         hdr->heap_size = H5HF_HEADER_SIZE(hdr);
 
     /* Set the length of IDs in the heap */
-    /* (This code is not in the "finish init phase" routines because those 
+    /* (This code is not in the "finish init phase" routines because those
      *  routines are also called from the cache 'load' callback, and the ID
      *  length is already set in that case (its stored in the header on disk))
      */
@@ -1313,7 +1313,7 @@ HDfprintf(stderr, "%s: curr_entry = %u\n", FUNC, curr_entry);
 HDfprintf(stderr, "%s: tmp_entry = %d\n", FUNC, tmp_entry);
 #endif /* QAK */
         while(tmp_entry >= 0 &&
-                (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) || 
+                (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) ||
                     !H5F_addr_defined(iblock->ents[tmp_entry].addr)))
             tmp_entry--;
 #ifdef QAK
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 4565228..6eb288f 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -125,7 +125,7 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
 
         /* Sanity check */
         HDassert(par_iblock->child_iblocks);
-        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows 
+        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows
                 * iblock->hdr->man_dtable.cparam.width));
 
         /* Compute index in parent's child iblock pointer array */
@@ -179,7 +179,7 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
 
         /* Sanity check */
         HDassert(par_iblock->child_iblocks);
-        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows 
+        HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows
                 * iblock->hdr->man_dtable.cparam.width));
 
         /* Compute index in parent's child iblock pointer array */
@@ -1165,7 +1165,7 @@ HDfprintf(stderr, "%s: iblock_addr = %a, iblock_nrows = %u\n", FUNC, iblock_addr
 
             /* Sanity check */
             HDassert(par_iblock->child_iblocks);
-            HDassert(par_entry >= (hdr->man_dtable.max_direct_rows 
+            HDassert(par_entry >= (hdr->man_dtable.max_direct_rows
                     * hdr->man_dtable.cparam.width));
 
             /* Compute index in parent's child iblock pointer array */
@@ -1525,7 +1525,7 @@ HDfprintf(stderr, "%s: iblock_addr = %a, iblock_nrows = %u\n", FUNC, iblock_addr
                 /* Are we in a direct or indirect block row */
                 if(row < hdr->man_dtable.max_direct_rows) {
                     hsize_t dblock_size;        /* Size of direct block on disk */
-                    
+
                     /* Check for I/O filters on this heap */
                     if(hdr->filter_len > 0)
                         dblock_size = iblock->filt_ents[entry].size;
@@ -1624,7 +1624,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
         entry = hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width;
 	first_row_bits = H5V_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) +
 			    H5V_log2_of2(hdr->man_dtable.cparam.width);
-        num_indirect_rows = 
+        num_indirect_rows =
 	    (H5V_log2_gen(hdr->man_dtable.row_block_size[hdr->man_dtable.max_direct_rows]) - first_row_bits) + 1;
         for(u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++, num_indirect_rows++) {
             size_t      v;                      /* Local index variable */
diff --git a/src/H5HFman.c b/src/H5HFman.c
index cf3f939..e069e82 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -246,7 +246,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, 
+H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     H5HF_operator_t op, void *op_data, unsigned op_flags)
 {
     H5HF_direct_t *dblock = NULL;       /* Pointer to direct block to query */
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index 769b273..97f7867 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -1185,7 +1185,7 @@ HDfprintf(stderr, "%s: (*sect).sect_info = {%a, %Hu, %u}\n", FUNC, (*sect)->sect
 #ifdef QAK
 HDfprintf(stderr, "%s: dblock_addr = %a\n", FUNC, dblock_addr);
 #endif /* QAK */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, 
+    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr,
             dblock_size, (*sect)->u.single.parent, (*sect)->u.single.par_entry, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
     HDassert(H5F_addr_eq(dblock->block_off + dblock_size, (*sect)->sect_info.addr + (*sect)->sect_info.size));
@@ -2430,7 +2430,7 @@ H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size,
     /* Set the 'indirect' specific fields */
     if(iblock) {
         sect->u.indirect.u.iblock = iblock;
-        sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * 
+        sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
                 sect->u.indirect.u.iblock->max_rows;
         if(H5HF_iblock_incr(sect->u.indirect.u.iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block")
@@ -2485,7 +2485,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5HF_free_section_t *
-H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, 
+H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
     H5HF_free_section_t *row_sect)
 {
     H5HF_free_section_t *sect = NULL;   /* 'Indirect' free space section to add */
@@ -2505,7 +2505,7 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
 #endif /* QAK */
 
     /* Create free space section node */
-    if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr, 
+    if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr,
             row_sect->sect_info.size, iblock, iblock->block_off,
             row_sect->u.row.row, row_sect->u.row.col, row_sect->u.row.num_entries)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create indirect section")
@@ -2794,7 +2794,7 @@ HDfprintf(stderr, "%s: child_iblock_addr = %a\n", FUNC, child_iblock_addr);
     sect->u.indirect.dir_nrows = dir_nrows;
 
     /* Make certain we've tracked the section's dependents correctly */
-    HDassert(sect->u.indirect.rc == 
+    HDassert(sect->u.indirect.rc ==
             (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
 
 done:
@@ -2987,7 +2987,7 @@ HDfprintf(stderr, "%s: sect->u.indirect.u.iblock_off = %Hu\n", FUNC, sect->u.ind
     sect->u.indirect.u.iblock = sec_iblock;
 
     /* Set the number of entries in the indirect block */
-    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * 
+    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
             sect->u.indirect.u.iblock->max_rows;
 
     /* Unlock indirect block */
@@ -3054,7 +3054,7 @@ HDfprintf(stderr, "%s: sect->u.indirect.u.iblock_off = %Hu\n", FUNC, sect->u.ind
     sect->u.indirect.u.iblock = sect_iblock;
 
     /* Set the number of entries in the indirect block */
-    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * 
+    sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width *
             sect->u.indirect.u.iblock->max_rows;
 
     /* Section is "live" now */
@@ -3317,10 +3317,10 @@ HDfprintf(stderr, "%s: iblock = %p, iblock_off = %Hu\n", FUNC, iblock, iblock_of
 
             /* Transfer row sections between current & peer sections */
             HDmemcpy(&peer_sect->u.indirect.dir_rows[0],
-                &sect->u.indirect.dir_rows[0], 
+                &sect->u.indirect.dir_rows[0],
                 (sizeof(H5HF_free_section_t *) * peer_dir_nrows));
-            HDmemmove(&sect->u.indirect.dir_rows[0], 
-                &sect->u.indirect.dir_rows[peer_dir_nrows], 
+            HDmemmove(&sect->u.indirect.dir_rows[0],
+                &sect->u.indirect.dir_rows[peer_dir_nrows],
                 (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows)));
             sect->u.indirect.dir_nrows -= peer_dir_nrows;
             HDassert(row_sect == sect->u.indirect.dir_rows[0]);
@@ -3352,9 +3352,9 @@ HDfprintf(stderr, "%s: iblock = %p, iblock_off = %Hu\n", FUNC, iblock, iblock_of
             sect->u.indirect.num_entries -= (peer_nentries + 1); /* Transferred entries, plus the entry allocated out of the row */
 
             /* Make certain we've tracked the sections' dependents correctly */
-            HDassert(sect->u.indirect.rc == 
+            HDassert(sect->u.indirect.rc ==
                     (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
-            HDassert(peer_sect->u.indirect.rc == 
+            HDassert(peer_sect->u.indirect.rc ==
                     (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
         } /* end else */
     } /* end if */
@@ -3576,7 +3576,7 @@ HDfprintf(stderr, "%s: peer_sect_addr = %a\n", FUNC, peer_sect_addr);
 
             /* Transfer child indirect sections between current & peer sections */
             HDmemcpy(&peer_sect->u.indirect.indir_ents[0],
-                &sect->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries], 
+                &sect->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries],
                 (sizeof(H5HF_free_section_t *) * peer_nentries));
             sect->u.indirect.indir_nents -= (peer_nentries + 1); /* Transferred blocks, plus child entry */
 
@@ -3610,9 +3610,9 @@ HDfprintf(stderr, "%s: peer_sect->u.indirect.rc = %u\n", FUNC, peer_sect->u.indi
             /* (Note modified on current section's ref. count, since we haven't
              *  detached the child section yet)
              */
-            HDassert((sect->u.indirect.rc - 1) == 
+            HDassert((sect->u.indirect.rc - 1) ==
                     (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows));
-            HDassert(peer_sect->u.indirect.rc == 
+            HDassert(peer_sect->u.indirect.rc ==
                     (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows));
         } /* end else */
     } /* end if */
@@ -3917,8 +3917,8 @@ HDfprintf(stderr, "%s: nrows_moved2 = %u\n", FUNC, nrows_moved2);
             sect1->u.indirect.dir_rows = new_dir_rows;
 
             /* Transfer the second section's rows to first section */
-            HDmemcpy(&sect1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows], 
-                &sect2->u.indirect.dir_rows[src_row2], 
+            HDmemcpy(&sect1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows],
+                &sect2->u.indirect.dir_rows[src_row2],
                 (sizeof(H5HF_free_section_t *) * nrows_moved2));
 
             /* Re-target the row sections moved from second section */
@@ -3963,8 +3963,8 @@ HDfprintf(stderr, "%s: nrows_moved2 = %u\n", FUNC, nrows_moved2);
             sect1->u.indirect.indir_ents = new_indir_ents;
 
             /* Transfer the second section's entries to first section */
-            HDmemcpy(&sect1->u.indirect.indir_ents[sect1->u.indirect.indir_nents], 
-                &sect2->u.indirect.indir_ents[0], 
+            HDmemcpy(&sect1->u.indirect.indir_ents[sect1->u.indirect.indir_nents],
+                &sect2->u.indirect.indir_ents[0],
                 (sizeof(H5HF_free_section_t *) * sect2->u.indirect.indir_nents));
         } /* end else */
 
@@ -3985,7 +3985,7 @@ HDfprintf(stderr, "%s: nrows_moved2 = %u\n", FUNC, nrows_moved2);
     sect1->u.indirect.span_size += sect2->u.indirect.span_size;
 
     /* Make certain we've tracked the first section's dependents correctly */
-    HDassert(sect1->u.indirect.rc == 
+    HDassert(sect1->u.indirect.rc ==
             (sect1->u.indirect.indir_nents + sect1->u.indirect.dir_nrows));
 
     /* Wrap up, freeing or re-inserting second row section */
@@ -4103,7 +4103,7 @@ HDfprintf(stderr, "%s: par_entry = %u, par_row = %u, par_col = %u\n", FUNC, par_
     HDassert(par_iblock);
 
     /* Create parent indirect section */
-    if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr, 
+    if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr,
             sect->sect_info.size, par_iblock, par_iblock->block_off,
             par_row, par_col, 1)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section")
@@ -4287,7 +4287,7 @@ H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id,
     unsigned *des_flags)
 {
     H5HF_free_section_t *new_sect;      /* New indirect section */
-    hsize_t iblock_off;                 /* Indirect block's offset */ 
+    hsize_t iblock_off;                 /* Indirect block's offset */
     unsigned start_row;                 /* Indirect section's start row */
     unsigned start_col;                 /* Indirect section's start column */
     unsigned nentries;                  /* Indirect section's number of entries */
diff --git a/src/H5HFstat.c b/src/H5HFstat.c
index d151b47..8d6b2ba 100644
--- a/src/H5HFstat.c
+++ b/src/H5HFstat.c
@@ -112,7 +112,7 @@ H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats)
  * Function:    H5HF_size
  *
  * Purpose:     Retrieve storage info for:
- *			1. fractal heap 
+ *			1. fractal heap
  *			2. btree storage used by huge objects in fractal heap
  *			3. free space storage info
  *
diff --git a/src/H5HL.c b/src/H5HL.c
index 855ba76..a56a885 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -968,7 +968,7 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
             need_more = need_size;
 
 	new_heap_alloc = heap->heap_alloc + need_more;
-#if 0 /* JRM */ /* delete this once we are convinced that the general 
+#if 0 /* JRM */ /* delete this once we are convinced that the general
 		 * fix will do the job.
 		 */
 /*
diff --git a/src/H5L.c b/src/H5L.c
index 8ac7fd6..4ad2f2d 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -151,7 +151,7 @@ static herr_t H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
     const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/,
     H5G_own_loc_t *own_loc/*out*/);
 static herr_t H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
-    H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, 
+    H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info,
     hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
 static herr_t H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size);
 static herr_t H5L_get_val_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
@@ -345,7 +345,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
             lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
-done:    
+done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lmove() */
 
@@ -403,7 +403,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
                 lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
-done:    
+done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Lcopy() */
 
@@ -1586,7 +1586,7 @@ H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc,
     lnk.u.hard.addr = obj_loc->oloc->addr;
 
     /* Create the link */
-    if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0) 
+    if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
@@ -1629,7 +1629,7 @@ H5L_link_object(const H5G_loc_t *new_loc, const char *new_name,
     lnk.type = H5L_TYPE_HARD;
 
     /* Create the link */
-    if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0) 
+    if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object")
 
 done:
@@ -2048,7 +2048,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5L_get_val_real
  *
- * Purpose:	Retrieve link value from a link object 
+ * Purpose:	Retrieve link value from a link object
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -2080,7 +2080,7 @@ H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size)
     else if(lnk->type >= H5L_TYPE_UD_MIN) {
         const H5L_class_t *link_class;             /* User-defined link class */
 
-        /* Get the link class for this type of link.  It's okay if the class 
+        /* Get the link class for this type of link.  It's okay if the class
          * isn't registered, though--we just can't give any more information
          * about it
          */
@@ -2671,7 +2671,7 @@ H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc,
 
     /* Do the move */
     if(H5G_traverse(src_loc, src_name, target_flags, H5L_move_cb, &udata, lapl_id, dxpl_id) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link")    
+	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 1830097..acd6ee9 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -169,7 +169,7 @@ done:
  *              Monday, July 10, 2006
  * Modifications:
  *		Vailin Choi, April 2, 2008
- *		Add handling to search for the target file 
+ *		Add handling to search for the target file
  *		See description in RM: H5Lcreate_external
  *
  *-------------------------------------------------------------------------
@@ -269,7 +269,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
 	    HDstrcpy(tempname, &file_name[2]);
 	}
     }
-    
+
     /* try searching from paths set in the environment variable */
     if ((ext_file == NULL) && (env_prefix=HDgetenv("HDF5_EXT_PREFIX"))) {
 
@@ -295,7 +295,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
         if (pp)
             H5MM_xfree(pp);
     }
-    
+
     /* try searching from property list */
     if (ext_file == NULL) {
         if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0)
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index 823b046..eba09b2 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -60,7 +60,7 @@ extern "C" {
  * defined by HDF5 but their behavior can be overridden by users.
  * Users who want to create new classes of links should contact the HDF5
  * development team at hdfhelp@ncsa.uiuc.edu .
- * These values can never change because they appear in HDF5 files. 
+ * These values can never change because they appear in HDF5 files.
  */
 typedef enum {
     H5L_TYPE_ERROR = (-1),      /* Invalid link type id         */
diff --git a/src/H5O.c b/src/H5O.c
index ed0fe06..bc7a84d 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -342,7 +342,7 @@ done:
  *              H5Odecr_refcount() should be used when the object is
  *              no longer being referenced by address (e.g. when the UD link
  *              is deleted).
- *         
+ *
  *              The address of the HDF5 file on disk has no effect on
  *              H5Oopen_by_addr(), nor does the use of any unusual file
  *              drivers. The "address" is really the offset within the
@@ -1214,7 +1214,7 @@ done:
  * Modification:
  *              Raymond Lu
  *              5 November 2007
- *              Turn off the holding file variable if it's on.  When it's 
+ *              Turn off the holding file variable if it's on.  When it's
  *              needed, the caller will turn it on again.
  *-------------------------------------------------------------------------
  */
@@ -2827,7 +2827,7 @@ H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
         udata.dxpl_id = dxpl_id;
         udata.op = op;
         udata.op_data = op_data;
-        
+
         /* Create skip list to store visited object information */
         if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, 0.5, (size_t)16)) == NULL)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index fd53a6d..7abc11c 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -148,7 +148,7 @@ H5O_add_gap(H5O_t *oh, unsigned chunkno, unsigned idx,
                 oh->mesg[u].raw -= new_gap_size;
 
         /* Slide raw message info forward in chunk image */
-        HDmemmove(new_gap_loc, new_gap_loc + new_gap_size, 
+        HDmemmove(new_gap_loc, new_gap_loc + new_gap_size,
                 (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) - (new_gap_loc + new_gap_size)));
 
         /* Add existing gap size to new gap size */
@@ -849,7 +849,7 @@ H5O_alloc_new_chunk(H5F_t *f,
         if(H5O_alloc_msgs(oh, (size_t)3) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, UFAIL, "can't allocate more space for messages")
 
-    /* Move message (that will be replaced with continuation message) 
+    /* Move message (that will be replaced with continuation message)
      *  to new chunk, if necessary.
      */
     if(found_null < 0) {
@@ -1078,7 +1078,7 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
     /* Check if chunk has a gap currently */
     if(oh->chunk[mesg->chunkno].gap) {
         /* Eliminate the gap in the chunk */
-        if(H5O_eliminate_gap(oh, mesg, 
+        if(H5O_eliminate_gap(oh, mesg,
                 ((oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap)),
                 oh->chunk[mesg->chunkno].gap) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
@@ -1136,7 +1136,7 @@ H5O_move_msgs_forward(H5O_t *oh)
 
                 /* Check if null message is not last in chunk */
                 chunk = &(oh->chunk[curr_msg->chunkno]);
-                if((curr_msg->raw + curr_msg->raw_size) 
+                if((curr_msg->raw + curr_msg->raw_size)
                         != ((chunk->image + chunk->size) - (H5O_SIZEOF_CHKSUM_OH(oh) + chunk->gap))) {
                     H5O_mesg_t *nonnull_msg;       /* Pointer to current message to operate on */
                     unsigned	v;              /* Local index variable */
@@ -1220,7 +1220,7 @@ H5O_move_msgs_forward(H5O_t *oh)
                             /* Check for gap in null message's chunk */
                             if(oh->chunk[old_chunkno].gap > 0) {
                                 /* Eliminate the gap in the chunk */
-                                if(H5O_eliminate_gap(oh, null_msg, 
+                                if(H5O_eliminate_gap(oh, null_msg,
                                         ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
                                         oh->chunk[old_chunkno].gap) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
@@ -1278,7 +1278,7 @@ H5O_move_msgs_forward(H5O_t *oh)
                             /* Check for gap in new null message's chunk */
                             if(oh->chunk[old_chunkno].gap > 0) {
                                 /* Eliminate the gap in the chunk */
-                                if(H5O_eliminate_gap(oh, &oh->mesg[new_null_msg], 
+                                if(H5O_eliminate_gap(oh, &oh->mesg[new_null_msg],
                                         ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)),
                                         oh->chunk[old_chunkno].gap) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk")
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index b77c241..85b1ef3 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -230,7 +230,7 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags,
     /* Indicate that the fill values aren't to be written out */
     attr->shared->initialized = 1;
 
-    /* Increment the reference count for this object header message in cache(compact 
+    /* Increment the reference count for this object header message in cache(compact
        storage) or for the object from dense storage. */
     attr->shared->nrefs++;
 
@@ -460,9 +460,9 @@ H5O_attr_size(const H5F_t UNUSED *f, const void *_mesg)
  * Modification:Raymond Lu
  *              25 June 2008
  *              Made this function empty.  The freeing action is actually
- *              done in H5O_attr_free (see H5O_msg_free_real).  But this 
- *              empty reset function needs to be here.  Otherwise, the 
- *              caller function H5O_msg_reset_real will zero-set the whole 
+ *              done in H5O_attr_free (see H5O_msg_free_real).  But this
+ *              empty reset function needs to be here.  Otherwise, the
+ *              caller function H5O_msg_reset_real will zero-set the whole
  *              message.
  *-------------------------------------------------------------------------
  */
@@ -676,10 +676,10 @@ H5O_attr_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t UNUSED *mesg_ty
     H5O_loc_reset(&(attr_dst->shared->oloc));
     H5G_name_reset(&(attr_dst->path));
     attr_dst->obj_opened = FALSE;
-    
+
     /* Reference count for the header message in the cache */
     attr_dst->shared->nrefs = 1;
- 
+
     /* Copy attribute's name */
     attr_dst->shared->name = H5MM_strdup(attr_src->shared->name);
     HDassert(attr_dst->shared->name);
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index 5bccc46..71c59f3 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -138,7 +138,7 @@ typedef struct {
 static herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc,
     hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip,
     hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data);
-static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, 
+static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr,
     const char* name_to_open);
 
 /*********************/
@@ -346,10 +346,10 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header")
     } /* end else */
 
-    /* Increment reference count for shared attribute object for the 
+    /* Increment reference count for shared attribute object for the
      * object handle created by the caller function H5A_create.  The count
      * for the cached object header has been incremented in the step above
-     * (in H5O_msg_append_real).  The dense storage doesn't need a count. */ 
+     * (in H5O_msg_append_real).  The dense storage doesn't need a count. */
     attr->shared->nrefs += 1;
 
     /* Was new attribute shared? */
@@ -465,7 +465,7 @@ done:
  *
  * Modification:Raymond Lu
  *              23 June 2008
- *              If the attribute is in dense storage and has already been 
+ *              If the attribute is in dense storage and has already been
  *              opened, make a copy of already opened object to share some
  *              object information.
  *-------------------------------------------------------------------------
@@ -629,11 +629,11 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     /* Find out whether it has already been opened.  If it has, close the object
      * and make a copy of the already opened object to share the object info. */
     if(ret_value) {
-        if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, 
+        if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr,
             ret_value->shared->name)) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute")
 
-        /* If found that the attribute is already opened, make a copy of it 
+        /* If found that the attribute is already opened, make a copy of it
            and close the object just opened. */
         if(found_open_attr && exist_attr) {
             if(H5A_close(ret_value) < 0)
@@ -645,7 +645,7 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     }
 
 done:
-    if(oh && H5AC_unprotect(loc->file, H5AC_ind_dxpl_id, H5AC_OHDR, loc->addr, oh, 
+    if(oh && H5AC_unprotect(loc->file, H5AC_ind_dxpl_id, H5AC_OHDR, loc->addr, oh,
         H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_ATTR, H5E_PROTECT, NULL, "unable to release object header")
 
@@ -660,7 +660,7 @@ done:
  *              the name.  Return the pointer to the object if found.
  *
  * Return:	TRUE:	found the already opened object
- *              FALSE:  didn't find the opened object 
+ *              FALSE:  didn't find the opened object
  *              FAIL:	function failed.
  *
  * Programmer:	Raymond Lu
@@ -688,7 +688,7 @@ htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char*
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "can't get number of opened attributes")
 
     /* Find out whether the attribute has been opened */
-    if(num_open_attr) { 
+    if(num_open_attr) {
         attr_id_list = (hid_t*)H5MM_malloc(num_open_attr*sizeof(hid_t));
 
         /* Retrieve the IDs of all opened attributes */
@@ -812,7 +812,7 @@ done:
  * Modification:Raymond Lu
  *              4 June 2008
  *              Took out the data copying part because the attribute data
- *              is shared between attribute handle and object header. 
+ *              is shared between attribute handle and object header.
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1036,7 +1036,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
                     old_version != ((H5A_t *)mesg->native)->shared->version) {
                 H5A_t *attr;            /* Attribute to re-add */
 
-                /* Take ownership of the message's native info (the attribute) 
+                /* Take ownership of the message's native info (the attribute)
                  *      so any shared objects in the file aren't adjusted (and
                  *      possibly deleted) when the message is released.
                  */
@@ -1312,9 +1312,9 @@ done:
  *
  * Modification:Raymond Lu
  *              24 June 2008
- *              When converting storage from dense to compact, if found 
- *              the attribute is already opened, use the opened message 
- *              to insert.  If not, still use the message in the attribute 
+ *              When converting storage from dense to compact, if found
+ *              the attribute is already opened, use the opened message
+ *              to insert.  If not, still use the message in the attribute
  *              table. This will guarantee that the attribute message is
  *              shared between the object in metadata cache and the opened
  *              object.
@@ -1379,15 +1379,15 @@ H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo,
                     (atable.attrs[u])->sh_loc.type = H5O_SHARE_TYPE_UNSHARED;
                 } /* end else */
 
-                /* Insert attribute message into object header (Will increment 
+                /* Insert attribute message into object header (Will increment
                    reference count on shared attributes) */
                 /* Find out whether the attribute has been opened */
-                if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, 
+                if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr,
                         (atable.attrs[u])->shared->name)) < 0)
                     HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "failed in finding opened attribute")
 
                 /* If found the attribute is already opened, use the opened message to insert.
-                   If not, still use the message in the attribute table. */ 
+                   If not, still use the message in the attribute table. */
                 if(found_open_attr && exist_attr) {
                     if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0)
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message")
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 889aecc..7d1f001 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -606,7 +606,7 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED * _udata1,
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "corrupt object header - too few messages")
 #else /* H5_STRICT_FORMAT_CHECKS */
     /* Check for incorrect # of messages in object header and if we have write
-     * access on the file, flag the object header as dirty, so it gets fixed. 
+     * access on the file, flag the object header as dirty, so it gets fixed.
      */
     if(oh->version == H5O_VERSION_1)
         if((oh->nmesgs + merged_null_msgs) != nmesgs &&
@@ -760,7 +760,7 @@ H5O_assert(oh);
 
         /* Mark chunk 0 as dirty, since the object header prefix has been updated */
         /* (this could be more sophisticated and track whether any prefix fields
-         *      have been changed, which could save I/O accesses if the 
+         *      have been changed, which could save I/O accesses if the
          *      messages in chunk 0 haven't changed - QAK)
          */
         HDassert(H5F_addr_eq(addr, oh->chunk[0].addr));
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 08d9f4f..7097b66 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -98,11 +98,11 @@ H5FL_DEFINE(H5O_addr_map_t);
  * Purpose:     Copy an object (group or dataset) to destination location
  *              within a file or cross files. PLIST_ID is a property list
  *              which is used to pass user options and properties to the
- *              copy. The name, dst_name, must not already be taken by some 
+ *              copy. The name, dst_name, must not already be taken by some
  *              other object in the destination group.
  *
  *              H5Ocopy() will fail if the name of the destination object
- *                  exists in the destination group.  For example,  
+ *                  exists in the destination group.  For example,
  *                  H5Ocopy(fid_src, "/dset", fid_dst, "/dset", ...)
  *                  will fail if "/dset" exists in the destination file
  *
@@ -112,21 +112,21 @@ H5FL_DEFINE(H5O_addr_map_t);
  *                      the group are copied. Otherwise (default), it will
  *                      recursively copy all objects below the group
  *                  H5O_COPY_EXPAND_SOFT_LINK_FLAG
- *                      If this flag is specified, it will copy the objects 
- *                      pointed by the soft links. Otherwise (default), it 
+ *                      If this flag is specified, it will copy the objects
+ *                      pointed by the soft links. Otherwise (default), it
  *                      will copy the soft link as they are
  *                  H5O_COPY_WITHOUT_ATTR_FLAG
- *                      If this flag is specified, it will copy object without 
+ *                      If this flag is specified, it will copy object without
  *                      copying attributes. Otherwise (default), it will
  *                      copy object along with all its attributes
  *                  H5O_COPY_EXPAND_REFERENCE_FLAG
  *                      1) Copy object between two different files:
- *                          When this flag is specified, it will copy objects that 
+ *                          When this flag is specified, it will copy objects that
  *                          are pointed by the references and update the values of
  *                          references in the destination file.  Otherwise (default)
  *                          the values of references in the destination will set to
  *                          zero
- *                          The current implementation does not handle references 
+ *                          The current implementation does not handle references
  *                          inside of other datatype structure. For example, if
  *                          a member of compound datatype is reference, H5Ocopy()
  *                          will copy that field as it is. It will not set the
@@ -137,11 +137,11 @@ H5FL_DEFINE(H5O_addr_map_t);
  *                          Datasets or attributes of references are copied as they
  *                          are, i.e. values of references of the destination object
  *                          are the same as the values of the source object
- *  
+ *
  *              OPTIONS THAT MAY APPLY TO COPY IN THE FUTURE.
  *                  H5O_COPY_EXPAND_EXT_LINK_FLAG
  *                      If this flag is specified, it will expand the external links
- *                      into new objects, Otherwise (default), it will keep external 
+ *                      into new objects, Otherwise (default), it will keep external
  *                      links as they are (default)
  *
  *              PROPERTIES THAT MAY APPLY TO COPY IN FUTURE
@@ -472,7 +472,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
 
             /* Copy the source message */
             recompute_size = FALSE;
-            if((mesg_dst->native = H5O_msg_copy_file(copy_type, 
+            if((mesg_dst->native = H5O_msg_copy_file(copy_type,
                     oloc_src->file, mesg_src->native, oloc_dst->file,
                     &recompute_size, cpy_info, udata, dxpl_id)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object header message")
@@ -592,7 +592,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
      * header.  This will be written when the header is flushed to disk.
      */
     if(oh_dst->version > H5O_VERSION_1)
-        HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5O_SIZEOF_MAGIC); 
+        HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5O_SIZEOF_MAGIC);
     current_pos += H5O_SIZEOF_HDR(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst);
 
     /* Loop through destination messages, updating their "raw" info */
@@ -1001,8 +1001,8 @@ done:
  *
  * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:  Peter Cao       
- *              Aug 7 2006 
+ * Programmer:  Peter Cao
+ *              Aug 7 2006
  *
  *-------------------------------------------------------------------------
  */
@@ -1057,8 +1057,8 @@ done:
  *
  * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:  Peter Cao	
- *		Aug 7 2006 
+ * Programmer:  Peter Cao
+ *		Aug 7 2006
  *
  *-------------------------------------------------------------------------
  */
@@ -1124,7 +1124,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
         uint8_t *buf;           /* Buffer to store serialized selection in */
         H5HG_t hobjid;          /* Heap object ID */
         size_t buf_size;        /* Length of object in heap */
-  
+
         /* Making equivalent references in the destination file */
         for(i = 0; i < ref_count; i++) {
             /* Get the heap ID for the dataset region */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 5431bee..71692c1 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -61,7 +61,7 @@ static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
 #define H5O_SHARED_COPY_FILE		H5O_dtype_shared_copy_file
 #define H5O_SHARED_COPY_FILE_REAL	H5O_dtype_copy_file
 #define H5O_SHARED_POST_COPY_FILE	H5O_dtype_shared_post_copy_file
-#undef  H5O_SHARED_POST_COPY_FILE_REAL	
+#undef  H5O_SHARED_POST_COPY_FILE_REAL
 #define H5O_SHARED_DEBUG		H5O_dtype_shared_debug
 #define H5O_SHARED_DEBUG_REAL		H5O_dtype_debug
 #include "H5Oshared.h"			/* Shared Object Header Message Callbacks */
@@ -805,7 +805,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
                     /* Sanity check */
                     /* (compound datatypes w/array members must be encoded w/version >= 2) */
                     HDassert(dt->shared->u.compnd.memb[i].type->shared->type != H5T_ARRAY || dt->shared->version >= H5O_DTYPE_VERSION_2);
-     
+
                     /* Check that the version is at least as great as the member */
                     HDassert(dt->shared->version >= dt->shared->u.compnd.memb[i].type->shared->version);
 
@@ -1184,7 +1184,7 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
                         ret_value += offset_nbytes; 	/*member offset*/
                     if(dt->shared->version >= H5O_DTYPE_VERSION_2)
                         ret_value += 4; 	/*member offset*/
-                    else 
+                    else
                         ret_value += 4 +	/*member offset*/
                              1 +		/*dimensionality*/
                              3 +		/*reserved*/
@@ -1348,7 +1348,7 @@ done:
  * Function:	H5O_dtype_can_share
  *
  * Purpose:	Determines if this datatype is allowed to be shared or
- *              not.  Immutable datatypes or datatypes that are already 
+ *              not.  Immutable datatypes or datatypes that are already
  *              shared cannot be shared (again).
  *
  * Return:	TRUE if datatype can be shared
@@ -1442,12 +1442,12 @@ done:
 
 /*-------------------------------------------------------------------------
  * Function:    H5O_dtype_copy_file
- *  
+ *
  * Purpose:     Copy a native datatype message from one file to another.
  *
  * Return:      Success:        Native copy of message
  *              Failure:        NULL
- *  
+ *
  * Programmer:  James Laird
  *              December 12, 2006
  *
@@ -1575,7 +1575,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
     fprintf(stream, "%*s%-*s %lu byte%s\n", indent, "", fwidth,
 	    "Size:",
 	    (unsigned long)(dt->shared->size), 1 == dt->shared->size ? "" : "s");
-	    
+
     fprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 		"Version:", dt->shared->version);
 
@@ -1871,7 +1871,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
 		    "Sign scheme:", s);
 	}
     }
-		
+
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_dtype_debug() */
 
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 888d975..bfe40f8 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -74,7 +74,7 @@ typedef struct {
 /********************/
 
 static herr_t H5O_msg_reset_real(const H5O_msg_class_t *type, void *native);
-static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, 
+static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
     unsigned sequence, hbool_t *oh_modified, void *_udata/*in,out*/);
 static herr_t H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx,
     const H5O_msg_class_t *type, const void *mesg, unsigned mesg_flags,
@@ -1655,7 +1655,7 @@ H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg)
     HDassert(share);
     HDassert(share->type != H5O_SHARE_TYPE_UNSHARED);
 
-    /* If there's a special action for this class that needs to be performed 
+    /* If there's a special action for this class that needs to be performed
      *  when setting the shared component, do that
      */
     if(type->set_share) {
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index d67b5ce..46272a0 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -244,7 +244,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fla
 
 	the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0);
     }
-#else 
+#else
     /*
      * The catch-all.  If we can't convert a character string universal
      * coordinated time to a time_t value reliably then we can't decode the
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index 48c7284..c3737f5 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -43,7 +43,7 @@
  */
 #define H5O_VERSION_2		2
 
-/* The latest version of the format.  Look through the 'flush' 
+/* The latest version of the format.  Look through the 'flush'
  *      and 'size' callback for places to change when updating this. */
 #define H5O_VERSION_LATEST	H5O_VERSION_2
 
@@ -413,7 +413,7 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_NAME[1];
  */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_MTIME[1];
 
-/* Shared Message information message (0x000f) 
+/* Shared Message information message (0x000f)
  * A message for the superblock extension, holding information about
  * the file-wide shared message "SOHM" table
  */
@@ -431,13 +431,13 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_STAB[1];
  */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_MTIME_NEW[1];
 
-/* v1 B-tree 'K' value message (0x0013) 
+/* v1 B-tree 'K' value message (0x0013)
  * A message for the superblock extension, holding information about
  * the file-wide v1 B-tree 'K' values.
  */
 H5_DLLVAR const H5O_msg_class_t H5O_MSG_BTREEK[1];
 
-/* Driver info message (0x0014) 
+/* Driver info message (0x0014)
  * A message for the superblock extension, holding information about
  * the file driver settings
  */
@@ -514,7 +514,7 @@ H5_DLL herr_t H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh,
     H5O_mesg_t *mesg, hbool_t adj_link);
 
 /* Shared object operators */
-H5_DLL void * H5O_shared_decode(H5F_t *f, hid_t dxpl_id, unsigned *ioflags, 
+H5_DLL void * H5O_shared_decode(H5F_t *f, hid_t dxpl_id, unsigned *ioflags,
     const uint8_t *buf, const H5O_msg_class_t *type);
 H5_DLL herr_t H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_mesg);
 H5_DLL size_t H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg);
@@ -522,7 +522,7 @@ H5_DLL herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg);
 H5_DLL herr_t H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg);
-H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst, 
+H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst,
     const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst,
     hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id);
 H5_DLL herr_t H5O_shared_post_copy_file (H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *mesg);
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 593e629..fed2861 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -39,7 +39,7 @@ static void *H5O_pline_copy(const void *_mesg, void *_dest);
 static size_t H5O_pline_size(const H5F_t *f, const void *_mesg);
 static herr_t H5O_pline_reset(void *_mesg);
 static herr_t H5O_pline_free(void *_mesg);
-static herr_t H5O_pline_pre_copy_file(H5F_t *file_src, 
+static herr_t H5O_pline_pre_copy_file(H5F_t *file_src,
     const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata);
 static herr_t H5O_pline_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
     FILE * stream, int indent, int fwidth);
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index a5b9db3..09b9b02 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -603,7 +603,7 @@ H5_DLL herr_t H5O_msg_get_crt_index(unsigned type_id, const void *mesg,
     H5O_msg_crt_idx_t *crt_idx);
 H5_DLL herr_t H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared,
     unsigned char *buf, const void *obj);
-H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, unsigned type_id, 
+H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     const unsigned char *buf);
 H5_DLL herr_t H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     unsigned type_id, void *mesg);
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index acce42c..ddf1a93 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -171,7 +171,7 @@ H5_DLL herr_t H5Ovisit_by_name(hid_t loc_id, const char *obj_name,
 H5_DLL herr_t H5Oclose(hid_t object_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index c1ea7de..062443a 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -490,7 +490,7 @@ H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     HDassert(f);
     HDassert(sh_mesg);
 
-    /* 
+    /*
      * Committed datatypes increment the OH of the original message when they
      * are written (in H5O_shared_link) and decrement it here.
      * SOHMs in the heap behave differently; their refcount is incremented
@@ -556,7 +556,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_shared_copy_file(H5F_t UNUSED *file_src, H5F_t *file_dst, 
+H5O_shared_copy_file(H5F_t UNUSED *file_src, H5F_t *file_dst,
     const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst,
     hbool_t UNUSED *recompute_size, H5O_copy_t *cpy_info, void UNUSED *udata,
     hid_t dxpl_id)
@@ -615,7 +615,7 @@ done:
  * Purpose:     Delate a shared message and replace with a new one.
  *              The function is needed at cases such as coping a shared reg_ref attribute.
  *              When a shared reg_ref attribute is copied from one file to
- *              another, the values in file need to be replaced. The only way 
+ *              another, the values in file need to be replaced. The only way
  *              to complish that is to delete the old message and write the
  *              new message with the correct values.
  *
diff --git a/src/H5Oshared.h b/src/H5Oshared.h
index 2e23e60..d52cd8f 100644
--- a/src/H5Oshared.h
+++ b/src/H5Oshared.h
@@ -359,7 +359,7 @@ done:
     if(!ret_value)
         if(dst_mesg)
             H5O_msg_free(H5O_SHARED_TYPE->id, dst_mesg);
-    
+
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_SHARED_COPY_FILE() */
 
@@ -404,7 +404,7 @@ H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src,
 
 #ifdef H5O_SHARED_POST_COPY_FILE_REAL
     /* Call native message's copy file callback to copy the message */
-    if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 ) 
+    if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 )
         HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy native message to another file")
 #endif /* H5O_SHARED_POST_COPY_FILE_REAL */
 
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 930a109..c523544 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -253,7 +253,7 @@ H5P_dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void UNUSED *copy_data)
         {
             dst_efl.slot[i].name_offset = 0;
         }
-        
+
     }
 
 
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index f3bb05b..efbdfe7 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -572,7 +572,7 @@ H5Pset_data_transform(hid_t plist_id, const char *expression)
     /* See if a data transform is already set, and free it if it is */
     if(H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) >= 0)
 	H5Z_xform_destroy(data_xform_prop);
-	    
+
     /* Create data transform info from expression */
     if(NULL == (data_xform_prop = H5Z_xform_create(expression)))
         HGOTO_ERROR(H5E_PLINE, H5E_NOSPACE, FAIL, "unable to create data transform info")
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 8fd4909..e7f0518 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -100,7 +100,7 @@ static herr_t H5P_fcrt_reg_prop(H5P_genclass_t *pclass);
 
 /* File creation property list class library initialization object */
 const H5P_libclass_t H5P_CLS_FCRT[1] = {{
-    "file create",		/* Class name for debugging     */ 
+    "file create",		/* Class name for debugging     */
     &H5P_CLS_GROUP_CREATE_g,	/* Parent class ID              */
     &H5P_CLS_FILE_CREATE_g,	/* Pointer to class ID          */
     &H5P_LST_FILE_CREATE_g,	/* Pointer to default property list ID */
@@ -878,7 +878,7 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_
 
     /* Check that values are sensible.  The min_btree value must be no greater
      * than the max list plus one.
-     * 
+     *
      * Range check to make certain they will fit into encoded form.
      */
     if(max_list + 1 < min_btree)
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 8987c49..db80148 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -315,7 +315,7 @@ done:
  * Purpose:     Set a prefix to be applied to the path of any external links
  *              traversed.  The prefix is appended to the filename stored
  *              in the external link.
- * 
+ *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	James Laird
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index c5b4b8b..bab5a1a 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -380,7 +380,7 @@ H5_DLL herr_t H5Pset_copy_object(hid_t plist_id, unsigned crt_intmd);
 H5_DLL herr_t H5Pget_copy_object(hid_t plist_id, unsigned *crt_intmd /*out*/);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Ptest.c b/src/H5Ptest.c
index 823f107..575d6d3 100644
--- a/src/H5Ptest.c
+++ b/src/H5Ptest.c
@@ -154,8 +154,8 @@ H5P_reset_external_file_test(hid_t dcpl_id)
     /* Check arguments */
     if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
-     
-    /* get external file list */ 
+
+    /* get external file list */
     if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
@@ -163,7 +163,7 @@ H5P_reset_external_file_test(hid_t dcpl_id)
     if(H5O_msg_reset(H5O_EFL_ID, &efl) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release external file list info")
 
-    /* set external file list */ 
+    /* set external file list */
     if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list")
 
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index 975104e..04d319b 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -68,7 +68,7 @@ H5_DLL ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref,
     char *name/*out*/, size_t size);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5SM.c b/src/H5SM.c
index 3387262..4de5810 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -70,7 +70,7 @@ static herr_t H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
     unsigned *cache_flags_ptr);
 static herr_t H5SM_decr_ref(void *record, void *op_data, hbool_t *changed);
 static herr_t H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
-    H5SM_index_header_t *header, const H5O_shared_t * mesg, 
+    H5SM_index_header_t *header, const H5O_shared_t * mesg,
     unsigned *cache_flags, void ** /*out*/ encoded_mesg);
 static herr_t H5SM_type_to_flag(unsigned type_id, unsigned *type_flag);
 static herr_t H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence,
@@ -1999,7 +1999,7 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data)
 herr_t
 H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     const H5O_shared_t *sh_mesg, hsize_t *ref_count)
-{    
+{
     H5HF_t *fheap = NULL;               /* Fractal heap that contains shared messages */
     H5SM_master_table_t *table = NULL;  /* SOHM master table */
     H5SM_list_t *list = NULL;           /* SOHM index list for message type (if in list form) */
@@ -2466,7 +2466,7 @@ done:
  *
  * Purpose:     Loop through the master SOHM table (if there is one) to:
  *			1. collect storage used for header
- *                      1. collect storage used for B-tree and List 
+ *                      1. collect storage used for B-tree and List
  *			   (include btree storage used by huge objects in fractal heap)
  *                      2. collect fractal heap storage
  *
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 7852fc6..e4af90e 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -233,7 +233,7 @@ done:
         (void)H5SM_table_dest(f, table);
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5SM_table_load() */ 
+} /* end H5SM_table_load() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index 5de8ce1..8412a89 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -78,7 +78,7 @@
 herr_t
 H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     size_t *mesg_count)
-{    
+{
     H5SM_master_table_t *table = NULL;  /* SOHM master table */
     herr_t ret_value = SUCCEED;         /* Return value */
 
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 725b8fc..1f69706 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -293,7 +293,7 @@ H5S_mpio_hyper_type( const H5S_t *space, size_t elmt_size,
             goto empty;
 #ifdef H5S_DEBUG
   if(H5DEBUG(S))
-            HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC); 
+            HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC);
 #endif
         for ( i=0; i<rank; ++i) {
             d[i].start = diminfo[i].start+space->select.offset[i];
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index e13e6be..b7818a2 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -44,7 +44,7 @@
  */
 #define H5O_SDSPACE_VERSION_2	2
 
-/* The latest version of the format.  Look through the 'encode' 
+/* The latest version of the format.  Look through the 'encode'
  *      and 'size' callbacks for places to change when updating this. */
 #define H5O_SDSPACE_VERSION_LATEST H5O_SDSPACE_VERSION_2
 
diff --git a/src/H5T.c b/src/H5T.c
index 93dbdf3..7fd19fa 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -4463,7 +4463,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
     }
 
     /* Set the flag to indicate both source and destination types are compound types
-     * for the optimization of data reading (in H5Dio.c). */ 
+     * for the optimization of data reading (in H5Dio.c). */
     if(H5T_COMPOUND==H5T_get_class(src, TRUE) && H5T_COMPOUND==H5T_get_class(dst, TRUE))
         path->are_compounds = TRUE;
 
@@ -4515,8 +4515,8 @@ H5T_path_noop(const H5T_path_t *p)
  * Function:	H5T_path_compound_subset
  *
  * Purpose:	Checks if the source and destination types are both compound.
- *              Tells whether whether the source members are a subset of 
- *              destination, and the order is the same, and no conversion 
+ *              Tells whether whether the source members are a subset of
+ *              destination, and the order is the same, and no conversion
  *              is needed.  For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index da787ee..276d05a 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -883,7 +883,7 @@ typedef struct H5T_conv_struct_t {
     hid_t	*src_memb_id;		/*source member type ID's	     */
     hid_t	*dst_memb_id;		/*destination member type ID's	     */
     H5T_path_t	**memb_path;		/*conversion path for each member    */
-    H5T_subset_t     smembs_subset;     /*are source and dest members a subset of each other? */ 
+    H5T_subset_t     smembs_subset;     /*are source and dest members a subset of each other? */
 } H5T_conv_struct_t;
 
 /* Conversion data for H5T_conv_enum() */
@@ -1775,8 +1775,8 @@ done:
  *
  * Modifications:
  *              Raymond Lu, 3 May 2007
- *              Added the detection for a special optimization case when the 
- *              source and destination members are a subset of each other, and 
+ *              Added the detection for a special optimization case when the
+ *              source and destination members are a subset of each other, and
  *              the order is the same, and no conversion is needed.  For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
@@ -1793,9 +1793,9 @@ done:
  *                  };                             TYPE4 D;
  *                                                 TYPE5 E;
  *                                             };
- *              The optimization is simply moving data to the appropriate 
+ *              The optimization is simply moving data to the appropriate
  *              places in the buffer.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1904,7 +1904,7 @@ H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
                 /* If any of source members doesn't have counterpart in the same
                  * order or there's conversion between members, don't do the
                  * optimization.
-                 */ 
+                 */
                 if(src2dst[i] != i || (src->shared->u.compnd.memb[i].offset != dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == FALSE)
                     priv->smembs_subset = H5T_SUBSET_FALSE;
             } /* end for */
@@ -1912,14 +1912,14 @@ H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
             priv->smembs_subset = H5T_SUBSET_DST;
             for(i = 0; i < dst_nmembs; i++) {
                 /* If any of source members doesn't have counterpart in the same order or
-                 * there's conversion between members, don't do the optimization. */ 
+                 * there's conversion between members, don't do the optimization. */
                 if(src2dst[i] != i || (src->shared->u.compnd.memb[i].offset != dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == FALSE)
                     priv->smembs_subset = H5T_SUBSET_FALSE;
             } /* end for */
         } else /* If the numbers of source and dest members are equal and no conversion is needed,
                 * the case should have been handled as noop earlier in H5Dio.c. */
           ;
-     
+
     } /* end if */
 
     cdata->recalc = FALSE;
@@ -1934,7 +1934,7 @@ done:
  *
  * Purpose:     A quick way to return a field in a struct private in this
  *              file.  The flag SMEMBS_SUBSET indicates whether the source
- *              members are a subset of destination or the destination 
+ *              members are a subset of destination or the destination
  *              members are a subset of the source, and the order is the
  *              same, and no conversion is needed.  For example:
  *                  struct source {            struct destination {
@@ -1945,7 +1945,7 @@ done:
  *                                                 TYPE5 E;
  *                                             };
  *
- * Return:      One of the value from H5T_subset_t.	
+ * Return:      One of the value from H5T_subset_t.
  *
  * Programmer:	Raymond Lu
  *		8 June 2007
@@ -2239,8 +2239,8 @@ done:
  *              datatype.
  *
  *              Raymond Lu, 3 May 2007
- *              Optimize a special case when the source and destination members 
- *              are a subset of each other, and the order is the same, and no 
+ *              Optimize a special case when the source and destination members
+ *              are a subset of each other, and the order is the same, and no
  *              conversion is needed.  For example:
  *                  struct source {            struct destination {
  *                      TYPE1 A;      -->          TYPE1 A;
@@ -2249,9 +2249,9 @@ done:
  *                  };                             TYPE4 D;
  *                                                 TYPE5 E;
  *                                             };
- *              The optimization is simply moving data to the appropriate 
+ *              The optimization is simply moving data to the appropriate
  *              places in the buffer.
- * 
+ *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -2389,16 +2389,16 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
             }
 
             if(priv->smembs_subset == H5T_SUBSET_SRC || priv->smembs_subset == H5T_SUBSET_DST) {
-                /* If the optimization flag is set to indicate source members are a subset and 
+                /* If the optimization flag is set to indicate source members are a subset and
                  * in the top of the destination, simply copy the source members to background buffer. */
                 xbuf = buf;
                 xbkg = bkg;
                 if(dst->shared->size <= src->shared->size)
                     /* This is to deal with a very special situation when the fields and their
-                     * offset for both source and destination are identical but the datatype 
-                     * sizes of source and destination are different.  The library still 
-                     * considers these two types different and does conversion.  It happens 
-                     * in table API test (hdf5/hl/test/test_table.c) when a table field is 
+                     * offset for both source and destination are identical but the datatype
+                     * sizes of source and destination are different.  The library still
+                     * considers these two types different and does conversion.  It happens
+                     * in table API test (hdf5/hl/test/test_table.c) when a table field is
                      * deleted.
                      */
                     copy_size = dst->shared->size;
@@ -2406,7 +2406,7 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                     copy_size = src->shared->size;
 
                 for (elmtno=0; elmtno<nelmts; elmtno++) {
-                    HDmemmove(xbkg, xbuf, copy_size); 
+                    HDmemmove(xbkg, xbuf, copy_size);
 
                     /* Update pointers */
                     xbuf += buf_stride;
@@ -3113,7 +3113,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                                 uint8_t *tmp_p;
                                 /* TMP_P is reset each time in the loop because DST_BASE_SIZE may include some data in addition to VL info. - SLU */
                                 for(u=seq_len; u<bg_seq_len; u++) {
-                                    tmp_p = (uint8_t*)tmp_buf + u*dst_base_size;  
+                                    tmp_p = (uint8_t*)tmp_buf + u*dst_base_size;
                                     UINT32DECODE(tmp_p, parent_seq_len);
                                     if(parent_seq_len>0) {
                                         H5F_addr_decode(dst->shared->u.vlen.f, (const uint8_t **)&tmp_p, &(parent_hobjid.addr));
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index d99d3e7..f8f2abc 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -86,7 +86,7 @@ typedef struct H5T_conv_cb_t {
  */
 typedef enum {
     H5T_SUBSET_BADVALUE = -1,   /* Invalid value */
-    H5T_SUBSET_FALSE = 0,       /* Source and destination aren't subset of each other */ 
+    H5T_SUBSET_FALSE = 0,       /* Source and destination aren't subset of each other */
     H5T_SUBSET_SRC,             /* Source is the subset of dest and no conversion is needed */
     H5T_SUBSET_DST,             /* Dest is the subset of source and no conversion is needed */
     H5T_SUBSET_CAP              /* Must be the last value */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 40a2a4d..95539ab 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -592,7 +592,7 @@ H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts,
 			  void *buf, void *background, hid_t plist_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
- * 
+ *
  * Use of these symbols is deprecated.
  */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index 7211a2b..ce60650 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -77,7 +77,7 @@ typedef int H5Z_filter_t;
 /* Macros for the shuffle filter */
 #define H5Z_SHUFFLE_USER_NPARMS    0    /* Number of parameters that users can set */
 #define H5Z_SHUFFLE_TOTAL_NPARMS   1    /* Total number of parameters for filter */
- 
+
 /* Macros for the szip filter */
 #define H5Z_SZIP_USER_NPARMS    2       /* Number of parameters that users can set */
 #define H5Z_SZIP_TOTAL_NPARMS   4       /* Total number of parameters for filter */
@@ -85,7 +85,7 @@ typedef int H5Z_filter_t;
 #define H5Z_SZIP_PARM_PPB       1       /* "User" parameter for pixels-per-block */
 #define H5Z_SZIP_PARM_BPP       2       /* "Local" parameter for bits-per-pixel */
 #define H5Z_SZIP_PARM_PPS       3       /* "Local" parameter for pixels-per-scanline */
-   
+
 /* Macros for the nbit filter */
 #define H5Z_NBIT_USER_NPARMS     0     /* Number of parameters that users can set */
 
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index c0a6972..b26a4b3 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -974,7 +974,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
 	if(H5Z_xform_eval_full(tree, array_size, array_type, &res) < 0)
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform")
 
-	if(data_xform_prop->dat_val_pointers->num_ptrs > 1)	
+	if(data_xform_prop->dat_val_pointers->num_ptrs > 1)
 	    HDmemcpy(array, res.value.dat_val, array_size * H5Tget_size(array_type));
 
         /* Free the temporary arrays we used */
diff --git a/src/H5checksum.c b/src/H5checksum.c
index 3359722..6c01508 100644
--- a/src/H5checksum.c
+++ b/src/H5checksum.c
@@ -270,7 +270,7 @@ This was tested for:
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
@@ -280,7 +280,7 @@ satisfy this are
    14  9  3  7 17  3
 Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
 for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
+used http://burtleburtle.net/bob/hash/avalanche.html to choose
 the operations, constants, and arrangements of the variables.
 
 This does not achieve avalanche.  There are input bits of (a,b,c)
@@ -320,7 +320,7 @@ produce values of c that look totally different.  This was tested for
   the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
   is commonly produced by subtraction) look like a single 1-bit
   difference.
-* the base values were pseudorandom, all zero but one bit set, or 
+* the base values were pseudorandom, all zero but one bit set, or
   all zero plus a counter that starts at zero.
 
 These constants passed:
diff --git a/src/H5private.h b/src/H5private.h
index 142e41e..f919491 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -495,7 +495,7 @@ typedef struct {
  * Redefine all the POSIX functions.  We should never see a POSIX
  * function (or any other non-HDF5 function) in the source!
  */
- 
+
  /* Use platform-specific versions if necessary */
 #include "H5win32defs.h"
 
@@ -503,7 +503,7 @@ typedef struct {
     #define HDabort()		abort()
 #endif /* HDabort */
 #ifndef HDabs
-    #define HDabs(X)		abs(X) 
+    #define HDabs(X)		abs(X)
 #endif /* HDabs */
 #ifndef HDaccess
     #define HDaccess(F,M)		access(F, M)
diff --git a/src/H5system.c b/src/H5system.c
index 6a8a91a..ddb8567 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -614,7 +614,7 @@ H5_build_extpath(const char *name, char **extpath/*out*/)
 
     *extpath = NULL;
 
-    /* 
+    /*
      * Unix: name[0] is a "/"
      * Windows: name[0-2] is "<drive letter>:\" or "<drive-letter>:/"
      */
@@ -627,17 +627,17 @@ H5_build_extpath(const char *name, char **extpath/*out*/)
         if (NULL == (new_name = (char *)H5MM_strdup(name)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
-	/* 
+	/*
 	 * Windows: name[0-1] is "<drive-letter>:"
-	 * 	Get current working directory on the drive specified in NAME 
+	 * 	Get current working directory on the drive specified in NAME
 	 * Unix: does not apply
 	 */
         if (CHECK_ABS_DRIVE(name)) {
             drive = name[0] - 'A' + 1;
             retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN);
             HDstrcpy(new_name, &name[2]);
-	/* 
-	 * Windows: name[0] is a '/' or '\' 
+	/*
+	 * Windows: name[0] is a '/' or '\'
 	 *	Get current drive
 	 * Unix: does not apply
 	 */