Whitespace cleanup

104 files changed, 1242 insertions, 1240 deletions

diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index 922153c..8f5e696 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -669,7 +669,7 @@ H5FA__cache_dblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED
     if(NULL == (dblock = H5FA__dblock_alloc(udata->hdr)))
         H5E_THROW(H5E_CANTALLOC, "memory allocation failed for fixed array data block")
 
-    HDassert(((!dblock->npages) && (len == (size_t)H5FA_DBLOCK_SIZE(dblock))) 
+    HDassert(((!dblock->npages) && (len == (size_t)H5FA_DBLOCK_SIZE(dblock)))
              || (len == (size_t)H5FA_DBLOCK_PREFIX_SIZE(dblock)));
 
     /* Set the fixed array data block's information */
@@ -954,21 +954,21 @@ END_FUNC(STATIC)   /* end H5FA__cache_dblock_free_icr() */
  *		to free when a dblock entry is destroyed with the free
  *		file space block set.
  *
- *		This function is needed when the data block is paged, as 
+ *		This function is needed when the data block is paged, as
  *		the datablock header and all its pages are allocted as a
- *		single contiguous chunk of file space, and must be 
+ *		single contiguous chunk of file space, and must be
  *		deallocated the same way.
  *
  *		The size of the chunk of memory in which the dblock
  *		header and all its pages is stored in the size field,
  *		so we simply pass that value back to the cache.
  *
- *		If the datablock is not paged, then the size field of 
+ *		If the datablock is not paged, then the size field of
  *		the cache_info contains the correct size.  However this
  *		value will be the same as the size field, so we return
  *		the contents of the size field to the cache in this case
  *		as well.
- *		
+ *
  * Return:	Non-negative on success/Negative on failure
  *
  * Programmer:	John Mainzer
@@ -1158,7 +1158,7 @@ H5FA__cache_dblk_page_image_len(const void *_thing, size_t *image_len))
     HDassert(image_len);
 
     /* Set the image length size */
-    *image_len = dblk_page->size; 
+    *image_len = dblk_page->size;
 
 END_FUNC(STATIC)   /* end H5FA__cache_dblk_page_image_len() */
 
diff --git a/src/H5FApkg.h b/src/H5FApkg.h
index 8f76fc9..2baee88 100644
--- a/src/H5FApkg.h
+++ b/src/H5FApkg.h
@@ -157,10 +157,10 @@ typedef struct H5FA_hdr_t {
                                          * of the fixed array header.
  					 *
  					 * The field is used to avoid duplicate
-					 * setups of the flush dependency 
-					 * relationship, and to allow the 
+					 * setups of the flush dependency
+					 * relationship, and to allow the
 					 * fixed array header to destroy
-					 * the flush dependency on receipt of 
+					 * the flush dependency on receipt of
 					 * an eviction notification from the
 					 * metadata cache.
 					 */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 6db8af6..d551f2f 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -82,7 +82,7 @@ typedef struct H5FD_core_t {
     DWORD           nFileIndexLow;
     DWORD           nFileIndexHigh;
     DWORD           dwVolumeSerialNumber;
-    
+
     HANDLE          hFile;      /* Native windows file handle */
 #endif /* H5_HAVE_WIN32_API */
     hbool_t dirty;                              /* changes not saved?       */
@@ -404,7 +404,7 @@ done:
  *
  * Purpose:     Initializes any interface-specific data or routines.
  *
- * Return:      Non-negative on success/Negative on failure 
+ * Return:      Non-negative on success/Negative on failure
  *
  *-------------------------------------------------------------------------
  */
@@ -756,9 +756,9 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     if((file_image_info.buffer != NULL) && !(H5F_ACC_CREAT & flags)) {
         if(HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW) >= 0)
             HGOTO_ERROR(H5E_FILE, H5E_FILEEXISTS, NULL, "file already exists")
-        
+
         /* If backing store is requested, create and stat the file
-         * Note: We are forcing the O_CREAT flag here, even though this is 
+         * Note: We are forcing the O_CREAT flag here, even though this is
          * technically an open.
          */
         if(fa->backing_store) {
@@ -870,7 +870,7 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
                         bytes_in = H5_POSIX_MAX_IO_BYTES;
                     else
                         bytes_in = (h5_posix_io_t)size;
-                    
+
                     do {
 #ifdef H5_HAVE_PREADWRITE
                         bytes_read = HDpread(file->fd, mem, bytes_in, offset);
@@ -879,7 +879,7 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
                         bytes_read = HDread(file->fd, mem, bytes_in);
 #endif /* H5_HAVE_PREADWRITE */
                     } while(-1 == bytes_read && EINTR == errno);
-                    
+
                     if(-1 == bytes_read) { /* error */
                         int myerrno = errno;
                         time_t mytime = HDtime(NULL);
@@ -888,10 +888,10 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
 
                         HGOTO_ERROR(H5E_IO, H5E_READERROR, NULL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', file->mem = %p, total read size = %llu, bytes this sub-read = %llu, bytes actually read = %llu, offset = %llu", HDctime(&mytime), file->name, file->fd, myerrno, HDstrerror(myerrno), file->mem, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_read, (unsigned long long)offset);
                     } /* end if */
-                    
+
                     HDassert(bytes_read >= 0);
                     HDassert((size_t)bytes_read <= size);
-                    
+
                     mem += bytes_read;
                     size -= (size_t)bytes_read;
                 } /* end while */
@@ -1465,24 +1465,24 @@ done:
  *              than the end-of-address.
  *
  *              Addendum -- 12/2/11
- *              For file images opened with the core file driver, it is 
+ *              For file images opened with the core file driver, it is
  *              necessary that we avoid reallocating the core file driver's
  *              buffer uneccessarily.
  *
  *              To this end, I have made the following functional changes
- *              to this function.  
+ *              to this function.
  *
- *              If we are closing, and there is no backing store, this 
+ *              If we are closing, and there is no backing store, this
  *              function becomes a no-op.
  *
  *              If we are closing, and there is backing store, we set the
- *              eof to equal the eoa, and truncate the backing store to 
+ *              eof to equal the eoa, and truncate the backing store to
  *              the new eof
  *
- *              If we are not closing, we realloc the buffer to size equal 
- *              to the smallest multiple of the allocation increment that 
- *              equals or exceeds the eoa and set the eof accordingly.  
- *              Note that we no longer truncate	the backing store to the 
+ *              If we are not closing, we realloc the buffer to size equal
+ *              to the smallest multiple of the allocation increment that
+ *              equals or exceeds the eoa and set the eof accordingly.
+ *              Note that we no longer truncate	the backing store to the
  *              new eof if applicable.
  *                                                                  -- JRM
  *
diff --git a/src/H5FDhdfs.h b/src/H5FDhdfs.h
index 3d4128d..37252f0 100644
--- a/src/H5FDhdfs.h
+++ b/src/H5FDhdfs.h
@@ -43,7 +43,7 @@ extern "C" {
  *
  * `version` (int32_t)
  *
- *     Version number of the `H5FD_hdfs_fapl_t` structure.  Any instance passed 
+ *     Version number of the `H5FD_hdfs_fapl_t` structure.  Any instance passed
  *     to the above calls must have a recognized version number, or an error
  *     will be flagged.
  *
diff --git a/src/H5FDint.c b/src/H5FDint.c
index ea8c4d8..8a2148a 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -241,7 +241,7 @@ H5FD_write(H5FD_t *file, H5FD_mem_t type, haddr_t addr, size_t size, const void
     if(HADDR_UNDEF == (eoa = (file->cls->get_eoa)(file, type)))
         HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver get_eoa request failed")
     if((addr + file->base_addr + size) > eoa)
-        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu", 
+        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size=%llu, eoa=%llu",
                     (unsigned long long)(addr+ file->base_addr), (unsigned long long)size, (unsigned long long)eoa)
 
     /* Dispatch to driver */
@@ -389,7 +389,7 @@ H5FD_driver_query(const H5FD_class_t *driver, unsigned long *flags/*out*/)
     /* Check for the driver to query and then query it */
     if(driver->query)
         ret_value = (driver->query)(NULL, flags);
-    else 
+    else
         *flags = 0;
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index ac5667f..b1da5f0 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -108,7 +108,7 @@ typedef struct H5FD_log_t {
     DWORD           nFileIndexLow;
     DWORD           nFileIndexHigh;
     DWORD           dwVolumeSerialNumber;
-    
+
     HANDLE          hFile;      /* Native windows file handle */
 #endif  /* H5_HAVE_WIN32_API */
 
@@ -1294,7 +1294,7 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hadd
 
         HDassert(bytes_read >= 0);
         HDassert((size_t)bytes_read <= size);
-        
+
         size -= (size_t)bytes_read;
         addr += (haddr_t)bytes_read;
         buf = (char *)buf + bytes_read;
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 11f0411..8c7e91a 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -1283,7 +1283,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
 #endif
             HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code)
     } /* end if */
- 
+
     /* If the rank0-bcast feature was used, broadcast the # of bytes read to
      * other ranks, which didn't perform any I/O.
      */
@@ -1582,14 +1582,14 @@ done:
  *
  * Purpose:     Make certain the file's size matches it's allocated size
  *
- *              This is a little sticky in the mpio case, as it is not 
+ *              This is a little sticky in the mpio case, as it is not
  *              easy for us to track the current EOF by extracting it from
- *              write calls. 
+ *              write calls.
  *
  *              Instead, we first check to see if the eoa has changed since
- *              the last call to this function.  If it has, we call 
- *              MPI_File_get_size() to determine the current EOF, and 
- *              only call MPI_File_set_size() if this value disagrees 
+ *              the last call to this function.  If it has, we call
+ *              MPI_File_get_size() to determine the current EOF, and
+ *              only call MPI_File_set_size() if this value disagrees
  *              with the current eoa.
  *
  * Return:      SUCCEED/FAIL
@@ -1621,13 +1621,13 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
         MPI_Offset      size;
         MPI_Offset      needed_eof;
 
-        /* In principle, it is possible for the size returned by the 
-         * call to MPI_File_get_size() to depend on whether writes from 
+        /* In principle, it is possible for the size returned by the
+         * call to MPI_File_get_size() to depend on whether writes from
          * all proceeses have completed at the time process 0 makes the
-         * call.  
+         * call.
          *
          * In practice, most (all?) truncate calls will come after a barrier
-         * and with no interviening writes to the file (with the possible 
+         * and with no interviening writes to the file (with the possible
          * exception of sueprblock / superblock extension message updates).
          *
          * Check the "MPI file closing" flag in the API context to determine
@@ -1658,13 +1658,13 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
             if(MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, needed_eof)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_set_size failed", mpi_code)
 
-            /* In general, we must wait until all processes have finished 
-             * the truncate before any process can continue, since it is 
-             * possible that a process would write at the end of the 
+            /* In general, we must wait until all processes have finished
+             * the truncate before any process can continue, since it is
+             * possible that a process would write at the end of the
              * file, and this write would be discarded by the truncate.
              *
-             * While this is an issue for a user initiated flush, it may 
-             * not be an issue at file close.  If so, we may be able to 
+             * While this is an issue for a user initiated flush, it may
+             * not be an issue at file close.  If so, we may be able to
              * optimize out the following barrier in that case.
              */
             if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index d7fc88d..72f4da5 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -87,7 +87,7 @@ typedef struct H5FD_multi_t {
     haddr_t             memb_next[H5FD_MEM_NTYPES]; /*addr of next member                       */
     H5FD_t             *memb[H5FD_MEM_NTYPES];      /*member pointers                           */
     haddr_t             memb_eoa[H5FD_MEM_NTYPES];  /*EOA for individual files,
-                                                     *end of allocated addresses.  v1.6 library 
+                                                     *end of allocated addresses.  v1.6 library
                                                      *have the EOA for the entire file. But it's
                                                      *meaningless for MULTI file.  We replaced it
                                                      *with the EOAs for individual files        */
@@ -831,9 +831,9 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
         if (file->memb[mt])
             if(H5FDset_eoa(file->memb[mt], mt, memb_eoa[mt])<0)
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "set_eoa() failed", -1)
-       
-        /* Save the individual EOAs in one place for later comparison (in H5FD_multi_set_eoa) */ 
-        file->memb_eoa[mt] = memb_eoa[mt]; 
+
+        /* Save the individual EOAs in one place for later comparison (in H5FD_multi_set_eoa) */
+        file->memb_eoa[mt] = memb_eoa[mt];
     } END_MEMBERS;
 
     return 0;
@@ -1001,7 +1001,7 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     /*
      * Initialize the file from the file access properties, using default
      * values if necessary.  Make sure to use CALLOC here because the code
-     * in H5FD_multi_set_eoa depends on the proper initialization of memb_eoa 
+     * in H5FD_multi_set_eoa depends on the proper initialization of memb_eoa
      * in H5FD_multi_t.
      */
     if(NULL == (file = (H5FD_multi_t *)calloc((size_t)1, sizeof(H5FD_multi_t))))
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 514d1bf..54ca8f7 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -207,7 +207,7 @@ typedef enum H5F_mem_t	H5FD_mem_t;
      * the handle for the VFD (returned with the 'get_handle' callback) is
      * of type 'int' and is compatible with POSIX I/O calls.
      */
-#define H5FD_FEAT_POSIX_COMPAT_HANDLE   0x00000080    
+#define H5FD_FEAT_POSIX_COMPAT_HANDLE   0x00000080
     /*
      * Defining H5FD_FEAT_HAS_MPI for a VFL driver means that
      * the driver makes use of MPI communication and code may retrieve
@@ -220,7 +220,7 @@ typedef enum H5F_mem_t	H5FD_mem_t;
      * instead of the default H5D_ALLOC_TIME_LATE
      */
 #define H5FD_FEAT_ALLOCATE_EARLY        0x00000200
-    /* 
+    /*
      * Defining H5FD_FEAT_ALLOW_FILE_IMAGE for a VFL driver means that
      * the driver is able to use a file image in the fapl as the initial
      * contents of a file.
@@ -332,7 +332,7 @@ struct H5FD_t {
 /* Define enum for the source of file image callbacks */
 typedef enum {
     H5FD_FILE_IMAGE_OP_NO_OP,
-    H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET,     
+    H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET,
     H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY,
     H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET,
     H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE,
@@ -343,13 +343,13 @@ typedef enum {
 
 /* Define structure to hold file image callbacks */
 typedef struct {
-    void   *(*image_malloc)(size_t size, H5FD_file_image_op_t file_image_op, 
+    void   *(*image_malloc)(size_t size, H5FD_file_image_op_t file_image_op,
                             void *udata);
     void   *(*image_memcpy)(void *dest, const void *src, size_t size,
                             H5FD_file_image_op_t file_image_op, void *udata);
-    void   *(*image_realloc)(void *ptr, size_t size, 
+    void   *(*image_realloc)(void *ptr, size_t size,
                             H5FD_file_image_op_t file_image_op, void *udata);
-    herr_t  (*image_free)(void *ptr, H5FD_file_image_op_t file_image_op, 
+    herr_t  (*image_free)(void *ptr, H5FD_file_image_op_t file_image_op,
                           void *udata);
     void   *(*udata_copy)(void *udata);
     herr_t  (*udata_free)(void *udata);
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 0054a86..6504ef9 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -85,7 +85,7 @@ typedef struct H5FD_sec2_t {
     DWORD           nFileIndexLow;
     DWORD           nFileIndexHigh;
     DWORD           dwVolumeSerialNumber;
-    
+
     HANDLE          hFile;      /* Native windows file handle */
 #endif  /* H5_HAVE_WIN32_API */
 
@@ -599,7 +599,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
  *              either the filesystem end-of-file or the HDF5 end-of-address
  *              markers.
  *
- * Return:      End of file address, the first address past the end of the 
+ * Return:      End of file address, the first address past the end of the
  *              "file", either the filesystem file or the HDF5 file.
  *
  * Programmer:  Robb Matzke
@@ -715,7 +715,7 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
             bytes_read = HDread(file->fd, buf, bytes_in);
 #endif /* H5_HAVE_PREADWRITE */
         } while(-1 == bytes_read && EINTR == errno);
-        
+
         if(-1 == bytes_read) { /* error */
             int myerrno = errno;
             time_t mytime = HDtime(NULL);
@@ -724,16 +724,16 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUS
 
             HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, bytes actually read = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_read, (unsigned long long)offset);
         } /* end if */
-        
+
         if(0 == bytes_read) {
             /* end of file but not end of format address space */
             HDmemset(buf, 0, size);
             break;
         } /* end if */
-        
+
         HDassert(bytes_read >= 0);
         HDassert((size_t)bytes_read <= size);
-        
+
         size -= (size_t)bytes_read;
         addr += (haddr_t)bytes_read;
         buf = (char *)buf + bytes_read;
@@ -819,7 +819,7 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
             bytes_wrote = HDwrite(file->fd, buf, bytes_in);
 #endif /* H5_HAVE_PREADWRITE */
         } while(-1 == bytes_wrote && EINTR == errno);
-        
+
         if(-1 == bytes_wrote) { /* error */
             int myerrno = errno;
             time_t mytime = HDtime(NULL);
@@ -828,7 +828,7 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = %llu, bytes actually written = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_wrote, (unsigned long long)offset);
         } /* end if */
-        
+
         HDassert(bytes_wrote > 0);
         HDassert((size_t)bytes_wrote <= size);
 
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 861c6a6..d29a1b4 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -110,7 +110,7 @@ typedef struct H5FD_stdio_t {
     DWORD           nFileIndexLow;
     DWORD           nFileIndexHigh;
     DWORD           dwVolumeSerialNumber;
-    
+
     HANDLE          hFile;      /* Native windows file handle */
 #endif  /* H5_HAVE_WIN32_API */
 } H5FD_stdio_t;
@@ -824,13 +824,13 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl
             file->pos = HADDR_UNDEF;
             H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_READERROR, "fread failed", -1)
         } /* end if */
-        
+
         if(0 == bytes_read && feof(file->fp)) {
             /* end of file but not end of format address space */
             memset((unsigned char *)buf, 0, size);
             break;
         } /* end if */
-        
+
         size -= bytes_read;
         addr += (haddr_t)bytes_read;
         buf = (char *)buf + bytes_read;
@@ -914,7 +914,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
             file->pos = HADDR_UNDEF;
             H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fwrite failed", -1)
         } /* end if */
-        
+
         assert(bytes_wrote > 0);
         assert((size_t)bytes_wrote <= size);
 
@@ -1040,7 +1040,7 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id,
                 if(dwError != NO_ERROR )
                     H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_FILEOPEN, "unable to set file pointer", -1)
             }
-            
+
             bError = SetEndOfFile(file->hFile);
             if(0 == bError)
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "unable to truncate/extend file properly", -1)
diff --git a/src/H5FDtest.c b/src/H5FDtest.c
index dec0818..2eb176d 100644
--- a/src/H5FDtest.c
+++ b/src/H5FDtest.c
@@ -110,6 +110,6 @@ H5FD__supports_swmr_test(const char *vfd_name)
         ret_value = !HDstrcmp(vfd_name, "log") || !HDstrcmp(vfd_name, "sec2");
 
     FUNC_LEAVE_NOAPI(ret_value)
-    
+
 } /* end H5FD__supports_swmr_test() */
 
diff --git a/src/H5FS.c b/src/H5FS.c
index 1bd56b8..4fe0927 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -1171,7 +1171,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS__sinfo_dest() */
 
-herr_t 
+herr_t
 H5FS_get_sect_count(const H5FS_t *frsp, hsize_t *tot_sect_count)
 {
     herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5FScache.c b/src/H5FScache.c
index d5f2817..c3e3998 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -85,7 +85,7 @@ static void *H5FS__cache_hdr_deserialize(const void *image, size_t len,
 static herr_t H5FS__cache_hdr_image_len(const void *thing, size_t *image_len);
 static herr_t H5FS__cache_hdr_pre_serialize(H5F_t *f, void *thing, haddr_t addr,
     size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags);
-static herr_t H5FS__cache_hdr_serialize(const H5F_t *f, void *image, 
+static herr_t H5FS__cache_hdr_serialize(const H5F_t *f, void *image,
     size_t len, void *thing);
 static herr_t H5FS__cache_hdr_notify(H5AC_notify_action_t action, void *thing);
 static herr_t H5FS__cache_hdr_free_icr(void *thing);
@@ -241,7 +241,7 @@ H5FS__cache_hdr_verify_chksum(const void *_image, size_t len, void H5_ATTR_UNUSE
  *-------------------------------------------------------------------------
  */
 static void *
-H5FS__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata, 
+H5FS__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, void *_udata,
     hbool_t H5_ATTR_UNUSED *dirty)
 {
     H5FS_t		*fspace = NULL; /* Free space header info */
@@ -303,8 +303,8 @@ H5FS__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len
     /* Expand percent */
     UINT16DECODE(image, fspace->expand_percent);
 
-    /* Size of address space free space sections are within 
-     * (log2 of actual value) 
+    /* Size of address space free space sections are within
+     * (log2 of actual value)
      */
     UINT16DECODE(image, fspace->max_sect_addr);
 
@@ -378,20 +378,20 @@ H5FS__cache_hdr_image_len(const void *_thing, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:	H5FS__cache_hdr_pre_serialize
  *
- * Purpose:	The free space manager header contains the address, size, and 
+ * Purpose:	The free space manager header contains the address, size, and
  *		allocation size of the free space manager section info.  However,
  *		since it is possible for the section info to either not be allocated
  *		at all, or be allocated in temporary (AKA imaginary) files space,
  *		it is possible for the above mentioned fields to contain giberish
  *		when the free space manager header is serialized.
  *
- *		This function exists to prevent this problem.  It does so by 
+ *		This function exists to prevent this problem.  It does so by
  *		forcing allocation of real file space for the section information.
  *
  *		Note that in the Version 2 cache, this problem was dealt with by
  *		simply flushing the section info before flushing the header.  This
- *		was possible, since the clients handled file I/O directly.  As 
- *		this responsibility has moved to the cache in Version 3, this 
+ *		was possible, since the clients handled file I/O directly.  As
+ *		this responsibility has moved to the cache in Version 3, this
  *		solution is no longer directly applicable.
  *
  * Return:	Success:	SUCCEED
@@ -402,9 +402,9 @@ H5FS__cache_hdr_image_len(const void *_thing, size_t *image_len)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
-    haddr_t addr, size_t H5_ATTR_UNUSED len, haddr_t H5_ATTR_NDEBUG_UNUSED *new_addr, 
+    haddr_t addr, size_t H5_ATTR_UNUSED len, haddr_t H5_ATTR_NDEBUG_UNUSED *new_addr,
     size_t H5_ATTR_NDEBUG_UNUSED *new_len, unsigned *flags)
 {
     H5FS_t 	*fspace = (H5FS_t *)_thing;     /* Pointer to the object */
@@ -433,23 +433,23 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
         /* Set the ring type for the section info in the API context */
         H5AC_set_ring(ring, &orig_ring);
 
-        /* This implies that the header "owns" the section info.  
+        /* This implies that the header "owns" the section info.
          *
-         * Unfortunately, the comments in the code are not clear as to 
+         * Unfortunately, the comments in the code are not clear as to
          * what this means, but from reviewing the code (most particularly
-         * H5FS_close(), H5FS_sinfo_lock, and H5FS_sinfo_unlock()), I 
-         * gather that it means that the header is maintaining a pointer to 
-         * an instance of H5FS_sinfo_t in which free space data is 
+         * H5FS_close(), H5FS_sinfo_lock, and H5FS_sinfo_unlock()), I
+         * gather that it means that the header is maintaining a pointer to
+         * an instance of H5FS_sinfo_t in which free space data is
          * maintained, and either:
          *
          * 1) The instance of H5FS_sinfo_t is not in the metadata cache.
          *
-         *    This will be TRUE iff H5F_addr_defined(fspace->sect_addr) 
+         *    This will be TRUE iff H5F_addr_defined(fspace->sect_addr)
          *    is FALSE, and fspace->sinfo is not NULL.  This is sometimes
          *    referred to as "floating" section info in the comments.
          *
-         *    If the section info structure contains free space data 
-         *    that must be placed on disk eventually, then 
+         *    If the section info structure contains free space data
+         *    that must be placed on disk eventually, then
          *
          *        fspace->serial_sect_count > 0
          *
@@ -458,57 +458,57 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
          *        H5F_addr_defined(fspace->addr)
          *
          *    will both be TRUE.  If this contition does not hold, then
-         *    either the free space info is not persistent 
-         *    (!H5F_addr_defined(fspace->addr)???) or the section info 
-         *    contains no free space data that must be written to file 
+         *    either the free space info is not persistent
+         *    (!H5F_addr_defined(fspace->addr)???) or the section info
+         *    contains no free space data that must be written to file
          *    ( fspace->serial_sect_count == 0 ).
          *
          * 2) The instance of H5FS_sinfo_t is in the metadata cache with
          *    address in temporary file space (AKA imaginary file space).
-         *    The entry may or may not be protected, and if protected, it 
-         *    may be protected either RW or RO (as indicated by 
+         *    The entry may or may not be protected, and if protected, it
+         *    may be protected either RW or RO (as indicated by
          *    fspace->sinfo_protected and  fspace->sinfo_accmod).
          *
          * 3) The instance of H5FS_sinfo_t is in the metadata cache with
          *    address in real file space.  As in case 2) above, the entry
-         *    may or may not be protected, and if protected, it 
-         *    may be protected either RW or RO (as indicated by 
+         *    may or may not be protected, and if protected, it
+         *    may be protected either RW or RO (as indicated by
          *    fspace->sinfo_protected and  fspace->sinfo_accmod).
          *
-         * Observe that fspace->serial_sect_count > 0 must be TRUE in 
-         * cases 2) and 3), as the section info should not be stored on 
+         * Observe that fspace->serial_sect_count > 0 must be TRUE in
+         * cases 2) and 3), as the section info should not be stored on
          * disk if it doesn't exist.  Similarly, since the section info
-         * will not be stored to disk unless the header is, 
+         * will not be stored to disk unless the header is,
          * H5F_addr_defined(fspace->addr) must hold as well.
          *
          * As the objective is to touch up the free space manager header
-         * so that it contains sensical data on the size and location of 
+         * so that it contains sensical data on the size and location of
          * the section information, we have to handle each of the above
          * cases differently.
          *
-         * Case 1) If either fspace->serial_sect_count == 0 or 
-         *         ! H5F_addr_defined(fspace->addr) do nothing as either 
-         *         the free space manager data is not persistent, or the 
+         * Case 1) If either fspace->serial_sect_count == 0 or
+         *         ! H5F_addr_defined(fspace->addr) do nothing as either
+         *         the free space manager data is not persistent, or the
          *         section info is empty.
          *
          *         Otherwise, allocate space for the section info in real
-         *         file space, insert the section info at this location, and 
-         *         set fspace->sect_addr, fspace->sect_size, and 
+         *         file space, insert the section info at this location, and
+         *         set fspace->sect_addr, fspace->sect_size, and
          *         fspace->alloc_sect_size to reflect the new location
          *         of the section info.  Note that it is not necessary to
          *         force a write of the section info.
          *
          * Case 2) Allocate space for the section info in real file space,
-         *         and tell the metadata cache to relocate the entry.  
-         *         Update fspace->sect_addr, fspace->sect_size, and 
+         *         and tell the metadata cache to relocate the entry.
+         *         Update fspace->sect_addr, fspace->sect_size, and
          *         fspace->alloc_sect_size to reflect the new location.
          *
          * Case 3) Nothing to be done in this case, although it is useful
          *         to perform sanity checks.
          *
-         * Note that while we may alter the contents of the free space 
-         * header in cases 1) and 2), there is no need to mark the header 
-         * as dirty, as the metadata cache would not be attempting to 
+         * Note that while we may alter the contents of the free space
+         * header in cases 1) and 2), there is no need to mark the header
+         * as dirty, as the metadata cache would not be attempting to
          * serialize the header if it thought it was clean.
          */
         if(fspace->serial_sect_count > 0 && H5F_addr_defined(fspace->addr)) {
@@ -558,7 +558,7 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
 
                 HDassert(fspace->sinfo->cache_info.size == fspace->alloc_sect_size);
 
-                /* the metadata cache is now managing the section info, 
+                /* the metadata cache is now managing the section info,
                  * so set fspace->sinfo to NULL.
                  */
                 fspace->sinfo = NULL;
@@ -607,11 +607,11 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
         } /* end else */
     } /* end if */
     else if(H5F_addr_defined(fspace->sect_addr)) {
-        /* Here the metadata cache is managing the section info.  
+        /* Here the metadata cache is managing the section info.
          *
-         * Do some sanity checks, and then test to see if the section 
-         * info is in real file space.  If it isn't relocate it into 
-         * real file space lest the header be written to file with 
+         * Do some sanity checks, and then test to see if the section
+         * info is in real file space.  If it isn't relocate it into
+         * real file space lest the header be written to file with
          * a nonsense section info address.
          */
         if(!H5F_POINT_OF_NO_RETURN(f)) {
@@ -623,12 +623,12 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
             unsigned sect_status = 0;
             haddr_t new_sect_addr;
 
-            /* we have work to do -- must relocate section info into 
+            /* we have work to do -- must relocate section info into
              * real file space.
              *
              * Since the section info address is in temporary space (AKA
-             * imaginary space), it follows that the entry must be in 
-             * cache.  Further, since fspace->sinfo is NULL, it must be 
+             * imaginary space), it follows that the entry must be in
+             * cache.  Further, since fspace->sinfo is NULL, it must be
              * unprotected and un-pinned.  Start by verifying this.
              */
             if(H5AC_get_entry_status(f, fspace->sect_addr, &sect_status) < 0)
@@ -654,7 +654,7 @@ H5FS__cache_hdr_pre_serialize(H5F_t *f, void *_thing,
             /* Update the internal address for the section info */
             fspace->sect_addr = new_sect_addr;
 
-            /* No need to mark the header dirty, as we are about to 
+            /* No need to mark the header dirty, as we are about to
              * serialize it.
              */
         } /* end if */
@@ -682,7 +682,7 @@ done:
  *
  * Purpose: 	Given an instance of H5FS_t and a suitably sized buffer,
  *      	serialize the contents of the instance of H5FS_t and write
- *      	its contents to the buffer.  This buffer will be used to 
+ *      	its contents to the buffer.  This buffer will be used to
  *      	write the image of the instance to file.
  *
  * Return:      Success:        SUCCEED
@@ -712,19 +712,19 @@ H5FS__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UN
     HDassert(fspace->cache_info.type == H5AC_FSPACE_HDR);
     HDassert(fspace->hdr_size == len);
 
-    /* The section information does not always exits, and if it does, 
-     * it is not always in the cache.  To make matters more interesting, 
+    /* The section information does not always exits, and if it does,
+     * it is not always in the cache.  To make matters more interesting,
      * even if it is in the cache, it may not be in real file space.
      *
-     * The pre-serialize function should have moved the section info 
+     * The pre-serialize function should have moved the section info
      * into real file space if necessary before this function was called.
      * The following asserts are a cursory check on this.
      */
     HDassert((! H5F_addr_defined(fspace->sect_addr)) || (! H5F_IS_TMP_ADDR(f, fspace->sect_addr)));
 
     if(!H5F_POINT_OF_NO_RETURN(f))
-        HDassert((! H5F_addr_defined(fspace->sect_addr)) || 
-                 ((fspace->sect_size > 0) && 
+        HDassert((! H5F_addr_defined(fspace->sect_addr)) ||
+                 ((fspace->sect_size > 0) &&
                  (fspace->alloc_sect_size == (size_t)fspace->sect_size)));
 
     /* Magic number */
@@ -758,8 +758,8 @@ H5FS__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UN
     /* Expand percent */
     UINT16ENCODE(image, fspace->expand_percent);
 
-    /* Size of address space free space sections are within (log2 of 
-     * actual value) 
+    /* Size of address space free space sections are within (log2 of
+     * actual value)
      */
     UINT16ENCODE(image, fspace->max_sect_addr);
 
@@ -808,7 +808,7 @@ H5FS__cache_hdr_notify(H5AC_notify_action_t action, void *_thing)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
-    
+
     /* Sanity check */
     HDassert(fspace);
 
@@ -893,7 +893,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5FS__cache_sinfo_get_initial_load_size()
  *
- * Purpose:	Compute the size of the on disk image of the free space 
+ * Purpose:	Compute the size of the on disk image of the free space
  *		manager section info, and place this value in *image_len.
  *
  * Return:	Success:	SUCCEED
@@ -904,7 +904,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5FS__cache_sinfo_get_initial_load_size(void  *_udata, size_t *image_len)
 {
     const H5FS_t *fspace;        			/* free space manager */
@@ -1108,7 +1108,7 @@ H5FS__cache_sinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l
     UINT32DECODE(chksum_image, stored_chksum);
 
     /* Sanity check */
-    HDassert((image == chksum_image) || 
+    HDassert((image == chksum_image) ||
              ((size_t)((image - (const uint8_t *)_image) + (chksum_image - image))  == old_sect_size));
 
     /* Set return value */
@@ -1163,9 +1163,9 @@ H5FS__cache_sinfo_image_len(const void *_thing, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:	H5FS__cache_sinfo_pre_serialize
  *
- * Purpose:	The objective of this function is to test to see if file space 
- *		for the section info is located in temporary (AKA imaginary) file 
- *		space.  If it is, relocate file space for the section info to 
+ * Purpose:	The objective of this function is to test to see if file space
+ *		for the section info is located in temporary (AKA imaginary) file
+ *		space.  If it is, relocate file space for the section info to
  *		regular file space.
  *
  * Return:	Success:	SUCCEED
@@ -1176,9 +1176,9 @@ H5FS__cache_sinfo_image_len(const void *_thing, size_t *image_len)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5FS__cache_sinfo_pre_serialize(H5F_t *f, void *_thing, haddr_t addr,
-    size_t H5_ATTR_NDEBUG_UNUSED len, haddr_t *new_addr, size_t H5_ATTR_NDEBUG_UNUSED *new_len, 
+    size_t H5_ATTR_NDEBUG_UNUSED len, haddr_t *new_addr, size_t H5_ATTR_NDEBUG_UNUSED *new_len,
     unsigned *flags)
 {
     H5FS_sinfo_t 	*sinfo = (H5FS_sinfo_t *)_thing;        /* Pointer to the object */
@@ -1249,8 +1249,8 @@ done:
  * Function:	H5FS__cache_sinfo_serialize
  *
  * Purpose:	Given an instance of H5FS_sinfo_t and a suitably sized buffer,
- *		serialize the contents of the instance of H5FS_sinfo_t and write 
- *		its contents to the buffer.  This buffer will be used to write 
+ *		serialize the contents of the instance of H5FS_sinfo_t and write
+ *		its contents to the buffer.  This buffer will be used to write
  *		the image of the instance to file.
  *
  * Return:	Success:	SUCCEED
@@ -1261,7 +1261,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5FS__cache_sinfo_serialize(const H5F_t *f, void *_image, size_t len,
     void *_thing)
 {
@@ -1348,7 +1348,7 @@ H5FS__cache_sinfo_notify(H5AC_notify_action_t action, void *_thing)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_PACKAGE
-    
+
     /* Sanity check */
     HDassert(sinfo);
 
@@ -1396,7 +1396,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5FS__cache_sinfo_free_icr
  *
- * Purpose:	Free the memory used for the in core representation of the 
+ * Purpose:	Free the memory used for the in core representation of the
  *		free space manager section info.
  *
  * Note:	The metadata cache sets the object's cache_info.magic to
@@ -1411,7 +1411,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5FS__cache_sinfo_free_icr(void *_thing)
 {
     H5FS_sinfo_t        *sinfo = (H5FS_sinfo_t *)_thing;    /* Pointer to the object */
diff --git a/src/H5FSint.c b/src/H5FSint.c
index 264950d..6ba5748 100644
--- a/src/H5FSint.c
+++ b/src/H5FSint.c
@@ -121,7 +121,7 @@ H5FS__create_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
-    
+
     /* Sanity check */
     HDassert(parent_entry);
     HDassert(child_entry);
@@ -153,7 +153,7 @@ H5FS__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
-    
+
     /* Sanity check */
     HDassert(parent_entry);
     HDassert(child_entry);
@@ -161,7 +161,7 @@ H5FS__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry)
     /* Destroy a flush dependency between parent and child entry */
     if(H5AC_destroy_flush_dependency(parent_entry, child_entry) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency")
-        
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 }   /* end H5FS__destroy_flush_depend() */
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index df67bd9..047657e 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -307,9 +307,9 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
  * Purpose:     Release the section info, either giving ownership back to
  *              the cache or letting the free space header keep it.
  *
- *              Add the fix in this routine to resolve the potential infinite loop 
- *              problem when allocating file space for the meta data of the 
- *              self-referential free-space managers at file closing. 
+ *              Add the fix in this routine to resolve the potential infinite loop
+ *              problem when allocating file space for the meta data of the
+ *              self-referential free-space managers at file closing.
  *
  *              On file close or flushing, when the section info is modified
  *              and protected/unprotected, does not allow the section info size
@@ -317,8 +317,8 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n"
  *              --if the current allocated section info size in fspace->sect_size is
  *                larger than the previous section info size in fpsace->alloc_sect_size,
  *                 release the section info
- *              --Otherwise, set the fspace->sect_size to be the same as 
- *                fpsace->alloc_sect_size.  This means fspace->sect_size may be larger 
+ *              --Otherwise, set the fspace->sect_size to be the same as
+ *                fpsace->alloc_sect_size.  This means fspace->sect_size may be larger
  *                than what is actually needed.
  *
  * Return:      SUCCEED/FAIL
@@ -439,7 +439,7 @@ HDfprintf(stderr, "%s: Relinquishing section info ownership\n", FUNC);
                 /* Check if we need to release section info in the file */
                 if(H5F_addr_defined(fspace->sect_addr)) {
                     /* Set flag to release section info space in file */
-                    /* On file close or flushing, only need to release section info with size 
+                    /* On file close or flushing, only need to release section info with size
                        bigger than previous section */
                     if(f->shared->closing || flush_in_progress) {
                         if(fspace->sect_size > fspace->alloc_sect_size)
@@ -1248,7 +1248,7 @@ H5FS__sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
 
                         /* Retarget section pointer to 'less than' node that was merged into */
                         *sect = tmp_sect;
-			if(*sect == NULL) 
+			if(*sect == NULL)
 			    HGOTO_DONE(ret_value);
 
                         /* Indicate successful merge occurred */
@@ -1293,7 +1293,7 @@ H5FS__sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
                             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
 
                         /* It's possible that the merge caused the section to be deleted (particularly in the paged allocation case) */
-                        if(*sect == NULL) 
+                        if(*sect == NULL)
                             HGOTO_DONE(ret_value);
 
                         /* Indicate successful merge occurred */
@@ -2457,22 +2457,22 @@ done:
  *              The previous hack in this routine to avoid the potential infinite
  *              loops by allocating file space directly from the end of the file
  *              is removed.  The allocation can now be done via the usual
- *              file space allocation call H5MF_alloc().  
+ *              file space allocation call H5MF_alloc().
  *
- *              The design flaw is addressed by not allowing the size 
- *              of section info to shrink.  This means, when trying to allocate 
- *              section info size X via H5MF_alloc() and the section info size 
+ *              The design flaw is addressed by not allowing the size
+ *              of section info to shrink.  This means, when trying to allocate
+ *              section info size X via H5MF_alloc() and the section info size
  *              after H5MF_alloc() changes to Y:
- *              --if Y is larger than X, free the just allocated file space X 
+ *              --if Y is larger than X, free the just allocated file space X
  *                via H5MF_xfree() and set fspace->sect_size to Y.
- *                This routine will be called again later from 
- *                H5MF_settle_meta_data_fsm() to allocate section info with the 
+ *                This routine will be called again later from
+ *                H5MF_settle_meta_data_fsm() to allocate section info with the
  *                larger fpsace->sect_size Y.
- *              --if Y is smaller than X, no further allocation is needed and 
+ *              --if Y is smaller than X, no further allocation is needed and
  *                fspace->sect_size and fspace->alloc_sect_size are set to X.
  *                This means fspace->sect_size may be larger than what is
  *                actually needed.
- *                
+ *
  *              This routine also re-inserts the header and section info in the
  *              metadata cache with this allocation.
  *
@@ -2510,7 +2510,7 @@ H5FS_vfd_alloc_hdr_and_section_info_if_needed(H5F_t *f, H5FS_t *fspace,
     HDassert(f->shared->fs_persist);
 
     /* At present, all free space strategies enable the free space managers.
-     * This will probably change -- at which point this assertion should 
+     * This will probably change -- at which point this assertion should
      * be revisited.
      */
     /* Updated: Only the following two strategies enable the free-space managers */
diff --git a/src/H5Fefc.c b/src/H5Fefc.c
index 264a623..77d29f5 100644
--- a/src/H5Fefc.c
+++ b/src/H5Fefc.c
@@ -895,7 +895,7 @@ H5F__efc_try_close(H5F_t *f)
         HGOTO_DONE(SUCCEED)
 
     /* If the file EFC were locked, that should always mean that there exists
-     * a reference to this file that is not in an EFC (it may have just been 
+     * a reference to this file that is not in an EFC (it may have just been
      * removed from an EFC), and should have been caught by the above check */
     /* If we get here then we must be beginning a new run.  Make sure that the
      * temporary variables in f->shared->efc are at the default value */
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index b85305e..46185ff 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -80,17 +80,17 @@
         + 1) /* superblock version */
 
 /* The H5F_SUPERBLOCK_MINIMAL_VARLEN_SIZE is the minimal amount of super block
- * variable length data guarnateed to load the sizeof offsets and the sizeof 
+ * variable length data guarnateed to load the sizeof offsets and the sizeof
  * lengths fields in all versions of the superblock.
  *
- * This is necessary in the V3 cache, as on the initial load, we need to 
+ * This is necessary in the V3 cache, as on the initial load, we need to
  * get enough of the superblock to determine its version and size so that
- * the metadata cache can load the correct amount of data from file to 
+ * the metadata cache can load the correct amount of data from file to
  * allow the second deserialization attempt to succeed.
  *
- * The value selected will have to be revisited for each new version 
+ * The value selected will have to be revisited for each new version
  * of the super block.  Note that the current value is one byte larger
- * than it needs to be. 
+ * than it needs to be.
  */
 #define H5F_SUPERBLOCK_MINIMAL_VARLEN_SIZE	7
 
@@ -166,8 +166,8 @@ typedef struct H5F_superblock_cache_ud_t {
     unsigned btree_k[H5B_NUM_BTREE_ID]; /* B-tree key values for each type */
     haddr_t stored_eof;     /* End-of-file in file */
     hbool_t drvrinfo_removed; /* Indicate if the driver info was removed */
-    unsigned    super_vers;   /* Superblock version obtained in get_load_size callback. 
-			       * It will be used later in verify_chksum callback 
+    unsigned    super_vers;   /* Superblock version obtained in get_load_size callback.
+			       * It will be used later in verify_chksum callback
 			       */
 } H5F_superblock_cache_ud_t;
 
@@ -242,16 +242,16 @@ typedef struct H5F_super_t {
 struct H5F_shared_t {
     H5FD_t	*lf; 		/* Lower level file handle for I/O	*/
     H5F_super_t *sblock;        /* Pointer to (pinned) superblock for file */
-    H5O_drvinfo_t *drvinfo;	/* Pointer to the (pinned) driver info 
+    H5O_drvinfo_t *drvinfo;	/* Pointer to the (pinned) driver info
                                  * cache entry.  This field is only defined
                                  * for older versions of the super block,
                                  * and then only when a driver information
                                  * block is present.  At all other times
                                  * it should be NULL.
                                  */
-    hbool_t drvinfo_sb_msg_exists;  /* Convenience field used to track 
-                                     * whether the driver info superblock 
-                                     * extension message has been created 
+    hbool_t drvinfo_sb_msg_exists;  /* Convenience field used to track
+                                     * whether the driver info superblock
+                                     * extension message has been created
                                      * yet. This field should be TRUE iff the
                                      * superblock extension exists and contains
                                      * a driver info message.  Under all other
@@ -278,7 +278,7 @@ struct H5F_shared_t {
                                 /* metadata cache.  This structure is   */
                                 /* fixed at creation time and should    */
                                 /* not change thereafter.               */
-    H5AC_cache_image_config_t 
+    H5AC_cache_image_config_t
 		mdc_initCacheImageCfg;  /* initial configuration for the */
                                         /* generate metadata cache image on     */
                                         /* close option.  This structure is     */
@@ -318,7 +318,7 @@ struct H5F_shared_t {
     hsize_t     fs_threshold;	/* Free space section threshold 	*/
     hbool_t     fs_persist;     /* Free-space persist or not */
     unsigned    fs_version;     /* Free-space version: */
-                                /* It is used to update fsinfo message in the superblock 
+                                /* It is used to update fsinfo message in the superblock
                                    extension when closing down the free-space managers */
     hbool_t     use_tmp_space;  /* Whether temp. file space allocation is allowed */
     haddr_t	tmp_addr;       /* Next address to use for temp. space in the file */
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index f8a40b2..119548c 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -268,7 +268,7 @@ H5F__drvrinfo_prefix_decode(H5O_drvinfo_t *drvrinfo, char *drv_name,
     UINT32DECODE(image, drvrinfo->len);
 
     /* Driver name and/or version */
-    if(drv_name) { 
+    if(drv_name) {
         H5MM_memcpy(drv_name, (const char *)image, (size_t)8);
         drv_name[8] = '\0';
         image += 8; /* advance past name/version */
@@ -369,7 +369,7 @@ H5F__cache_superblock_get_final_load_size(const void *_image, size_t H5_ATTR_NDE
     udata->super_vers = sblock.super_vers;
 
     /* Set the final size for the cache image */
-    *actual_len = H5F_SUPERBLOCK_FIXED_SIZE + 
+    *actual_len = H5F_SUPERBLOCK_FIXED_SIZE +
             (size_t)H5F_SUPERBLOCK_VARLEN_SIZE(sblock.super_vers, sblock.sizeof_addr, sblock.sizeof_size);
 
 done:
@@ -380,7 +380,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5F__cache_superblock_verify_chksum
  *
- * Purpose:	Verify the computed checksum of the data structure is the 
+ * Purpose:	Verify the computed checksum of the data structure is the
  *		same as the stored chksum.
  *
  * Return:      Success:        TRUE/FALSE
@@ -584,14 +584,14 @@ H5F__cache_superblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUS
 	H5F_addr_decode(udata->f, (const uint8_t **)&image, &udata->stored_eof/*out*/);
 	H5F_addr_decode(udata->f, (const uint8_t **)&image, &sblock->root_addr/*out*/);
 
-	/* checksum verification already done in verify_chksum cb */		
+	/* checksum verification already done in verify_chksum cb */
 
 	/* Decode checksum */
 	UINT32DECODE(image, read_chksum);
 
 	/* The Driver Information Block may not appear with the version
-	 * 2 super block.  Thus we set the driver_addr field of the in 
-         * core representation of the super block HADDR_UNDEF to prevent 
+	 * 2 super block.  Thus we set the driver_addr field of the in
+         * core representation of the super block HADDR_UNDEF to prevent
          * any attempt to load the Driver Information Block.
 	 */
 	sblock->driver_addr = HADDR_UNDEF;
@@ -675,11 +675,11 @@ H5F__cache_superblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNU
     HDassert(image);
     HDassert(sblock);
 
-    /* Assert that the superblock is marked as being flushed last (and 
+    /* Assert that the superblock is marked as being flushed last (and
        collectively in parallel) */
     /* (We'll rely on the cache to make sure it actually *is* flushed
        last (and collectively in parallel), but this check doesn't hurt) */
-    HDassert(sblock->cache_info.flush_me_last);    
+    HDassert(sblock->cache_info.flush_me_last);
 
     /* Encode the common portion of the file superblock for all versions */
     H5MM_memcpy(image, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN);
diff --git a/src/H5G.c b/src/H5G.c
index a766e8a..bcc33bb 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -782,7 +782,7 @@ H5Gflush(hid_t group_id)
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", group_id);
-    
+
     /* Check args */
     if(NULL == (vol_obj = (H5VL_object_t *)H5I_object_verify(group_id, H5I_GROUP)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group ID")
diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index 0ffdc53..13a33a3 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -114,7 +114,7 @@ H5FL_SEQ_EXTERN(H5G_entry_t);
 /*-------------------------------------------------------------------------
  * Function:    H5G__cache_node_get_initial_load_size()
  *
- * Purpose:	Determine the size of the on-disk image of the node, and 
+ * Purpose:	Determine the size of the on-disk image of the node, and
  *		return this value in *image_len.
  *
  * Return:      Success:        SUCCEED
@@ -150,10 +150,10 @@ H5G__cache_node_get_initial_load_size(void *_udata, size_t *image_len)
  *		node, allocate an instance of H5G_node_t, load the contence of the
  *		image into it, and return a pointer to the instance.
  *
- *		Note that deserializing the image requires access to the file 
- *		pointer, which is not included in the parameter list for this 
- *		callback.  Finesse this issue by passing in the file pointer 
- *		twice to the H5AC_protect() call -- once as the file pointer 
+ *		Note that deserializing the image requires access to the file
+ *		pointer, which is not included in the parameter list for this
+ *		callback.  Finesse this issue by passing in the file pointer
+ *		twice to the H5AC_protect() call -- once as the file pointer
  *		proper, and again as the user data
  *
  * Return:      Success:        Pointer to in core representation
diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c
index 7e2b324..1a76012 100644
--- a/src/H5Gcompact.c
+++ b/src/H5Gcompact.c
@@ -60,7 +60,7 @@ typedef struct {
 
 /* PRIVATE PROTOTYPES */
 static herr_t H5G__compact_build_table_cb(const void *_mesg, unsigned idx, void *_udata);
-static herr_t H5G__compact_build_table(const H5O_loc_t *oloc, 
+static herr_t H5G__compact_build_table(const H5O_loc_t *oloc,
     const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
     H5G_link_table_t *ltable);
 static herr_t H5G__compact_lookup_cb(const void *_mesg, unsigned H5_ATTR_UNUSED idx, void *_udata);
diff --git a/src/H5Gint.c b/src/H5Gint.c
index a3849a6..0f9f9cb 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -496,9 +496,9 @@ H5G_close(H5G_t *grp)
 
         /* Evict group metadata if evicting on close */
         if(!file_closed && H5F_SHARED(grp->oloc.file) && H5F_EVICT_ON_CLOSE(grp->oloc.file)) {
-            if(H5AC_flush_tagged_metadata(grp->oloc.file, grp->oloc.addr) < 0) 
+            if(H5AC_flush_tagged_metadata(grp->oloc.file, grp->oloc.addr) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
-            if(H5AC_evict_tagged_metadata(grp->oloc.file, grp->oloc.addr, FALSE) < 0) 
+            if(H5AC_evict_tagged_metadata(grp->oloc.file, grp->oloc.addr, FALSE) < 0)
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to evict tagged metadata")
         } /* end if */
 
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 35b90f3..9faa0b5 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -538,7 +538,7 @@ H5G_node_found(H5F_t *f, haddr_t addr, const void H5_ATTR_UNUSED *_lt_key,
     rt = sn->nsyms;
     while(lt < rt && cmp) {
         idx = (lt + rt) / 2;
-        
+
         if((s = (const char *)H5HL_offset_into(udata->common.heap, sn->entry[idx].name_off)) == NULL)
             HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get symbol table name")
         cmp = HDstrcmp(udata->common.name, s);
@@ -1449,7 +1449,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5G__node_iterate_size(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key, 
+H5G__node_iterate_size(H5F_t *f, const void H5_ATTR_UNUSED *_lt_key,
     haddr_t H5_ATTR_UNUSED addr, const void H5_ATTR_UNUSED *_rt_key, void *_udata)
 {
     hsize_t     *stab_size = (hsize_t *)_udata;         /* User data */
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index 6dc025c..8ad03d0 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -372,7 +372,7 @@ H5_DLL ssize_t H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t
     hsize_t n, char* name, size_t size);
 H5_DLL herr_t H5G__stab_remove(const H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r,
     const char *name);
-H5_DLL herr_t H5G__stab_remove_by_idx(const H5O_loc_t *oloc, 
+H5_DLL herr_t H5G__stab_remove_by_idx(const H5O_loc_t *oloc,
     H5RS_str_t *grp_full_path_r, H5_iter_order_t order, hsize_t n);
 H5_DLL herr_t H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name,
     H5O_link_t *lnk);
@@ -434,7 +434,7 @@ H5_DLL ssize_t H5G__compact_get_name_by_idx(const H5O_loc_t *oloc,
     hsize_t idx, char *name, size_t size);
 H5_DLL herr_t H5G__compact_remove(const H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r,
     const char *name);
-H5_DLL herr_t H5G__compact_remove_by_idx(const H5O_loc_t *oloc, 
+H5_DLL herr_t H5G__compact_remove_by_idx(const H5O_loc_t *oloc,
     const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
     H5_iter_order_t order, hsize_t n);
 H5_DLL herr_t H5G__compact_iterate(const H5O_loc_t *oloc,
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 19b120c..501c883 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -216,7 +216,7 @@ H5_DLL herr_t H5G_iterate(H5G_loc_t *loc, const char *group_name,
 H5_DLL herr_t H5G_visit(H5G_loc_t *loc, const char *group_name,
     H5_index_t idx_type, H5_iter_order_t order, H5L_iterate2_t op, void *op_data);
 
-/* 
+/*
  * Functions that understand links in groups
  */
 H5_DLL herr_t H5G_link_to_info(const struct H5O_loc_t *link_loc, const struct H5O_link_t *lnk, H5L_info2_t *linfo);
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index 0f27880..5a4380d 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -843,9 +843,9 @@ H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traver
 
     /* Set up invalid tag. This is a precautionary step only. Setting an invalid
      * tag here will ensure that no metadata accessed while doing the traversal
-     * is given an improper tag, unless another one is specifically set up 
-     * first. This will ensure we're not accidentally tagging something we 
-     * shouldn't be during the traversal. Note that for best tagging assertion 
+     * is given an improper tag, unless another one is specifically set up
+     * first. This will ensure we're not accidentally tagging something we
+     * shouldn't be during the traversal. Note that for best tagging assertion
      * coverage, setting H5C_DO_TAGGING_SANITY_CHECKS is advised.
      */
     H5_BEGIN_TAG(H5AC__INVALID_TAG);
diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c
index 5807c56..479c2bd 100644
--- a/src/H5HFbtree2.c
+++ b/src/H5HFbtree2.c
@@ -360,7 +360,7 @@ H5HF__huge_bt2_indir_compare(const void *_rec1, const void *_rec2, int *result)
 {
     FUNC_ENTER_STATIC_NOERR
 
-    *result = (int)(((const H5HF_huge_bt2_indir_rec_t *)_rec1)->id - 
+    *result = (int)(((const H5HF_huge_bt2_indir_rec_t *)_rec1)->id -
                     ((const H5HF_huge_bt2_indir_rec_t *)_rec2)->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
@@ -563,7 +563,7 @@ H5HF__huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2, int *res
 {
     FUNC_ENTER_STATIC_NOERR
 
-    *result = (int)(((const H5HF_huge_bt2_filt_indir_rec_t *)_rec1)->id - 
+    *result = (int)(((const H5HF_huge_bt2_filt_indir_rec_t *)_rec1)->id -
                     ((const H5HF_huge_bt2_filt_indir_rec_t *)_rec2)->id);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 4a2ff91..8dbdf25 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -77,35 +77,35 @@ static herr_t H5HF__cache_hdr_get_final_load_size(const void *image_ptr,
     size_t image_len, void *udata, size_t *actual_len);
 static htri_t H5HF__cache_hdr_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5HF__cache_hdr_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5HF__cache_hdr_image_len(const void *thing, size_t *image_len);
 static herr_t H5HF__cache_hdr_pre_serialize(H5F_t *f, void *thing, haddr_t addr,
-    size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); 
+    size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags);
 static herr_t H5HF__cache_hdr_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
+    size_t len, void *thing);
 static herr_t H5HF__cache_hdr_free_icr(void *thing);
 
 static herr_t H5HF__cache_iblock_get_initial_load_size(void *udata, size_t *image_len);
 static htri_t H5HF__cache_iblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5HF__cache_iblock_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5HF__cache_iblock_image_len(const void *thing, size_t *image_len);
 static herr_t H5HF__cache_iblock_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); 
+    haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags);
 static herr_t H5HF__cache_iblock_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
-static herr_t H5HF__cache_iblock_notify(H5AC_notify_action_t action, void *thing); 
+    size_t len, void *thing);
+static herr_t H5HF__cache_iblock_notify(H5AC_notify_action_t action, void *thing);
 static herr_t H5HF__cache_iblock_free_icr(void *thing);
 
 static herr_t H5HF__cache_dblock_get_initial_load_size(void *udata, size_t *image_len);
 static htri_t H5HF__cache_dblock_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5HF__cache_dblock_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5HF__cache_dblock_image_len(const void *thing, size_t *image_len);
 static herr_t H5HF__cache_dblock_pre_serialize(H5F_t *f, void *thing, haddr_t addr,
-    size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags); 
+    size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags);
 static herr_t H5HF__cache_dblock_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
+    size_t len, void *thing);
 static herr_t H5HF__cache_dblock_notify(H5AC_notify_action_t action, void *thing);
 static herr_t H5HF__cache_dblock_free_icr(void *thing);
 static herr_t H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size);
@@ -114,14 +114,14 @@ static herr_t H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
 #ifndef NDEBUG
 static herr_t H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
     hbool_t *fd_clean, hbool_t *clean);
-static herr_t H5HF__cache_verify_iblock_descendants_clean(H5F_t *f, 
+static herr_t H5HF__cache_verify_iblock_descendants_clean(H5F_t *f,
     haddr_t fd_parent_addr, H5HF_indirect_t *iblock, unsigned *iblock_status,
     hbool_t *fd_clean, hbool_t *clean);
-static herr_t H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f, 
-    haddr_t fd_parent_addr, H5HF_indirect_t *iblock, hbool_t *fd_clean, 
+static herr_t H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f,
+    haddr_t fd_parent_addr, H5HF_indirect_t *iblock, hbool_t *fd_clean,
     hbool_t *clean, hbool_t *has_dblocks);
-static herr_t H5HF__cache_verify_descendant_iblocks_clean(H5F_t *f, 
-    haddr_t fd_parent_addr, H5HF_indirect_t *iblock, 
+static herr_t H5HF__cache_verify_descendant_iblocks_clean(H5F_t *f,
+    haddr_t fd_parent_addr, H5HF_indirect_t *iblock,
     hbool_t *fd_clean, hbool_t *clean, hbool_t *has_iblocks);
 #endif /* NDEBUG */
 
@@ -212,7 +212,7 @@ H5FL_BLK_DEFINE(direct_block);
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__hdr_prefix_decode(H5HF_hdr_t *hdr, const uint8_t **image_ref)
 {
     const uint8_t *image = *image_ref;  /* Pointer into into supplied image */
@@ -351,8 +351,8 @@ H5HF__dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable)
  * Purpose:	Determine the size of the fractal heap header on disk,
  *		and set *image_len to this value.
  *
- *		Note also that the value returned by this function presumes that 
- *		there is no I/O filtering data in the header.  If there is, the 
+ *		Note also that the value returned by this function presumes that
+ *		there is no I/O filtering data in the header.  If there is, the
  *		size reported will be too small, and H5C_load_entry()
  *		will have to make two tries to load the fractal heap header.
  *
@@ -364,7 +364,7 @@ H5HF__dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_hdr_get_initial_load_size(void *_udata, size_t *image_len)
 {
     H5HF_hdr_cache_ud_t *udata = (H5HF_hdr_cache_ud_t *)_udata; /* Pointer to user data */
@@ -402,7 +402,7 @@ H5HF__cache_hdr_get_initial_load_size(void *_udata, size_t *image_len)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_hdr_get_final_load_size(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED image_len,
     void *_udata, size_t *actual_len)
 {
@@ -609,11 +609,11 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_hdr_image_len
  *
- * Purpose:	Return the actual size of the fractal heap header on 
- *		disk image.  
+ * Purpose:	Return the actual size of the fractal heap header on
+ *		disk image.
  *
- *		If the header contains filter information, this size will be 
- *		larger than the value returned by H5HF__cache_hdr_get_initial_load_size().  
+ *		If the header contains filter information, this size will be
+ *		larger than the value returned by H5HF__cache_hdr_get_initial_load_size().
  *
  * Return:	Success:	SUCCEED
  *		Failure:	FAIL
@@ -623,7 +623,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_hdr_image_len(const void *_thing, size_t *image_len)
 {
     const H5HF_hdr_t  *hdr = (const H5HF_hdr_t *)_thing;    /* Fractal heap info */
@@ -645,13 +645,13 @@ H5HF__cache_hdr_image_len(const void *_thing, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_hdr_pre_serialize
  *
- * Purpose:	As best I can tell, fractal heap header blocks are always 
+ * Purpose:	As best I can tell, fractal heap header blocks are always
  *		allocated in real file space.  Thus this routine simply verifies
  *		this, verifies that the len parameter contains the expected
  *		value, and returns an error if either of these checks fail.
  *
  *		When compiled in debug mode, the function also verifies that all
- *		indirect and direct blocks that are children of the header are 
+ *		indirect and direct blocks that are children of the header are
  *		either clean, or not in the metadata cache.
  *
  * Return:	Success:	SUCCEED
@@ -662,7 +662,7 @@ H5HF__cache_hdr_image_len(const void *_thing, size_t *image_len)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_hdr_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t len,
     haddr_t H5_ATTR_UNUSED *new_addr, size_t H5_ATTR_UNUSED *new_len,
     unsigned *flags)
@@ -706,8 +706,8 @@ H5HF__cache_hdr_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t len,
      * is made during a cache serialization instead of an entry or cache
      * flush.
      *
-     * Note also that with the recent change in the definition of flush 
-     * dependency, not all descendants need be clean -- only direct flush 
+     * Note also that with the recent change in the definition of flush
+     * dependency, not all descendants need be clean -- only direct flush
      * dependency children.
      *
      * Finally, observe that the H5HF__cache_verify_hdr_descendants_clean()
@@ -736,7 +736,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_hdr_serialize
  *
- * Purpose:	Construct the on disk image of the header, and place it in 
+ * Purpose:	Construct the on disk image of the header, and place it in
  *		the buffer pointed to by image.  Return SUCCEED on success,
  *		and FAIL on failure.
  *
@@ -748,7 +748,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len,
     void *_thing)
 {
@@ -846,7 +846,7 @@ done:
  *
  * Purpose:	Free the in core representation of the fractal heap header.
  *
- *		This routine frees just the header itself, not the 
+ *		This routine frees just the header itself, not the
  *		associated version 2 B-Tree, the associated Free Space Manager,
  *		nor the indirect/direct block tree that is rooted in the header.
  *
@@ -865,7 +865,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_hdr_free_icr(void *_thing)
 {
     H5HF_hdr_t *hdr = (H5HF_hdr_t *)_thing;     /* Fractal heap info */
@@ -890,7 +890,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_iblock_get_initial_load_size()
  *
- * Purpose:	Compute the size of the on disk image of the indirect 
+ * Purpose:	Compute the size of the on disk image of the indirect
  *		block, and place this value in *image_len.
  *
  * Return:	Success:	SUCCEED
@@ -901,7 +901,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_iblock_get_initial_load_size(void *_udata, size_t *image_len)
 {
     H5HF_iblock_cache_ud_t *udata = (H5HF_iblock_cache_ud_t *)_udata;   /* User data for callback */
@@ -913,7 +913,7 @@ H5HF__cache_iblock_get_initial_load_size(void *_udata, size_t *image_len)
     HDassert(udata->par_info);
     HDassert(udata->par_info->hdr);
     HDassert(image_len);
-   
+
     /* Set the image length size */
     *image_len = (size_t)H5HF_MAN_INDIRECT_SIZE(udata->par_info->hdr, *udata->nrows);
 
@@ -961,9 +961,9 @@ H5HF__cache_iblock_verify_chksum(const void *_image, size_t len, void H5_ATTR_UN
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_iblock_deserialize
  *
- * Purpose:	Given a buffer containing the on disk image of the indirect 
- *		block, allocate an instance of H5HF_indirect_t, load the data 
- *		in the buffer into this new instance, and return a pointer to 
+ * Purpose:	Given a buffer containing the on disk image of the indirect
+ *		block, allocate an instance of H5HF_indirect_t, load the data
+ *		in the buffer into this new instance, and return a pointer to
  *		it.
  *
  *		As best I can tell, the size of the indirect block image is fully
@@ -979,7 +979,7 @@ H5HF__cache_iblock_verify_chksum(const void *_image, size_t len, void H5_ATTR_UN
  *-------------------------------------------------------------------------
  */
 static void *
-H5HF__cache_iblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, 
+H5HF__cache_iblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len,
     void *_udata, hbool_t H5_ATTR_UNUSED *dirty)
 {
     H5HF_hdr_t          *hdr;           /* Shared fractal heap information */
@@ -1164,7 +1164,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_iblock_image_len(const void *_thing, size_t *image_len)
 {
     const H5HF_indirect_t *iblock = (const H5HF_indirect_t *)_thing;    /* Indirect block info */
@@ -1188,11 +1188,11 @@ H5HF__cache_iblock_image_len(const void *_thing, size_t *image_len)
  *
  * Purpose:	The primary objective of this function is to determine if the
  *		indirect block is currently allocated in temporary file space,
- *		and if so, to move it to real file space before the entry is 
+ *		and if so, to move it to real file space before the entry is
  *		serialized.
  *
- *		In debug compiles, this function also verifies that all 
- *		immediate flush dependency children of this indirect block 
+ *		In debug compiles, this function also verifies that all
+ *		immediate flush dependency children of this indirect block
  *		are either clean or are not in cache.
  *
  * Return:	Success:	SUCCEED
@@ -1203,7 +1203,7 @@ H5HF__cache_iblock_image_len(const void *_thing, size_t *image_len)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_iblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr,
     size_t H5_ATTR_UNUSED len, haddr_t *new_addr, size_t H5_ATTR_UNUSED *new_len,
     unsigned *flags)
@@ -1237,7 +1237,7 @@ H5HF__cache_iblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr,
     unsigned 		 iblock_status = 0;
 
     /* verify that flush dependencies are working correctly.  Do this
-     * by verifying that all immediate flush dependency children of this 
+     * by verifying that all immediate flush dependency children of this
      * iblock are clean.
      */
     if(H5AC_get_entry_status(f, iblock->addr, &iblock_status) < 0)
@@ -1254,7 +1254,7 @@ H5HF__cache_iblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr,
 }
 #endif /* NDEBUG */
 
-    /* Check to see if we must re-allocate the iblock from temporary to 
+    /* Check to see if we must re-allocate the iblock from temporary to
      * normal (AKA real) file space.
      */
     if(H5F_IS_TMP_ADDR(f, addr)) {
@@ -1302,7 +1302,7 @@ H5HF__cache_iblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr,
 	*new_addr = iblock_addr;
         *flags = H5AC__SERIALIZE_MOVED_FLAG;
     } /* end if */
-    else 
+    else
 	*flags = 0;
 
 done:
@@ -1313,8 +1313,8 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_iblock_serialize
  *
- * Purpose:	Given a pointer to an iblock, and a pointer to a buffer of 
- *		the appropriate size, write the contents of the iblock to the 
+ * Purpose:	Given a pointer to an iblock, and a pointer to a buffer of
+ *		the appropriate size, write the contents of the iblock to the
  *		buffer in format appropriate for writing to disk.
  *
  * Return:	Success:	SUCCEED
@@ -1325,7 +1325,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_UNUSED len,
     void *_thing)
 {
@@ -1390,7 +1390,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
                 /* (either both the address & size are defined or both are
                  *  not defined)
                  */
-                HDassert((H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size) 
+                HDassert((H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size)
                         || (!H5F_addr_defined(iblock->ents[u].addr) && iblock->filt_ents[u].size == 0));
 
                 /* Size of filtered direct block */
@@ -1431,11 +1431,11 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_iblock_notify
  *
- * Purpose:	This function is used to create and destroy flush dependency 
+ * Purpose:	This function is used to create and destroy flush dependency
  *		relationships between iblocks and their parents as indirect blocks
  *		are loaded / inserted and evicted from the metadata cache.
  *
- *		In general, the parent will be another iblock, but it may be the 
+ *		In general, the parent will be another iblock, but it may be the
  *		header if the iblock in question is the root iblock.
  *
  * Return:	Success:	SUCCEED
@@ -1446,7 +1446,7 @@ H5HF__cache_iblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_iblock_notify(H5AC_notify_action_t action, void *_thing)
 {
     H5HF_indirect_t     *iblock = (H5HF_indirect_t *)_thing;    /* Indirect block info */
@@ -1528,7 +1528,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_iblock_free_icr
  *
- * Purpose:	Unlink the supplied instance of H5HF_indirect_t from the 
+ * Purpose:	Unlink the supplied instance of H5HF_indirect_t from the
  *		fractal heap and free its memory.
  *
  * Note:	The metadata cache sets the object's cache_info.magic to
@@ -1543,7 +1543,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_iblock_free_icr(void *thing)
 {
     H5HF_indirect_t	*iblock = (H5HF_indirect_t *)thing;     /* Fractal heap indirect block to free */
@@ -1570,7 +1570,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_dblock_get_initial_load_size()
  *
- * Purpose:	Determine the size of the direct block on disk image, and 
+ * Purpose:	Determine the size of the direct block on disk image, and
  *		return it in *image_len.
  *
  * Return:	Success:	SUCCEED
@@ -1581,7 +1581,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len)
 {
     const H5HF_dblock_cache_ud_t *udata = (const H5HF_dblock_cache_ud_t *)_udata;    /* User data for callback */
@@ -1612,7 +1612,7 @@ H5HF__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len)
     }  /* end if */
     else
         *image_len = udata->dblock_size;
-    
+
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5HF__cache_dblock_get_initial_load_size() */
 
@@ -1668,7 +1668,7 @@ H5HF__cache_dblock_verify_chksum(const void *_image, size_t len, void *_udata)
         filter_cb.func = NULL;      /* no callback function when failed */
 
         /* Allocate buffer to perform I/O filtering on and copy image into
-         * it.  Must do this as H5Z_pipeline() may re-size the buffer 
+         * it.  Must do this as H5Z_pipeline() may re-size the buffer
          * provided to it.
          */
         if(NULL == (read_buf = H5MM_malloc(len)))
@@ -1801,7 +1801,7 @@ H5HF__cache_dblock_deserialize(const void *_image, size_t len, void *_udata,
     /* Check for I/O filters on this heap */
     if(hdr->filter_len > 0) {
         /* Direct block is already decompressed in verify_chksum callback */
-        if(udata->decompressed) { 
+        if(udata->decompressed) {
             /* Sanity check */
             HDassert(udata->dblk);
 
@@ -1822,7 +1822,7 @@ H5HF__cache_dblock_deserialize(const void *_image, size_t len, void *_udata,
             filter_cb.func = NULL;      /* no callback function when failed */
 
             /* Allocate buffer to perform I/O filtering on and copy image into
-             * it.  Must do this as H5Z_pipeline() may resize the buffer 
+             * it.  Must do this as H5Z_pipeline() may resize the buffer
              * provided to it.
              */
             if (NULL == (read_buf = H5MM_malloc(len)))
@@ -1926,7 +1926,7 @@ done:
  * Function:	H5HF__cache_dblock_image_len
  *
  * Purpose:	Report the actual size of the direct block image on disk.
- *		Note that this value will probably be incorrect if compression 
+ *		Note that this value will probably be incorrect if compression
  *		is enabled and the entry is dirty.
  *
  * Return:	Success:	SUCCEED
@@ -1937,7 +1937,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_dblock_image_len(const void *_thing, size_t *image_len)
 {
     const H5HF_direct_t    *dblock = (const H5HF_direct_t *)_thing;     /* Direct block info */
@@ -1958,32 +1958,32 @@ H5HF__cache_dblock_image_len(const void *_thing, size_t *image_len)
 
     /* Check for I/O filters on this heap */
     if(hdr->filter_len > 0) {
-        /* 
+        /*
          * If the data is available, set to the compressed
-         * size of the direct block -- otherwise set it equal to the 
-         * uncompressed size.  
+         * size of the direct block -- otherwise set it equal to the
+         * uncompressed size.
          *
          * We have three possible scenarios here.
          *
          * First, the block may never have been flushed.  In this
-         * case, both dblock->file_size and the size stored in the 
-         * parent (either the header or the parent iblock) will all 
-         * be zero.  In this case, return the uncompressed size 
+         * case, both dblock->file_size and the size stored in the
+         * parent (either the header or the parent iblock) will all
+         * be zero.  In this case, return the uncompressed size
          * stored in dblock->size as the size.
          *
          * Second, the block may have just been serialized, in which
-         * case, dblock->file_size should be zero, and the correct 
+         * case, dblock->file_size should be zero, and the correct
          * on disk size should be stored in the parent (again, either
          * the header or the parent iblock as case may be).
-         * 
-         * Third, we may be in the process of discarding this 
+         *
+         * Third, we may be in the process of discarding this
          * dblock without writing it.  In this case, dblock->file_size
-         * should be non-zero and have the correct size.  Note that 
+         * should be non-zero and have the correct size.  Note that
          * in this case, the direct block will have been detached,
          * and thus looking up the parent will likely return incorrect
          * data.
          */
-        if(dblock->file_size != 0) 
+        if(dblock->file_size != 0)
             size = dblock->file_size;
         else {
             const H5HF_indirect_t  *par_iblock = dblock->parent; /* Parent iblock */
@@ -2012,54 +2012,54 @@ H5HF__cache_dblock_image_len(const void *_thing, size_t *image_len)
  * Function:	H5HF__cache_dblock_pre_serialize
  *
  * Purpose:	In principle, the purpose of this function is to determine
- *		the size and location of the disk image of the target direct 
+ *		the size and location of the disk image of the target direct
  *		block.  In this case, the uncompressed size of the block is
- *		fixed, but since the direct block could be compressed, 
+ *		fixed, but since the direct block could be compressed,
  *		we may need to compute and report the compressed size.
  *
- *		This is a bit sticky in the case of a direct block when I/O 
+ *		This is a bit sticky in the case of a direct block when I/O
  *		filters are enabled, as the size of the compressed version
- *		of the on disk image is not known until the direct block has 
- *		been run through the filters.  Further, the location of the 
- *		on disk image may change if the compressed size of the image 
+ *		of the on disk image is not known until the direct block has
+ *		been run through the filters.  Further, the location of the
+ *		on disk image may change if the compressed size of the image
  *		changes as well.
  *
- *		To complicate matters further, the direct block may have been 
- *		initially allocated in temporary (AKA imaginary) file space. 
- *		In this case, we must relocate the direct block's on-disk 
- *		image to "real" file space regardless of whether it has changed 
+ *		To complicate matters further, the direct block may have been
+ *		initially allocated in temporary (AKA imaginary) file space.
+ *		In this case, we must relocate the direct block's on-disk
+ *		image to "real" file space regardless of whether it has changed
  *		size.
  *
- *		One simplifying factor is the direct block's "blk" field, 
+ *		One simplifying factor is the direct block's "blk" field,
  *		which contains a pointer to a buffer which (with the exception
- *		of a small header) contains the on disk image in uncompressed 
+ *		of a small header) contains the on disk image in uncompressed
  *		form.
  *
- *		To square this particular circle, this function does 
- *		everything the serialize function usually does, with the 
- *		exception of copying the image into the image buffer provided 
- *		to the serialize function by the metadata cache.  The data to 
+ *		To square this particular circle, this function does
+ *		everything the serialize function usually does, with the
+ *		exception of copying the image into the image buffer provided
+ *		to the serialize function by the metadata cache.  The data to
  *		copy is provided to the serialize function in a buffer pointed
  *		to by the write_buf field.
  *
- *		If I/O filters are enabled, on exit, 
- *		H5HF__cache_dblock_pre_serialize() sets the write_buf field to 
+ *		If I/O filters are enabled, on exit,
+ *		H5HF__cache_dblock_pre_serialize() sets the write_buf field to
  *		point to a buffer containing the filtered image of the direct
  *		block.  The serialize function should free this block, and set
- *		the write_buf field to NULL after copying it into the image 
+ *		the write_buf field to NULL after copying it into the image
  *		buffer provided by the metadata cache.
  *
- *		If I/O filters are not enabled, this function prepares 
- *		the buffer pointed to by the blk field for copying to the 
- *		image buffer provided by the metadata cache, and sets the 
- *		write_buf field equal to the blk field.  In this case, the 
- *		serialize function should simply set the write_buf field to 
- *		NULL after copying the direct block image into the image 
+ *		If I/O filters are not enabled, this function prepares
+ *		the buffer pointed to by the blk field for copying to the
+ *		image buffer provided by the metadata cache, and sets the
+ *		write_buf field equal to the blk field.  In this case, the
+ *		serialize function should simply set the write_buf field to
+ *		NULL after copying the direct block image into the image
  *		buffer.
  *
- *		In both of the above cases, the length of the buffer pointed 
- *		to by write_buf is provided in the write_len field.  This 
- *		field must contain 0 on entry to this function, and should 
+ *		In both of the above cases, the length of the buffer pointed
+ *		to by write_buf is provided in the write_len field.  This
+ *		field must contain 0 on entry to this function, and should
  *		be set back to 0 at the end of the serialize function.
  *
  * Return:	Success:	SUCCEED
@@ -2070,7 +2070,7 @@ H5HF__cache_dblock_image_len(const void *_thing, size_t *image_len)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
     haddr_t addr, size_t len, haddr_t *new_addr, size_t *new_len, unsigned *flags)
 {
@@ -2114,10 +2114,10 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
     HDassert(hdr->cache_info.type == H5AC_FHEAP_HDR);
 
     if(dblock->parent) {
-	/* this is the common case, in which the direct block is the child 
+	/* this is the common case, in which the direct block is the child
          * of an indirect block.  Set up the convenience variables we will
-         * need if the address and/or compressed size of the on disk image 
-         * of the direct block changes, and do some sanity checking in 
+         * need if the address and/or compressed size of the on disk image
+         * of the direct block changes, and do some sanity checking in
          * passing.
          */
         par_iblock = dblock->parent;
@@ -2137,8 +2137,8 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
     at_tmp_addr = H5F_IS_TMP_ADDR(f, addr);
 
     /* Begin by preping the direct block to be written to disk.  Do
-     * this by writing the correct magic number, the dblock version, 
-     * the address of the header, the offset of the block in the heap, 
+     * this by writing the correct magic number, the dblock version,
+     * the address of the header, the offset of the block in the heap,
      * and the checksum at the beginning of the block.
      */
 
@@ -2172,7 +2172,7 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
         UINT32ENCODE(image, metadata_chksum);
     } /* end if */
 
-    /* at this point, dblock->blk should point to an uncompressed image of 
+    /* at this point, dblock->blk should point to an uncompressed image of
      * the direct block.  If I/O filters are not enabled, this image should
      * be ready to hand off to the metadata cache.
      */
@@ -2211,10 +2211,10 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
         /* Use the compressed number of bytes as the size to write */
         write_size = nbytes;
 
-        /* If the size and/or location of the on disk image of the 
+        /* If the size and/or location of the on disk image of the
          * direct block changes, we must touch up its parent to reflect
          * these changes.  Do this differently depending on whether the
-         * direct block's parent is an indirect block or (rarely) the 
+         * direct block's parent is an indirect block or (rarely) the
          * fractal heap header.  In this case, the direct block is known
          * as a root direct block.
          */
@@ -2233,7 +2233,7 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
                 hdr_changed = TRUE;
             } /* end if */
 
-            /* verify that the cache's last record of the compressed 
+            /* verify that the cache's last record of the compressed
              * size matches the heap's last record.  This value will
              * likely change shortly.
              */
@@ -2241,10 +2241,10 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
 
             /* Check if we need to re-size the block on disk */
             if(hdr->pline_root_direct_size != write_size || at_tmp_addr) {
-                /* Check if the direct block is NOT currently allocated 
-                 * in temp. file space 
+                /* Check if the direct block is NOT currently allocated
+                 * in temp. file space
                  *
-                 * (temp. file space does not need to be freed) 
+                 * (temp. file space does not need to be freed)
                  */
                 if(!at_tmp_addr)
                     /* Release direct block's current disk space */
@@ -2255,8 +2255,8 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
                 if(HADDR_UNDEF == (dblock_addr = H5MF_alloc((H5F_t *)f, H5FD_MEM_FHEAP_DBLOCK, (hsize_t)write_size)))
                     HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
 
-                /* Update information about compressed direct block's 
-                 * location & size 
+                /* Update information about compressed direct block's
+                 * location & size
                  */
                 HDassert(hdr->man_dtable.table_addr == addr);
                 HDassert(hdr->pline_root_direct_size == len);
@@ -2285,7 +2285,7 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
                 par_changed = TRUE;
             } /* end if */
 
-            /* verify that the cache's last record of the compressed 
+            /* verify that the cache's last record of the compressed
              * size matches the heap's last record.  This value will
              * likely change shortly.
              */
@@ -2293,10 +2293,10 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
 
             /* Check if we need to re-size the block on disk */
             if(par_iblock->filt_ents[par_entry].size != write_size || at_tmp_addr) {
-                /* Check if the direct block is NOT currently allocated 
-                 * in temp. file space 
+                /* Check if the direct block is NOT currently allocated
+                 * in temp. file space
                  *
-                 * (temp. file space does not need to be freed) 
+                 * (temp. file space does not need to be freed)
                  */
                 if(!at_tmp_addr)
                     /* Release direct block's current disk space */
@@ -2307,8 +2307,8 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
                 if(HADDR_UNDEF == (dblock_addr = H5MF_alloc((H5F_t *)f, H5FD_MEM_FHEAP_DBLOCK, (hsize_t)write_size)))
                     HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
 
-                /* Update information about compressed direct block's 
-                 * location & size 
+                /* Update information about compressed direct block's
+                 * location & size
                  */
                 HDassert(par_iblock->ents[par_entry].addr == addr);
                 HDassert(par_iblock->filt_ents[par_entry].size == len);
@@ -2326,21 +2326,21 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
         } /* end else */
     } /* end if */
     else {
-        /* I/O filters are not enabled -- thus all we need to do is check to 
-         * see if the direct block is in temporary (AKA imaginary) file 
+        /* I/O filters are not enabled -- thus all we need to do is check to
+         * see if the direct block is in temporary (AKA imaginary) file
          * space, and move it to real file space if it is.
          *
-         * As in the I/O filters case above, we will have to touch up the 
+         * As in the I/O filters case above, we will have to touch up the
          * direct blocks parent if the direct block is relocated.
          *
-         * Recall that temporary file space need not be freed, which 
+         * Recall that temporary file space need not be freed, which
          * simplifies matters slightly.
          */
         write_buf = dblock->blk;
         write_size = dblock->size;
 
-        /* Check to see if we must re-allocate direct block from 'temp.' 
-         * to 'normal' file space 
+        /* Check to see if we must re-allocate direct block from 'temp.'
+         * to 'normal' file space
          */
         if(at_tmp_addr) {
             /* Allocate 'normal' space for the direct block */
@@ -2377,9 +2377,9 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing,
         } /* end if */
     } /* end else */
 
-    /* At this point, write_buf points to a buffer containing the image 
+    /* At this point, write_buf points to a buffer containing the image
      * of the direct block that is ready to copy into the image buffer,
-     * and write_size contains the length of this buffer. 
+     * and write_size contains the length of this buffer.
      *
      * Also, if image size or address has changed, the direct block's
      * parent has been modified to reflect the change.
@@ -2419,14 +2419,14 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF__cache_dblock_serialize
  *
- * Purpose:	In principle, this function is supposed to construct the on 
- *		disk image of the direct block, and place that image in the 
+ * Purpose:	In principle, this function is supposed to construct the on
+ *		disk image of the direct block, and place that image in the
  *		image buffer provided by the metadata cache.
  *
- *		However, since there are cases in which the pre_serialize 
- *		function has to construct the on disk image to determine its size 
+ *		However, since there are cases in which the pre_serialize
+ *		function has to construct the on disk image to determine its size
  *		and address, this function simply copies the image prepared by
- *		the pre-serialize function into the supplied image buffer, and 
+ *		the pre-serialize function into the supplied image buffer, and
  *		discards a buffer if necessary.
  *
  * Return:	Success:	SUCCEED
@@ -2437,8 +2437,8 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
-H5HF__cache_dblock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image, 
+static herr_t
+H5HF__cache_dblock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image,
     size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing)
 {
     H5HF_direct_t       *dblock = (H5HF_direct_t *)_thing;      /* Direct block info */
@@ -2462,8 +2462,8 @@ H5HF__cache_dblock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image,
     /* Copy the image from *(dblock->write_buf) to *image */
     H5MM_memcpy(image, dblock->write_buf, dblock->write_size);
 
-    /* Free *(dblock->write_buf) if it was allocated by the 
-     * pre-serialize function 
+    /* Free *(dblock->write_buf) if it was allocated by the
+     * pre-serialize function
      */
     if(dblock->write_buf != dblock->blk)
         H5MM_xfree(dblock->write_buf);
@@ -2490,7 +2490,7 @@ H5HF__cache_dblock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image,
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_dblock_notify(H5AC_notify_action_t action, void *_thing)
 {
     H5HF_direct_t 	*dblock = (H5HF_direct_t *)_thing;      /* Fractal heap direct block */
@@ -2560,7 +2560,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_dblock_free_icr(void *_thing)
 {
     H5HF_direct_t       *dblock = (H5HF_direct_t *)_thing;      /* Fractal heap direct block */
@@ -2597,7 +2597,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
 {
     const H5HF_direct_t *dblock = (const H5HF_direct_t *)_thing;      /* Fractal heap direct block */
@@ -2621,9 +2621,9 @@ H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
 /*------------------------------------------------------------------------
  * Function:	H5HF__cache_verify_hdr_descendants_clean
  *
- * Purpose:	Sanity checking routine that verifies that all indirect 
- *		and direct blocks that are descendants of the supplied 
- *		instance of H5HF_hdr_t are clean.  Set *clean to 
+ * Purpose:	Sanity checking routine that verifies that all indirect
+ *		and direct blocks that are descendants of the supplied
+ *		instance of H5HF_hdr_t are clean.  Set *clean to
  *		TRUE if this is the case, and to FALSE otherwise.
  *
  *		Update -- 8/24/15
@@ -2636,41 +2636,41 @@ H5HF__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
  *		remain dirty.
  *
  *		To address this, updated the sanity checks in this function
- *		to treat entries whose images are up to date as clean if 
+ *		to treat entries whose images are up to date as clean if
  *		a cache serialization is in progress.
  *
  *		Update -- 9/29/16
  *
  *		The implementation of flush dependencies has been changed.
- *		Prior to this change, a flush dependency parent could be 
+ *		Prior to this change, a flush dependency parent could be
  *		flushed if and only if all its flush dependency descendants
- *		were clean.  In the new definition, a flush dependency 
+ *		were clean.  In the new definition, a flush dependency
  *		parent can be flushed if all its immediate flush dependency
- *		children are clean, regardless of any other dirty 
- *		descendants.  
+ *		children are clean, regardless of any other dirty
+ *		descendants.
  *
- *		Further, metadata cache entries are now allowed to have 
- *		multiple flush dependency parents.  
+ *		Further, metadata cache entries are now allowed to have
+ *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily 
+ *		This means that the fractal heap is no longer ncessarily
  *		flushed from the bottom up.
  *
- *		For example, it is now possible for a dirty fractal heap 
+ *		For example, it is now possible for a dirty fractal heap
  *		header to be flushed before a dirty dblock, as long as the
- *		there in an interviening iblock, and the header has no 
+ *		there in an interviening iblock, and the header has no
  *		dirty immediate flush dependency children.
  *
- *		Also, I gather that under some circumstances, a dblock 
- *		will be direct a flush dependency child both of the iblock 
+ *		Also, I gather that under some circumstances, a dblock
+ *		will be direct a flush dependency child both of the iblock
  *		that points to it, and of the fractal heap header.
  *
  *		As a result of these changes, the functionality of these
  *		sanity checking routines has been modified significantly.
  *		Instead of scanning the fractal heap from a starting point
- *		down, and verifying that there were no dirty entries, the 
- *		functions now scan downward from the starting point and 
- *		verify that there are no dirty flush dependency children 
- *		of the specified flush dependency parent.  In passing, 
+ *		down, and verifying that there were no dirty entries, the
+ *		functions now scan downward from the starting point and
+ *		verify that there are no dirty flush dependency children
+ *		of the specified flush dependency parent.  In passing,
  *		they also walk the data structure, and verify it.
  *
  *
@@ -2709,16 +2709,16 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
 
     /* We have three basic scenarios we have to deal with:
      *
-     * The first, and most common case, is that there is a root iblock.  
-     * In this case we need to verify that the root iblock and all its 
+     * The first, and most common case, is that there is a root iblock.
+     * In this case we need to verify that the root iblock and all its
      * children are clean.
      *
-     * The second, and much less common case, is that in which the 
-     * the fractal heap contains only one direct block, which is 
-     * pointed to by hdr->man_dtable.table_addr.  In this case, all we 
+     * The second, and much less common case, is that in which the
+     * the fractal heap contains only one direct block, which is
+     * pointed to by hdr->man_dtable.table_addr.  In this case, all we
      * need to do is verify that the root direct block is clean.
      *
-     * Finally, it is possible that the fractal heap is empty, and 
+     * Finally, it is possible that the fractal heap is empty, and
      * has neither a root indirect block nor a root direct block.
      * In this case, we have nothing to do.
      */
@@ -2726,15 +2726,15 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
     /* There are two ways in which we can arrive at the first scenario.
      *
      * By far the most common is when hdr->root_iblock contains a pointer
-     * to the root iblock -- in this case the root iblock is almost certainly 
+     * to the root iblock -- in this case the root iblock is almost certainly
      * pinned, although we can't count on that.
      *
-     * However, it is also possible that there is a root iblock that 
-     * is no longer pointed to by the header.  In this case, the on 
+     * However, it is also possible that there is a root iblock that
+     * is no longer pointed to by the header.  In this case, the on
      * disk address of the iblock will be in hdr->man_dtable.table_addr
      * and hdr->man_dtable.curr_root_rows will contain a positive value.
      *
-     * Since the former case is far and away the most common, we don't 
+     * Since the former case is far and away the most common, we don't
      * worry too much about efficiency in the second case.
      */
     if(hdr->root_iblock ||
@@ -2748,7 +2748,7 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
         /* make note of the on disk address of the root iblock */
         if(root_iblock == NULL)
 	    /* hdr->man_dtable.table_addr must contain address of root
-             * iblock.  Check to see if it is in cache.  If it is, 
+             * iblock.  Check to see if it is in cache.  If it is,
              * protect it and put its address in root_iblock.
              */
 	    root_iblock_addr = hdr->man_dtable.table_addr;
@@ -2786,18 +2786,18 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
 
             /* At this point, the root iblock may be pinned, protected,
              * both, or neither, and we may or may not have a pointer
-             * to root iblock in memory.  
+             * to root iblock in memory.
              *
              * Before we call H5HF__cache_verify_iblock_descendants_clean(),
-             * we must ensure that the root iblock is either pinned or 
-             * protected or both, and that we have a pointer to it.  
+             * we must ensure that the root iblock is either pinned or
+             * protected or both, and that we have a pointer to it.
              * Do this as follows:
              */
             if(root_iblock == NULL) {   /* we don't have ptr to root iblock */
                 if(0 == (root_iblock_status & H5AC_ES__IS_PROTECTED)) {
                     /* just protect the root iblock -- this will give us
-                     * the pointer we need to proceed, and ensure that 
-                     * it is locked into the metadata cache for the 
+                     * the pointer we need to proceed, and ensure that
+                     * it is locked into the metadata cache for the
                      * duration.
                      *
                      * Note that the udata is only used in the load callback.
@@ -2808,9 +2808,9 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
                      * The tag specified in the API context we received
                      * as a parameter (via API context) may not be correct.
                      * Grab the (hopefully) correct tag from the header,
-                     * and load it into the API context via the H5_BEGIN_TAG and 
+                     * and load it into the API context via the H5_BEGIN_TAG and
                      * H5_END_TAG macros.  Note that any error bracked by
-                     * these macros must be reported with HGOTO_ERROR_TAG. 
+                     * these macros must be reported with HGOTO_ERROR_TAG.
                      */
                     H5_BEGIN_TAG(hdr->heap_addr)
 
@@ -2825,7 +2825,7 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
                     /* the root iblock is protected, and we have no
                      * legitimate way of getting a pointer to it.
                      *
-                     * We square this circle by using the 
+                     * We square this circle by using the
                      * H5AC_get_entry_ptr_from_addr() to get the needed
                      * pointer.
                      *
@@ -2846,14 +2846,14 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
                      * be unpinned is if none of its children are in cache.
                      * This unfortunately means that if it is protected and
                      * not pinned, the fractal heap is in the process of loading
-                     * or inserting one of its children.  The obvious 
-                     * implication is that there is a significant chance that 
+                     * or inserting one of its children.  The obvious
+                     * implication is that there is a significant chance that
                      * the root iblock is in an unstable state.
                      *
-                     * All this suggests that using 
-                     * H5AC_get_entry_ptr_from_addr() to obtain the pointer 
-                     * to the protected root iblock is questionable here.  
-                     * However, since this is test/debugging code, I expect 
+                     * All this suggests that using
+                     * H5AC_get_entry_ptr_from_addr() to obtain the pointer
+                     * to the protected root iblock is questionable here.
+                     * However, since this is test/debugging code, I expect
                      * that we will use this approach until it causes problems,
                      *  or we think of a better way.
                      */
@@ -2863,8 +2863,8 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
                 } /* end else */
             } /* end if */
             else {      /* root_iblock != NULL */
-                /* we have the pointer to the root iblock.  Protect it 
-                 * if it is neither pinned nor protected -- otherwise we 
+                /* we have the pointer to the root iblock.  Protect it
+                 * if it is neither pinned nor protected -- otherwise we
                  * are ready to go.
                  */
                  H5HF_indirect_t *   iblock = NULL;
@@ -2882,9 +2882,9 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
                      * The tag associated specified in the API context we received
                      * as a parameter (via API context) may not be correct.
                      * Grab the (hopefully) correct tag from the header,
-                     * and load it into the API context via the H5_BEGIN_TAG and 
+                     * and load it into the API context via the H5_BEGIN_TAG and
                      * H5_END_TAG macros.  Note that any error bracked by
-                     * these macros must be reported with HGOTO_ERROR_TAG. 
+                     * these macros must be reported with HGOTO_ERROR_TAG.
                      */
                     H5_BEGIN_TAG(hdr->heap_addr)
 
@@ -2953,8 +2953,8 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
                 HGOTO_ERROR(H5E_HEAP, H5E_SYSTEM, FAIL, "root dblock in cache and is a flush dep parent.")
 
             *clean = !((root_dblock_status & H5AC_ES__IS_DIRTY) &&
-                       (((root_dblock_status & 
-                          H5AC_ES__IMAGE_IS_UP_TO_DATE) == 0) || 
+                       (((root_dblock_status &
+                          H5AC_ES__IMAGE_IS_UP_TO_DATE) == 0) ||
                         (!H5AC_get_serialization_in_progress(f))));
 
             *fd_clean = *clean;
@@ -2965,8 +2965,8 @@ H5HF__cache_verify_hdr_descendants_clean(H5F_t *f, H5HF_hdr_t *hdr,
         } /* end else */
     } /* end else-if */
     else {
-        /* this is scenario 3 -- the fractal heap is empty, and we 
-         * have nothing to do. 
+        /* this is scenario 3 -- the fractal heap is empty, and we
+         * have nothing to do.
          */
         *fd_clean = TRUE;
         *clean = TRUE;
@@ -2981,62 +2981,62 @@ done:
 /*------------------------------------------------------------------------
  * Function:	H5HF__cache_verify_iblock_descendants_clean
  *
- * Purpose:	Sanity checking routine that verifies that all indirect 
- *		and direct blocks that are descendants of the supplied 
- *		instance of H5HF_indirect_t are clean.  Set *clean 
+ * Purpose:	Sanity checking routine that verifies that all indirect
+ *		and direct blocks that are descendants of the supplied
+ *		instance of H5HF_indirect_t are clean.  Set *clean
  *		to TRUE if this is the case, and to FALSE otherwise.
  *
- *		In passing, the function also does a cursory check to 
- *		spot any obvious errors in the flush dependency setup.  
- *		If any problems are found, the function returns failure.  
- *		Note that these checks are not exhaustive, thus passing 
- *		them does not mean that the flush dependencies are 
+ *		In passing, the function also does a cursory check to
+ *		spot any obvious errors in the flush dependency setup.
+ *		If any problems are found, the function returns failure.
+ *		Note that these checks are not exhaustive, thus passing
+ *		them does not mean that the flush dependencies are
  *		correct -- only that there is nothing obviously wrong
  *		with them.
  *
- *		WARNING:  At its top level call, this function is 
- *		intended to be called from H5HF_cache_iblock_flush(), 
- *		and thus presumes that the supplied indirect block 
- *		is in cache.  Any other use of this function and 
- *		its descendants must insure that this assumption is 
+ *		WARNING:  At its top level call, this function is
+ *		intended to be called from H5HF_cache_iblock_flush(),
+ *		and thus presumes that the supplied indirect block
+ *		is in cache.  Any other use of this function and
+ *		its descendants must insure that this assumption is
  *		met.
  *
- *		Note that this function and 
- *		H5HF__cache_verify_descendant_iblocks_clean() are 
+ *		Note that this function and
+ *		H5HF__cache_verify_descendant_iblocks_clean() are
  *		recursive co-routines.
  *
  *		Update -- 9/29/16
  *
  *		The implementation of flush dependencies has been changed.
- *		Prior to this change, a flush dependency parent could be 
+ *		Prior to this change, a flush dependency parent could be
  *		flushed if and only if all its flush dependency descendants
- *		were clean.  In the new definition, a flush dependency 
+ *		were clean.  In the new definition, a flush dependency
  *		parent can be flushed if all its immediate flush dependency
- *		children are clean, regardless of any other dirty 
- *		descendants.  
+ *		children are clean, regardless of any other dirty
+ *		descendants.
  *
- *		Further, metadata cache entries are now allowed to have 
- *		multiple flush dependency parents.  
+ *		Further, metadata cache entries are now allowed to have
+ *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily 
+ *		This means that the fractal heap is no longer ncessarily
  *		flushed from the bottom up.
  *
- *		For example, it is now possible for a dirty fractal heap 
+ *		For example, it is now possible for a dirty fractal heap
  *		header to be flushed before a dirty dblock, as long as the
- *		there in an interviening iblock, and the header has no 
+ *		there in an interviening iblock, and the header has no
  *		dirty immediate flush dependency children.
  *
- *		Also, I gather that under some circumstances, a dblock 
- *		will be direct a flush dependency child both of the iblock 
+ *		Also, I gather that under some circumstances, a dblock
+ *		will be direct a flush dependency child both of the iblock
  *		that points to it, and of the fractal heap header.
  *
  *		As a result of these changes, the functionality of these
  *		sanity checking routines has been modified significantly.
  *		Instead of scanning the fractal heap from a starting point
- *		down, and verifying that there were no dirty entries, the 
- *		functions now scan downward from the starting point and 
- *		verify that there are no dirty flush dependency children 
- *		of the specified flush dependency parent.  In passing, 
+ *		down, and verifying that there were no dirty entries, the
+ *		functions now scan downward from the starting point and
+ *		verify that there are no dirty flush dependency children
+ *		of the specified flush dependency parent.  In passing,
  *		they also walk the data structure, and verify it.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -3096,17 +3096,17 @@ done:
  *		direct blocks pointed to by the supplied indirect block
  *		are either clean, or not in the cache.
  *
- *		In passing, the function also does a cursory check to 
- *		spot any obvious errors in the flush dependency setup.  
- *		If any problems are found, the function returns failure.  
- *		Note that these checks are not exhaustive, thus passing 
- *		them does not mean that the flush dependencies are 
+ *		In passing, the function also does a cursory check to
+ *		spot any obvious errors in the flush dependency setup.
+ *		If any problems are found, the function returns failure.
+ *		Note that these checks are not exhaustive, thus passing
+ *		them does not mean that the flush dependencies are
  *		correct -- only that there is nothing obviously wrong
  *		with them.
  *
- *		WARNING:  This function presumes that the supplied 
- *		iblock is in the cache, and will not be removed 
- *		during the call.  Caller must ensure that this is 
+ *		WARNING:  This function presumes that the supplied
+ *		iblock is in the cache, and will not be removed
+ *		during the call.  Caller must ensure that this is
  *		the case before the call.
  *
  *      Update -- 8/24/15
@@ -3125,35 +3125,35 @@ done:
  *		Update -- 9/29/16
  *
  *		The implementation of flush dependencies has been changed.
- *		Prior to this change, a flush dependency parent could be 
+ *		Prior to this change, a flush dependency parent could be
  *		flushed if and only if all its flush dependency descendants
- *		were clean.  In the new definition, a flush dependency 
+ *		were clean.  In the new definition, a flush dependency
  *		parent can be flushed if all its immediate flush dependency
- *		children are clean, regardless of any other dirty 
- *		descendants.  
+ *		children are clean, regardless of any other dirty
+ *		descendants.
  *
- *		Further, metadata cache entries are now allowed to have 
- *		multiple flush dependency parents.  
+ *		Further, metadata cache entries are now allowed to have
+ *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily 
+ *		This means that the fractal heap is no longer ncessarily
  *		flushed from the bottom up.
  *
- *		For example, it is now possible for a dirty fractal heap 
+ *		For example, it is now possible for a dirty fractal heap
  *		header to be flushed before a dirty dblock, as long as the
- *		there in an interviening iblock, and the header has no 
+ *		there in an interviening iblock, and the header has no
  *		dirty immediate flush dependency children.
  *
- *		Also, I gather that under some circumstances, a dblock 
- *		will be direct a flush dependency child both of the iblock 
+ *		Also, I gather that under some circumstances, a dblock
+ *		will be direct a flush dependency child both of the iblock
  *		that points to it, and of the fractal heap header.
  *
  *		As a result of these changes, the functionality of these
  *		sanity checking routines has been modified significantly.
  *		Instead of scanning the fractal heap from a starting point
- *		down, and verifying that there were no dirty entries, the 
- *		functions now scan downward from the starting point and 
- *		verify that there are no dirty flush dependency children 
- *		of the specified flush dependency parent.  In passing, 
+ *		down, and verifying that there were no dirty entries, the
+ *		functions now scan downward from the starting point and
+ *		verify that there are no dirty flush dependency children
+ *		of the specified flush dependency parent.  In passing,
  *		they also walk the data structure, and verify it.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -3165,8 +3165,8 @@ done:
  */
 #ifndef NDEBUG
 static herr_t
-H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f, haddr_t fd_parent_addr, 
-    H5HF_indirect_t *iblock, hbool_t *fd_clean, hbool_t *clean, 
+H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f, haddr_t fd_parent_addr,
+    H5HF_indirect_t *iblock, hbool_t *fd_clean, hbool_t *clean,
     hbool_t *has_dblocks)
 {
     unsigned	num_direct_rows;
@@ -3224,16 +3224,16 @@ H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f, haddr_t fd_parent_addr,
                         (((dblock_status & H5AC_ES__IMAGE_IS_UP_TO_DATE) == 0) ||
                         (!H5AC_get_serialization_in_progress(f)))) {
                     *clean = FALSE;
-		    
+
                     if(H5AC_flush_dependency_exists(f, fd_parent_addr, dblock_addr, &fd_exists) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't check flush dependency")
 
-                    if(fd_exists) 
+                    if(fd_exists)
                         *fd_clean = FALSE;
                 } /* end if */
 
-                /* If a child dblock is in cache, it must have a flush 
-                 * dependency relationship with this iblock.  Test this 
+                /* If a child dblock is in cache, it must have a flush
+                 * dependency relationship with this iblock.  Test this
                  * here.
                  */
                  if(H5AC_flush_dependency_exists(f, iblock_addr, dblock_addr, &fd_exists) < 0)
@@ -3246,7 +3246,7 @@ H5HF__cache_verify_iblocks_dblocks_clean(H5F_t *f, haddr_t fd_parent_addr,
 
         i++;
     } /* end while */
-    
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF__cache_verify_iblocks_dblocks_clean() */
@@ -3260,17 +3260,17 @@ done:
  *		direct blocks pointed to by the supplied indirect block
  *		are either clean, or not in the cache.
  *
- *		In passing, the function also does a cursory check to 
- *		spot any obvious errors in the flush dependency setup.  
- *		If any problems are found, the function returns failure.  
- *		Note that these checks are not exhaustive, thus passing 
- *		them does not mean that the flush dependencies are 
+ *		In passing, the function also does a cursory check to
+ *		spot any obvious errors in the flush dependency setup.
+ *		If any problems are found, the function returns failure.
+ *		Note that these checks are not exhaustive, thus passing
+ *		them does not mean that the flush dependencies are
  *		correct -- only that there is nothing obviously wrong
  *		with them.
  *
- *		WARNING:  This function presumes that the supplied 
- *		iblock is in the cache, and will not be removed 
- *		during the call.  Caller must ensure that this is 
+ *		WARNING:  This function presumes that the supplied
+ *		iblock is in the cache, and will not be removed
+ *		during the call.  Caller must ensure that this is
  *		the case before the call.
  *
  *              Update -- 8/24/15
@@ -3289,35 +3289,35 @@ done:
  *		Update -- 9/29/16
  *
  *		The implementation of flush dependencies has been changed.
- *		Prior to this change, a flush dependency parent could be 
+ *		Prior to this change, a flush dependency parent could be
  *		flushed if and only if all its flush dependency descendants
- *		were clean.  In the new definition, a flush dependency 
+ *		were clean.  In the new definition, a flush dependency
  *		parent can be flushed if all its immediate flush dependency
- *		children are clean, regardless of any other dirty 
- *		descendants.  
+ *		children are clean, regardless of any other dirty
+ *		descendants.
  *
- *		Further, metadata cache entries are now allowed to have 
+ *		Further, metadata cache entries are now allowed to have
  *		multiple flush dependency parents.
  *
- *		This means that the fractal heap is no longer ncessarily 
+ *		This means that the fractal heap is no longer ncessarily
  *		flushed from the bottom up.
  *
- *		For example, it is now possible for a dirty fractal heap 
+ *		For example, it is now possible for a dirty fractal heap
  *		header to be flushed before a dirty dblock, as long as the
- *		there in an interviening iblock, and the header has no 
+ *		there in an interviening iblock, and the header has no
  *		dirty immediate flush dependency children.
  *
- *		Also, I gather that under some circumstances, a dblock 
- *		will be direct a flush dependency child both of the iblock 
+ *		Also, I gather that under some circumstances, a dblock
+ *		will be direct a flush dependency child both of the iblock
  *		that points to it, and of the fractal heap header.
  *
  *		As a result of these changes, the functionality of these
  *		sanity checking routines has been modified significantly.
  *		Instead of scanning the fractal heap from a starting point
- *		down, and verifying that there were no dirty entries, the 
- *		functions now scan downward from the starting point and 
- *		verify that there are no dirty flush dependency children 
- *		of the specified flush dependency parent.  In passing, 
+ *		down, and verifying that there were no dirty entries, the
+ *		functions now scan downward from the starting point and
+ *		verify that there are no dirty flush dependency children
+ *		of the specified flush dependency parent.  In passing,
  *		they also walk the data structure, and verify it.
  *
  *
@@ -3388,54 +3388,54 @@ H5HF__cache_verify_descendant_iblocks_clean(H5F_t *f, haddr_t fd_parent_addr,
                         *fd_clean = FALSE;
                 } /* end if */
 
-                /* if the child iblock is in cache and *fd_clean is TRUE, 
+                /* if the child iblock is in cache and *fd_clean is TRUE,
                  * we must continue to explore down the fractal heap tree
-                 * structure to verify that all descendant blocks that are 
-                 * flush dependency children of the entry at parent_addr are 
-                 * either clean, or not in the metadata cache.  We do this 
-                 * with a recursive call to 
+                 * structure to verify that all descendant blocks that are
+                 * flush dependency children of the entry at parent_addr are
+                 * either clean, or not in the metadata cache.  We do this
+                 * with a recursive call to
                  * H5HF__cache_verify_iblock_descendants_clean().
                  * However, we can't make this call unless the child iblock
-                 * is somehow locked into the cache -- typically via either 
+                 * is somehow locked into the cache -- typically via either
                  * pinning or protecting.
                  *
                  * If the child iblock is pinned, we can look up its pointer
-                 * on the current iblock's pinned child iblock list, and 
+                 * on the current iblock's pinned child iblock list, and
                  * and use that pointer in the recursive call.
                  *
                  * If the entry is unprotected and unpinned, we simply
                  * protect it.
                  *
-                 * If, however, the the child iblock is already protected, 
-                 * but not pinned, we have a bit of a problem, as we have 
+                 * If, however, the the child iblock is already protected,
+                 * but not pinned, we have a bit of a problem, as we have
                  * no legitimate way of looking up its pointer in memory.
                  *
                  * To solve this problem, I have added a new metadata cache
-                 * call to obtain the pointer.  
+                 * call to obtain the pointer.
                  *
-                 * WARNING: This call should be used only in debugging 
-                 * 	    routines, and it should be avoided there when 
-                 *	    possible.  
+                 * WARNING: This call should be used only in debugging
+                 * 	    routines, and it should be avoided there when
+                 *	    possible.
                  *
-                 *          Further, if we ever multi-thread the cache, 
-                 *	    this routine will have to be either discarded 
+                 *          Further, if we ever multi-thread the cache,
+                 *	    this routine will have to be either discarded
                  *	    or heavily re-worked.
                  *
-                 *	    Finally, keep in mind that the entry whose 
-                 *	    pointer is obtained in this fashion may not 
-                 *          be in a stable state.  
+                 *	    Finally, keep in mind that the entry whose
+                 *	    pointer is obtained in this fashion may not
+                 *          be in a stable state.
                  *
-                 * Assuming that the flush dependency code is working 
-                 * as it should, the only reason for the child entry to 
+                 * Assuming that the flush dependency code is working
+                 * as it should, the only reason for the child entry to
                  * be unpinned is if none of its children are in cache.
-                 * This unfortunately means that if it is protected and 
+                 * This unfortunately means that if it is protected and
                  * not pinned, the fractal heap is in the process of loading
                  * or inserting one of its children.  The obvious implication
-                 * is that there is a significant chance that the child 
+                 * is that there is a significant chance that the child
                  * iblock is in an unstable state.
                  *
-                 * All this suggests that using the new call to obtain the 
-                 * pointer to the protected child iblock is questionable 
+                 * All this suggests that using the new call to obtain the
+                 * pointer to the protected child iblock is questionable
                  * here.  However, since this is test/debugging code, I
                  * expect that we will use this approach until it causes
                  * problems, or we think of a better way.
@@ -3491,8 +3491,8 @@ H5HF__cache_verify_descendant_iblocks_clean(H5F_t *f, haddr_t fd_parent_addr,
                         child_iblock = iblock->child_iblocks[i - first_iblock_index];
                     } /* end else */
 
-                    /* At this point, one way or another we should have 
-                     * a pointer to the child iblock.  Verify that we 
+                    /* At this point, one way or another we should have
+                     * a pointer to the child iblock.  Verify that we
                      * that we have the correct one.
                      */
                     HDassert(child_iblock);
@@ -3504,8 +3504,8 @@ H5HF__cache_verify_descendant_iblocks_clean(H5F_t *f, haddr_t fd_parent_addr,
                     if(H5HF__cache_verify_iblock_descendants_clean(f, fd_parent_addr, child_iblock, &child_iblock_status, fd_clean, clean) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_SYSTEM, FAIL, "can't verify child iblock clean.")
 
-                    /* if iblock_addr != fd_parent_addr, verify that a flush 
-                     * dependency relationship exists between iblock and 
+                    /* if iblock_addr != fd_parent_addr, verify that a flush
+                     * dependency relationship exists between iblock and
                      * the child iblock.
                      */
                     if(fd_parent_addr != iblock_addr) {
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 20a62b7..07eb9cd 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -1805,7 +1805,7 @@ H5HF__man_iblock_parent_info(const H5HF_hdr_t *hdr, hsize_t block_off,
     /* Sanity check - first lookup must be an indirect block */
     HDassert(row >= hdr->man_dtable.max_direct_rows);
 
-    /* Traverse down, until a direct block at the offset is found, then 
+    /* Traverse down, until a direct block at the offset is found, then
      *	use previous (i.e. parent's) offset, row, and column.
      */
     prev_par_block_off = par_block_off = 0;
diff --git a/src/H5HFman.c b/src/H5HFman.c
index e5b5cb8..ea00546 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -238,7 +238,7 @@ H5HF_man_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
     HDassert(hdr);
     HDassert(id);
     HDassert(obj_len_p);
-    
+
     /* Skip over the flag byte */
     id++;
 
@@ -276,7 +276,7 @@ H5HF__man_get_obj_off(const H5HF_hdr_t *hdr, const uint8_t *id, hsize_t *obj_off
     HDassert(hdr);
     HDassert(id);
     HDassert(obj_off_p);
-    
+
     /* Skip over the flag byte */
     id++;
 
@@ -307,8 +307,8 @@ H5HF__man_op_real(H5HF_hdr_t *hdr, const uint8_t *id,
 {
     H5HF_direct_t *dblock = NULL;       /* Pointer to direct block to query */
     unsigned dblock_access_flags;       /* Access method for direct block */
-                                        /* must equal either 
-                                         * H5AC__NO_FLAGS_SET or 
+                                        /* must equal either
+                                         * H5AC__NO_FLAGS_SET or
                                          * H5AC__READ_ONLY_FLAG
                                          */
     haddr_t dblock_addr;                /* Direct block address */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index b38a897..83e46fc 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -646,9 +646,9 @@ H5_DLL herr_t H5HF_hdr_dest(H5HF_hdr_t *hdr);
 H5_DLL herr_t H5HF_iblock_incr(H5HF_indirect_t *iblock);
 H5_DLL herr_t H5HF__iblock_decr(H5HF_indirect_t *iblock);
 H5_DLL herr_t H5HF_iblock_dirty(H5HF_indirect_t *iblock);
-H5_DLL herr_t H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, 
+H5_DLL herr_t H5HF__man_iblock_root_create(H5HF_hdr_t *hdr,
     size_t min_dblock_size);
-H5_DLL herr_t H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, 
+H5_DLL herr_t H5HF__man_iblock_root_double(H5HF_hdr_t *hdr,
     size_t min_dblock_size);
 H5_DLL herr_t H5HF__man_iblock_alloc_row(H5HF_hdr_t *hdr,
     H5HF_free_section_t **sec_node);
@@ -779,13 +779,13 @@ H5_DLL herr_t H5HF__space_add(H5HF_hdr_t *hdr, H5HF_free_section_t *node,
 H5_DLL htri_t H5HF__space_find(H5HF_hdr_t *hdr, hsize_t request,
     H5HF_free_section_t **node);
 H5_DLL herr_t H5HF__space_revert_root(const H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF__space_create_root(const H5HF_hdr_t *hdr, 
+H5_DLL herr_t H5HF__space_create_root(const H5HF_hdr_t *hdr,
     H5HF_indirect_t *root_iblock);
 H5_DLL herr_t H5HF__space_size(H5HF_hdr_t *hdr, hsize_t *fs_size);
 H5_DLL herr_t H5HF__space_remove(H5HF_hdr_t *hdr, H5HF_free_section_t *node);
 H5_DLL herr_t H5HF__space_close(H5HF_hdr_t *hdr);
 H5_DLL herr_t H5HF__space_delete(H5HF_hdr_t *hdr);
-H5_DLL herr_t H5HF__space_sect_change_class(H5HF_hdr_t *hdr, 
+H5_DLL herr_t H5HF__space_sect_change_class(H5HF_hdr_t *hdr,
     H5HF_free_section_t *sect, uint16_t new_class);
 
 /* Free space section routines */
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index c11bc34..a0f984b 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -156,7 +156,7 @@ static hbool_t H5HF_sect_indirect_is_first(H5HF_free_section_t *sect);
 static H5HF_indirect_t * H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect);
 static hsize_t H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect);
 static H5HF_free_section_t * H5HF_sect_indirect_top(H5HF_free_section_t *sect);
-static herr_t H5HF__sect_indirect_merge_row(H5HF_hdr_t *hdr, 
+static herr_t H5HF__sect_indirect_merge_row(H5HF_hdr_t *hdr,
     H5HF_free_section_t *sect1, H5HF_free_section_t *sect2);
 static herr_t H5HF__sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect);
 static herr_t H5HF__sect_indirect_shrink(H5HF_hdr_t *hdr,
diff --git a/src/H5HFtiny.c b/src/H5HFtiny.c
index 0c27180..113124c 100644
--- a/src/H5HFtiny.c
+++ b/src/H5HFtiny.c
@@ -264,11 +264,11 @@ H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
     HDassert(hdr);
     HDassert(id);
     HDassert(op);
-    
+
     /* Get the object's encoded length */
     /* H5HF_tiny_obj_len can't fail */
     ret_value = H5HF_tiny_get_obj_len(hdr, id, &enc_obj_size);
-    
+
     /* Advance past flag byte(s) */
     if(!hdr->tiny_len_extended)
         id++;
diff --git a/src/H5HG.c b/src/H5HG.c
index 2d05a2c..f9d780c 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -785,14 +785,14 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect global heap")
 
     HDassert(hobj->idx < heap->nused);
-    
+
     /* When the application selects the same location to rewrite the VL element by using H5Sselect_elements,
      * it can happen that the entry has been removed by first rewrite.  Here we simply skip the removal of
      * the entry and let the second rewrite happen (see HDFFV-10635).  In the future, it'd be nice to handle
      * this situation in H5T_conv_vlen in H5Tconv.c instead of this level (HDFFV-10648). */
     if(heap->obj[hobj->idx].nrefs == 0 && heap->obj[hobj->idx].size == 0 && !heap->obj[hobj->idx].begin)
         HGOTO_DONE(ret_value)
-        
+
     obj_start = heap->obj[hobj->idx].begin;
     /* Include object header size */
     need = H5HG_ALIGN(heap->obj[hobj->idx].size) + H5HG_SIZEOF_OBJHDR(f);
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 18625cc..7485aad 100644
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -64,10 +64,10 @@ static herr_t H5HG__cache_heap_get_initial_load_size(void *udata, size_t *image_
 static herr_t H5HG__cache_heap_get_final_load_size(const void *_image,
     size_t image_len, void *udata, size_t *actual_len);
 static void *H5HG__cache_heap_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5HG__cache_heap_image_len(const void *thing, size_t *image_len);
 static herr_t H5HG__cache_heap_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
+    size_t len, void *thing);
 static herr_t H5HG__cache_heap_free_icr(void *thing);
 
 /* Prefix deserialization */
@@ -158,10 +158,10 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HG__cache_heap_get_initial_load_size()
  *
- * Purpose:	Return the initial speculative read size to the metadata 
- *		cache.  This size will be used in the initial attempt to read 
- *		the global heap.  If this read is too small, the cache will 
- *		try again with the correct value obtained from 
+ * Purpose:	Return the initial speculative read size to the metadata
+ *		cache.  This size will be used in the initial attempt to read
+ *		the global heap.  If this read is too small, the cache will
+ *		try again with the correct value obtained from
  *		H5HG__cache_get_final_load_size().
  *
  * Return:      Success:        SUCCEED
@@ -232,7 +232,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HG__cache_heap_deserialize
  *
- * Purpose:	Given a buffer containing the on disk image of the global 
+ * Purpose:	Given a buffer containing the on disk image of the global
  *		heap, deserialize it, load its contents into a newly allocated
  *		instance of H5HG_heap_t, and return a pointer to the new instance.
  *
@@ -334,11 +334,11 @@ H5HG__cache_heap_deserialize(const void *_image, size_t len, void *_udata,
             heap->obj[idx].begin = begin;
 
             /*
-             * The total storage size includes the size of the object 
-             * header and is zero padded so the next object header is 
-             * properly aligned. The entire obj array was calloc'ed, 
-             * so no need to zero the space here. The last bit of space 
-             * is the free space object whose size is never padded and 
+             * The total storage size includes the size of the object
+             * header and is zero padded so the next object header is
+             * properly aligned. The entire obj array was calloc'ed,
+             * so no need to zero the space here. The last bit of space
+             * is the free space object whose size is never padded and
              * already includes the object header.
              */
             if(idx > 0) {
@@ -384,7 +384,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HG__cache_heap_image_len
  *
- * Purpose:	Return the on disk image size of the global heap to the 
+ * Purpose:	Return the on disk image size of the global heap to the
  *		metadata cache via the image_len.
  *
  * Return:      Success:        SUCCEED
@@ -418,7 +418,7 @@ H5HG__cache_heap_image_len(const void *_thing, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:    H5HG__cache_heap_serialize
  *
- * Purpose:	Given an appropriately sized buffer and an instance of 
+ * Purpose:	Given an appropriately sized buffer and an instance of
  *		H5HG_heap_t, serialize the global heap for writing to file,
  *		and copy the serialized version into the buffer.
  *
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index b0ac05f..cff3942 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -77,16 +77,16 @@ static void *H5HL__cache_prefix_deserialize(const void *image, size_t len,
     void *udata, hbool_t *dirty);
 static herr_t H5HL__cache_prefix_image_len(const void *thing, size_t *image_len);
 static herr_t H5HL__cache_prefix_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
+    size_t len, void *thing);
 static herr_t H5HL__cache_prefix_free_icr(void *thing);
 
 /* Local heap data block */
 static herr_t H5HL__cache_datablock_get_initial_load_size(void *udata, size_t *image_len);
 static void *H5HL__cache_datablock_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5HL__cache_datablock_image_len(const void *thing, size_t *image_len);
 static herr_t H5HL__cache_datablock_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
+    size_t len, void *thing);
 static herr_t H5HL__cache_datablock_notify(H5C_notify_action_t action, void *_thing);
 static herr_t H5HL__cache_datablock_free_icr(void *thing);
 
@@ -176,12 +176,12 @@ H5HL__hdr_deserialize( H5HL_t *heap, const uint8_t *image,
     HDassert(udata);
 
     /* Check magic number */
-    if(HDmemcmp(image, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC)) 
+    if(HDmemcmp(image, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC))
         HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "bad local heap signature")
     image += H5_SIZEOF_MAGIC;
 
     /* Version */
-    if(H5HL_VERSION != *image++) 
+    if(H5HL_VERSION != *image++)
         HGOTO_ERROR(H5E_HEAP, H5E_VERSION, FAIL, "wrong version number in local heap")
 
     /* Reserved */
@@ -323,7 +323,7 @@ H5HL__fl_serialize(const H5HL_t *heap)
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_prefix_get_initial_load_size()
  *
- * Purpose:	Return the initial size of the buffer the metadata cache should 
+ * Purpose:	Return the initial size of the buffer the metadata cache should
  *		load from file and pass to the deserialize routine.
  *
  * Return:      Success:        SUCCEED
@@ -352,7 +352,7 @@ H5HL__cache_prefix_get_initial_load_size(void H5_ATTR_UNUSED *_udata, size_t *im
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_prefix_get_final_load_size()
  *
- * Purpose:	Return the final size of the buffer the metadata cache should 
+ * Purpose:	Return the final size of the buffer the metadata cache should
  *		load from file and pass to the deserialize routine.
  *
  * Return:      Success:        SUCCEED
@@ -402,7 +402,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_prefix_deserialize
  *
- * Purpose:	Given a buffer containing the on disk image of the local 
+ * Purpose:	Given a buffer containing the on disk image of the local
  *		heap prefix, deserialize it, load its contents into a newly allocated
  *		instance of H5HL_prfx_t, and return a pointer to the new instance.
  *
@@ -415,7 +415,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static void *
-H5HL__cache_prefix_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, 
+H5HL__cache_prefix_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len,
     void *_udata, hbool_t H5_ATTR_UNUSED *dirty)
 {
     H5HL_t               *heap = NULL;  /* Local heap */
@@ -472,8 +472,8 @@ H5HL__cache_prefix_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't initialize free list")
         } /* end if */
         else
-            /* Note that the heap should _NOT_ be a single 
-             * object in the cache 
+            /* Note that the heap should _NOT_ be a single
+             * object in the cache
              */
             heap->single_cache_obj = FALSE;
     } /* end if */
@@ -501,7 +501,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_prefix_image_len
  *
- * Purpose:	Return the on disk image size of a local heap prefix to the 
+ * Purpose:	Return the on disk image size of a local heap prefix to the
  *		metadata cache via the image_len.
  *
  * Return:      Success:        SUCCEED
@@ -528,8 +528,8 @@ H5HL__cache_prefix_image_len(const void *_thing, size_t *image_len)
     /* Set the prefix's size */
     *image_len = prfx->heap->prfx_size;
 
-    /* If the heap is stored as a single object, add in the 
-     * data block size also 
+    /* If the heap is stored as a single object, add in the
+     * data block size also
      */
     if(prfx->heap->single_cache_obj)
         *image_len += prfx->heap->dblk_size;
@@ -541,9 +541,9 @@ H5HL__cache_prefix_image_len(const void *_thing, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_prefix_serialize
  *
- * Purpose:	Given a pointer to an instance of H5HL_prfx_t and an 
- *		appropriately sized buffer, serialize the contents of the 
- *		instance for writing to disk, and copy the serialized data 
+ * Purpose:	Given a pointer to an instance of H5HL_prfx_t and an
+ *		appropriately sized buffer, serialize the contents of the
+ *		instance for writing to disk, and copy the serialized data
  *		into the buffer.
  *
  * Return:      Success:        SUCCEED
@@ -603,9 +603,9 @@ H5HL__cache_prefix_serialize(const H5_ATTR_NDEBUG_UNUSED H5F_t *f, void *_image,
         if((size_t)(image - (uint8_t *)_image) < heap->prfx_size) {
             size_t gap;         /* Size of gap between prefix and data block */
 
-            /* Set image to the start of the data block.  This is necessary 
-             * because there may be a gap between the used portion of 
-             * the prefix and the data block due to alignment constraints. 
+            /* Set image to the start of the data block.  This is necessary
+             * because there may be a gap between the used portion of
+             * the prefix and the data block due to alignment constraints.
              */
             gap = heap->prfx_size - (size_t)(image - (uint8_t *)_image);
             HDmemset(image, 0, gap);
@@ -636,11 +636,11 @@ H5HL__cache_prefix_serialize(const H5_ATTR_NDEBUG_UNUSED H5F_t *f, void *_image,
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_prefix_free_icr
  *
- * Purpose:	Free the supplied in core representation of a local heap 
+ * Purpose:	Free the supplied in core representation of a local heap
  *		prefix.
  *
- *		Note that this function handles the partially initialize prefix 
- *		from a failed speculative load attempt.  See comments below for 
+ *		Note that this function handles the partially initialize prefix
+ *		from a failed speculative load attempt.  See comments below for
  *		details.
  *
  * Note:	The metadata cache sets the object's cache_info.magic to
@@ -681,7 +681,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_datablock_get_initial_load_size()
  *
- * Purpose:	Tell the metadata cache how large a buffer to read from 
+ * Purpose:	Tell the metadata cache how large a buffer to read from
  *		file when loading a datablock.  In this case, we simply lookup
  *		the correct value in the user data, and return it in *image_len.
  *
@@ -715,7 +715,7 @@ H5HL__cache_datablock_get_initial_load_size(void *_udata, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:    H5HL__cache_datablock_deserialize
  *
- * Purpose:	Given a buffer containing the on disk image of a local 
+ * Purpose:	Given a buffer containing the on disk image of a local
  *		heap data block, deserialize it, load its contents into a newly allocated
  *		instance of H5HL_dblk_t, and return a pointer to the new instance.
  *
@@ -826,7 +826,7 @@ H5HL__cache_datablock_image_len(const void *_thing, size_t *image_len)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HL__cache_datablock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image, 
+H5HL__cache_datablock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image,
     size_t H5_ATTR_NDEBUG_UNUSED len, void *_thing)
 {
     H5HL_t      *heap;          /* Pointer to the local heap */
@@ -872,7 +872,7 @@ H5HL__cache_datablock_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *imag
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5HL__cache_datablock_notify(H5C_notify_action_t action, void *_thing)
 {
     H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing;  /* Pointer to the local heap data block */
diff --git a/src/H5HLdblk.c b/src/H5HLdblk.c
index 762a213..c3fcffe 100644
--- a/src/H5HLdblk.c
+++ b/src/H5HLdblk.c
@@ -242,7 +242,7 @@ H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
             /* Insert data block into cache (pinned) */
             if(FAIL == H5AC_insert_entry(f, H5AC_LHEAP_DBLK, new_addr, dblk, H5AC__PIN_ENTRY_FLAG))
                 H5E_THROW(H5E_CANTINIT, "unable to cache local heap data block");
-                
+
             dblk = NULL;
 
             /* Reset 'single cache object' flag */
diff --git a/src/H5HLint.c b/src/H5HLint.c
index e625f3d..cc3e3ea 100644
--- a/src/H5HLint.c
+++ b/src/H5HLint.c
@@ -213,7 +213,7 @@ CATCH
         if(NULL != (fl = H5FL_FREE(H5HL_free_t, fl)))
             H5E_THROW(H5E_CANTFREE, "unable to free local heap free list");
     } /* end while */
-    
+
     if(NULL != (heap = H5FL_FREE(H5HL_t, heap)))
         H5E_THROW(H5E_CANTFREE, "unable to free local heap");
 
diff --git a/src/H5I.c b/src/H5I.c
index 2ba8a2a..07cf7b2 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -819,7 +819,7 @@ done:
  *
  * Purpose:     Registers an OBJECT in a TYPE with the supplied ID for it.
  *              This routine will check to ensure the supplied ID is not already
- *              in use, and ensure that it is a valid ID for the given type, 
+ *              in use, and ensure that it is a valid ID for the given type,
  *              but will NOT check to ensure the OBJECT is not already
  *              registered (thus, it is possible to register one object under
  *              multiple IDs).
@@ -1360,10 +1360,10 @@ H5I_dec_ref(hid_t id)
      * reference count without calling the free method.
      *
      * Beware: the free method may call other H5I functions.
-     * 
-     * If an object is closing, we can remove the ID even though the free 
+     *
+     * If an object is closing, we can remove the ID even though the free
      * method might fail.  This can happen when a mandatory filter fails to
-     * write when a dataset is closed and the chunk cache is flushed to the 
+     * write when a dataset is closed and the chunk cache is flushed to the
      * file.  We have to close the dataset anyway. (SLU - 2010/9/7)
      */
     if(1 == id_ptr->count) {
@@ -1467,9 +1467,9 @@ H5I_dec_app_ref_always_close(hid_t id)
     /* Check for failure */
     if (ret_value < 0) {
         /*
-         * If an object is closing, we can remove the ID even though the free 
+         * If an object is closing, we can remove the ID even though the free
          * method might fail.  This can happen when a mandatory filter fails to
-         * write when a dataset is closed and the chunk cache is flushed to the 
+         * write when a dataset is closed and the chunk cache is flushed to the
          * file.  We have to close the dataset anyway. (SLU - 2010/9/7)
          */
         H5I_remove(id);
@@ -1948,7 +1948,7 @@ H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key)
     udata.app_key = key;
     udata.ret_obj = NULL;
 
-    /* Note that H5I_iterate returns an error code.  We ignore it 
+    /* Note that H5I_iterate returns an error code.  We ignore it
      * here, as we can't do anything with it without revising the API.
      */
     (void)H5I_iterate(type, H5I__search_cb, &udata, TRUE);
@@ -2099,22 +2099,22 @@ H5I__iterate_cb(void *_item, void H5_ATTR_UNUSED *_key, void *_udata)
 /*-------------------------------------------------------------------------
  * Function:	H5I_iterate
  *
- * Purpose:     Apply function FUNC to each member of type TYPE (with 
- *              non-zero application reference count if app_ref is TRUE).  
- *              Stop if FUNC returns a non zero value (i.e. anything 
- *              other than H5_ITER_CONT).  
+ * Purpose:     Apply function FUNC to each member of type TYPE (with
+ *              non-zero application reference count if app_ref is TRUE).
+ *              Stop if FUNC returns a non zero value (i.e. anything
+ *              other than H5_ITER_CONT).
  *
- *              If FUNC returns a positive value (i.e. H5_ITER_STOP), 
+ *              If FUNC returns a positive value (i.e. H5_ITER_STOP),
  *              return SUCCEED.
  *
- *              If FUNC returns a negative value (i.e. H5_ITER_ERROR), 
+ *              If FUNC returns a negative value (i.e. H5_ITER_ERROR),
  *              return FAIL.
- *		
- *              The FUNC should take a pointer to the object and the 
- *              udata as arguments and return non-zero to terminate 
+ *
+ *              The FUNC should take a pointer to the object and the
+ *              udata as arguments and return non-zero to terminate
  *              siteration, and zero to continue.
  *
- * Limitation:  Currently there is no way to start the iteration from 
+ * Limitation:  Currently there is no way to start the iteration from
  *              where a previous iteration left off.
  *
  * Return:      SUCCEED/FAIL
diff --git a/src/H5L.c b/src/H5L.c
index ba1d29a..6136266 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -304,7 +304,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5CX_set_lcpl(lcpl_id);
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&lapl_id, H5P_CLS_LACC, 
+    if(H5CX_set_apl(&lapl_id, H5P_CLS_LACC,
             ((src_loc_id != H5L_SAME_LOC) ? src_loc_id : dst_loc_id), TRUE) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set access property list info")
 
@@ -394,7 +394,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5CX_set_lcpl(lcpl_id);
 
     /* Verify access property list and set up collective metadata if appropriate */
-    if(H5CX_set_apl(&lapl_id, H5P_CLS_LACC, 
+    if(H5CX_set_apl(&lapl_id, H5P_CLS_LACC,
             ((src_loc_id != H5L_SAME_LOC) ? src_loc_id : dst_loc_id), TRUE) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTSET, FAIL, "can't set access property list info")
 
@@ -1325,7 +1325,7 @@ H5Literate2(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order,
     loc_params.obj_type = H5I_get_type(group_id);
 
     /* Iterate over the links */
-    if((ret_value = H5VL_link_specific(vol_obj, &loc_params, H5VL_LINK_ITER, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, (unsigned)FALSE, (int)idx_type, (int)order, idx_p, 
+    if((ret_value = H5VL_link_specific(vol_obj, &loc_params, H5VL_LINK_ITER, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, (unsigned)FALSE, (int)idx_type, (int)order, idx_p,
             op, op_data)) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_BADITER, FAIL, "link iteration failed")
 
diff --git a/src/H5M.c b/src/H5M.c
index 4d76574..0866bb7 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -475,7 +475,7 @@ H5Mclose(hid_t map_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a map ID")
 
     /* Decrement the counter on the map.  It will be freed if the count
-     * reaches zero.  
+     * reaches zero.
      */
     if(H5I_dec_app_ref_always_close(map_id) < 0)
         HGOTO_ERROR(H5E_MAP, H5E_CANTDEC, FAIL, "can't decrement count on map ID")
@@ -848,7 +848,7 @@ done:
  *              restart iteration at the same location on a subsequent
  *              call to H5Miterate, IDX should be the same value as
  *              returned by the previous call.
- * 
+ *
  *              H5M_iterate_t is defined as:
  *              herr_t (*H5M_iterate_t)(hid_t map_id, const void *key,
  *                      void *ctx)
diff --git a/src/H5MF.c b/src/H5MF.c
index df1c88a..79a6c07 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -1307,7 +1307,7 @@ HDfprintf(stderr, "%s: Entering: alloc_type = %u, addr = %a, size = %Hu, extra_r
     end = addr + size;
 
     /* For paged aggregation:
-     *   To extend a small block: can only extend if not crossing page boundary 
+     *   To extend a small block: can only extend if not crossing page boundary
      *   To extend a large block at EOA: calculate in advance mis-aligned fragment so EOA will still end at page boundary
      */
     if(H5F_PAGED_AGGR(f)) {
@@ -1658,8 +1658,8 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
     /* check args */
     HDassert(f);
 
-    /* If there have been no file space allocations / deallocation so 
-     * far, must call H5MF_tidy_self_referential_fsm_hack() to float 
+    /* If there have been no file space allocations / deallocation so
+     * far, must call H5MF_tidy_self_referential_fsm_hack() to float
      * all self referential FSMs and release file space allocated to
      * them.  Otherwise, the function will be called after the format
      * conversion, and will become very confused.
@@ -1797,9 +1797,9 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
          */
         HDassert(H5F_addr_defined(f->shared->sblock->ext_addr));
 
-        /* file space for all non-empty free space managers should be 
+        /* file space for all non-empty free space managers should be
          * allocated at this point, and these free space managers should
-         * be written to file and thus their headers and section info 
+         * be written to file and thus their headers and section info
          * entries in the metadata cache should be clean.
          */
 
@@ -1870,8 +1870,8 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
         if(HADDR_UNDEF == (final_eoa = H5FD_get_eoa(f->shared->lf, H5FD_MEM_DEFAULT)) )
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get file size")
 
-        /* f->shared->eoa_post_fsm_fsalloc is undefined if there has 
-         * been no file space allocation or deallocation since file 
+        /* f->shared->eoa_post_fsm_fsalloc is undefined if there has
+         * been no file space allocation or deallocation since file
          * open.
          */
         HDassert(H5F_NULL_FSM_ADDR(f) || final_eoa == f->shared->eoa_fsm_fsalloc);
@@ -2031,13 +2031,13 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
          * been no file space allocation or deallocation since file
          * open.
          *
-         * If there is a cache image in the file at file open, 
-         * f->shared->first_alloc_dealloc will always be FALSE unless 
+         * If there is a cache image in the file at file open,
+         * f->shared->first_alloc_dealloc will always be FALSE unless
          * the file is opened R/O, as otherwise, the image will have been
          * read and discarded by this point.
          *
-         * If a cache image was created on file close, the actual EOA 
-         * should be in f->shared->eoa_post_mdci_fsalloc.  Note that in 
+         * If a cache image was created on file close, the actual EOA
+         * should be in f->shared->eoa_post_mdci_fsalloc.  Note that in
          * this case, it is conceivable that f->shared->first_alloc_dealloc
          * will still be TRUE, as the cache image is allocated directly from
          * the file driver layer.  However, as this possibility seems remote,
@@ -2049,8 +2049,8 @@ HDfprintf(stderr, "%s: Entering\n", FUNC);
                   (final_eoa == f->shared->eoa_post_mdci_fsalloc)));
     } /* end if */
     else {
-        /* Iterate over all the free space types that have managers 
-         * and get each free list's space 
+        /* Iterate over all the free space types that have managers
+         * and get each free list's space
          */
         for(ptype = H5F_MEM_PAGE_META; ptype < H5F_MEM_PAGE_NTYPES; ptype++)
             if(H5MF__close_delete_fstype(f, ptype) < 0)
@@ -2365,16 +2365,16 @@ H5MF_get_free_sections(H5F_t *f, H5FD_mem_t type, size_t nsects, H5F_sect_info_t
     HDassert(f->shared);
     HDassert(f->shared->lf);
 
-    /* H5MF_tidy_self_referential_fsm_hack() will fail if any self 
+    /* H5MF_tidy_self_referential_fsm_hack() will fail if any self
      * referential FSM is opened prior to the call to it.  Thus call
      * it here if necessary and if it hasn't been called already.
      *
      * The situation is further complicated if a cache image exists
      * and had not yet been loaded into the metadata cache.  In this
-     * case, call H5AC_force_cache_image_load() instead of 
+     * case, call H5AC_force_cache_image_load() instead of
      * H5MF_tidy_self_referential_fsm_hack().  H5AC_force_cache_image_load()
-     * will load the cache image, and then call 
-     * H5MF_tidy_self_referential_fsm_hack() to discard the cache image 
+     * will load the cache image, and then call
+     * H5MF_tidy_self_referential_fsm_hack() to discard the cache image
      * block.
      */
 
@@ -2529,50 +2529,50 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5MF_settle_raw_data_fsm()
  *
- * Purpose: 	Handle any tasks required before the metadata cache 
+ * Purpose: 	Handle any tasks required before the metadata cache
  *		can serialize or flush the raw data free space manager
- *		and any metadata free space managers that reside in the 
+ *		and any metadata free space managers that reside in the
  *		raw data free space manager ring.
  *
- *              Specifically, this means any metadata managers that DON'T 
- *              handle space allocation for free space manager header or 
- *              section info will reside in the raw data free space manager 
+ *              Specifically, this means any metadata managers that DON'T
+ *              handle space allocation for free space manager header or
+ *              section info will reside in the raw data free space manager
  *              ring.
  *
- *              In the absence of page allocation, there is at most one 
+ *              In the absence of page allocation, there is at most one
  *		free space manager per memory type defined in H5F_mem_t.
- *		Of these, the one that allocates H5FD_MEM_DRAW will 
+ *		Of these, the one that allocates H5FD_MEM_DRAW will
  *		always reside in the raw data free space manager ring.
- *		If there is more than one metadata free space manager, 
- *		all that don't handle H5FD_MEM_FSPACE_HDR or 
- *              H5FD_MEM_FSPACE_SINFO (which map to H5FD_MEM_OHDR and 
- *              H5FD_MEM_LHEAP respectively) will reside in the raw 
+ *		If there is more than one metadata free space manager,
+ *		all that don't handle H5FD_MEM_FSPACE_HDR or
+ *              H5FD_MEM_FSPACE_SINFO (which map to H5FD_MEM_OHDR and
+ *              H5FD_MEM_LHEAP respectively) will reside in the raw
  *		data free space manager ring as well
  *
- *		With page allocation, the situation is conceptually 
+ *		With page allocation, the situation is conceptually
  *		identical, but more complex in practice.
  *
- *              In the worst case (multi file driver) page allocation 
- *		can result in two free space managers for each memory 
+ *              In the worst case (multi file driver) page allocation
+ *		can result in two free space managers for each memory
  *		type -- one for small (less than on equal to one page)
  *              allocations, and one for large (greater than one page)
  *              allocations.
  *
  *		In the more common one file case, page allocation will
- *              result in a total of three free space managers -- one for 
- *              small (<= one page) raw data allocations, one for small 
- *              metadata allocations (i.e, all memory types other than 
- *              H5FD_MEM_DRAW), and one for all large (> one page) 
+ *              result in a total of three free space managers -- one for
+ *              small (<= one page) raw data allocations, one for small
+ *              metadata allocations (i.e, all memory types other than
+ *              H5FD_MEM_DRAW), and one for all large (> one page)
  *              allocations.
  *
  *              Despite these complications, the solution is the same in
- *		the page allocation case -- free space managers (be they 
- *              small data or large) are assigned to the raw data free 
+ *		the page allocation case -- free space managers (be they
+ *              small data or large) are assigned to the raw data free
  *              space manager ring if they don't allocate file space for
- *              free space managers.  Note that in the one file case, the 
+ *              free space managers.  Note that in the one file case, the
  *		large free space manager must be assigned to the metadata
- *		free space manager ring, as it both allocates pages for 
- *		the metadata free space manager, and allocates space for 
+ *		free space manager ring, as it both allocates pages for
+ *		the metadata free space manager, and allocates space for
  *		large (> 1 page) metadata cache entries.
  *
  *              At present, the task list for this routine is:
@@ -2582,14 +2582,14 @@ done:
  *		    a) Free both aggregators.  Space not at EOA will be
  *		       added to the appropriate free space manager.
  *
- *		       The raw data aggregator should not be restarted 
+ *		       The raw data aggregator should not be restarted
  *		       after this point.  It is possible that the metadata
  *		       aggregator will be.
  *
  *		    b) Free all file space currently allocated to free
  *		       space managers.
  *
- *		    c) Delete the free space manager superblock 
+ *		    c) Delete the free space manager superblock
  *		       extension message if allocated.
  *
  *		   This done, reduce the EOA by moving it to just before
@@ -2597,23 +2597,23 @@ done:
  *
  *		2) Ensure that space is allocated for the free space
  *                 manager superblock extension message.  Must do this
- *                 now, before reallocating file space for free space 
+ *                 now, before reallocating file space for free space
  *		   managers, as it is possible that this allocation may
  *		   grab the last section in a FSM -- making it unnecessary
  *		   to re-allocate file space for it.
  *
  *		3) Scan all free space managers not involved in allocating
  *		   space for free space managers.  For each such free space
- *		   manager, test to see if it contains free space.  If 
+ *		   manager, test to see if it contains free space.  If
  *		   it does, allocate file space for its header and section
- *		   data.  If it contains no free space, leave it without 
- *		   allocated file space as there is no need to save it to 
+ *		   data.  If it contains no free space, leave it without
+ *		   allocated file space as there is no need to save it to
  *		   file.
  *
  *		   Note that all free space managers in this class should
- *		   see no further space allocations / deallocations as 
- *		   at this point, all raw data allocations should be 
- *		   finalized, as should all metadata allocations not 
+ *		   see no further space allocations / deallocations as
+ *		   at this point, all raw data allocations should be
+ *		   finalized, as should all metadata allocations not
  *		   involving free space managers.
  *
  *		   We will allocate space for free space managers involved
@@ -2648,7 +2648,7 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
     HDassert(f->shared);
     HDassert(fsm_settled);
 
-    /* 
+    /*
      * Only need to settle things if we are persisting free space and
      * the private property in f->shared->null_fsm_addr is not enabled.
      */
@@ -2683,7 +2683,7 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
          * Note that while the raw data aggregator should not be restarted during
          * the close process, this need not be the case for the metadata aggregator.
          *
-         * Note also that the aggregators will not exist if page aggregation 
+         * Note also that the aggregators will not exist if page aggregation
          * is enabled -- skip this if so.
          */
         /* Vailin -- is this correct? */
@@ -2719,10 +2719,10 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
          * referential nature of the problem.  These FSMs are dealt with in
          * H5MF_settle_meta_data_fsm().
          *
-         * Since paged allocation may be enabled, there may be up to two 
+         * Since paged allocation may be enabled, there may be up to two
          * free space managers per memory type -- one for small and one for
          * large allocation.  Hence we must loop over the memory types twice
-         * setting the allocation size accordingly if paged allocation is 
+         * setting the allocation size accordingly if paged allocation is
          * enabled.
          */
         for(pass_count = 0; pass_count <= 1; pass_count++) {
@@ -2783,7 +2783,7 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
 
                         /* Check if the free space manager has space in the file */
                         if(H5F_addr_defined(fs_stat.addr) || H5F_addr_defined(fs_stat.sect_addr)) {
-                            /* Delete the free space manager in the file.  Will 
+                            /* Delete the free space manager in the file.  Will
                              * reallocate later if the free space manager contains
                              * any free space.
                              */
@@ -2808,7 +2808,7 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
          *    extension messages will choke if the target message is
          *    unexpectedly either absent or present.
          *
-         *    Update: This is probably unnecessary, as I gather that the 
+         *    Update: This is probably unnecessary, as I gather that the
          *            file space manager info message is guaranteed to exist.
          *            Leave it in for now, but consider removing it.
          */
@@ -2911,9 +2911,9 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
                     fsm_visited[fsm_type] = TRUE;
 
                     if(f->shared->fs_man[fsm_type]) {
-                        /* Only allocate file space if the target free space manager 
-                         * doesn't allocate file space for free space managers.  Note 
-                         * that this is also the deciding factor as to whether a FSM 
+                        /* Only allocate file space if the target free space manager
+                         * doesn't allocate file space for free space managers.  Note
+                         * that this is also the deciding factor as to whether a FSM
                          * in in the raw data FSM ring.
                          */
                         if(!H5MF__fsm_type_is_self_referential(f->shared, fsm_type)) {
@@ -2995,15 +2995,15 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5MF_settle_meta_data_fsm()
  *
- * Purpose: 	If the free space manager is persistent, handle any tasks 
- *		required before the metadata cache can serialize or flush 
- *		the metadata free space manager(s) that handle file space 
+ * Purpose: 	If the free space manager is persistent, handle any tasks
+ *		required before the metadata cache can serialize or flush
+ *		the metadata free space manager(s) that handle file space
  *		allocation for free space managers.
  *
- *		In most cases, there will be only one manager assigned 
+ *		In most cases, there will be only one manager assigned
  *		to this role.  However, since for reasons unknown,
- *		free space manager headers and section info blocks are 
- *		different classes of memory, it is possible that two free 
+ *		free space manager headers and section info blocks are
+ *		different classes of memory, it is possible that two free
  *		space managers will be involved.
  *
  *		On entry to this function, the raw data settle routine
@@ -3020,23 +3020,23 @@ done:
  *		5) Re-created the free space manager superblock extension
  *		   message.
  *
- *		6) Reallocated file space for all non-empty free space 
- *		   managers NOT involved in allocation of space for free 
+ *		6) Reallocated file space for all non-empty free space
+ *		   managers NOT involved in allocation of space for free
  *		   space managers.
  *
  *		   Note that these free space managers (if not empty) should
  *		   have been written to file by this point, and that no
- *		   further space allocations involving them should take 
+ *		   further space allocations involving them should take
  *		   place during file close.
  *
  *		On entry to this routine, the free space manager(s) involved
  *		in allocation of file space for free space managers should
- *		still be floating. (i.e. should not have any file space 
+ *		still be floating. (i.e. should not have any file space
  *		allocated to them.)
  *
- *		Similarly, the raw data aggregator should not have been 
- *		restarted.  Note that it is probable that reallocation of 
- *		space in 5) and 6) above will have re-started the metadata 
+ *		Similarly, the raw data aggregator should not have been
+ *		restarted.  Note that it is probable that reallocation of
+ *		space in 5) and 6) above will have re-started the metadata
  *		aggregator.
  *
  *
@@ -3048,35 +3048,35 @@ done:
  *      2) Free the aggregators.
  *
  *      3) Reduce the EOA to the extent possible, and make note
- *		   of the resulting value.  This value will be stored 
+ *		   of the resulting value.  This value will be stored
  *		   in the fsinfo superblock extension message and be used
  *          in the subsequent file open.
  *
  *		4) Re-allocate space for any free space manager(s) that:
  *
- *		   a) are involved in allocation of space for free space 
- *		      managers, and 
+ *		   a) are involved in allocation of space for free space
+ *		      managers, and
  *
  *		   b) contain free space.
  *
- *		   It is possible that we could allocate space for one 
- *		   of these free space manager(s) only to have the allocation 
- *		   result in the free space manager being empty and thus 
+ *		   It is possible that we could allocate space for one
+ *		   of these free space manager(s) only to have the allocation
+ *		   result in the free space manager being empty and thus
  *		   obliging us to free the space again.  Thus there is the
  *		   potential for an infinite loop if we want to avoid saving
  *		   empty free space managers.
  *
- *		   Similarly, it is possible that we could allocate space 
- *		   for a section info block, only to discover that this 
- *		   allocation has changed the size of the section info -- 
+ *		   Similarly, it is possible that we could allocate space
+ *		   for a section info block, only to discover that this
+ *		   allocation has changed the size of the section info --
  *		   forcing us to deallocate and start the loop over again.
  *
- *		   The solution is to modify the FSM code to 
+ *		   The solution is to modify the FSM code to
  *		   save empty FSMs to file, and to allow section info blocks
  *		   to be oversized.  That is, only allow section info to increase
  *         in size, not shrink.  The solution is now implemented.
  *
- *      5) Make note of the EOA -- used for sanity checking on 
+ *      5) Make note of the EOA -- used for sanity checking on
  *         FSM shutdown.  This is saved as eoa_pre_fsm_fsalloc in
  *         the free-space info message for backward compatibility
  *         with the 1.10 library that has the hack.
@@ -3112,7 +3112,7 @@ H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled)
     HDassert(f->shared);
     HDassert(fsm_settled);
 
-    /* 
+    /*
      * Only need to settle things if we are persisting free space and
      * the private property in f->shared->null_fsm_addr is not enabled.
      */
@@ -3197,8 +3197,8 @@ H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled)
                 HDassert(fs_stat.alloc_sect_size == 0);
             } /* end if */
 
-            /* Verify that lg_sinfo_fspace is floating if it 
-             * exists and is distinct 
+            /* Verify that lg_sinfo_fspace is floating if it
+             * exists and is distinct
              */
             if((lg_sinfo_fspace) && (lg_hdr_fspace != lg_sinfo_fspace)) {
                 /* Query free space manager info for this type */
@@ -3217,7 +3217,7 @@ H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled)
          * H5MF_free_aggrs() call.  Note that the raw data aggregator must
          * have already been freed.  Sanity checks for this?
          *
-         * Note that the aggregators will not exist if paged aggregation 
+         * Note that the aggregators will not exist if paged aggregation
          * is enabled -- don't attempt to free if this is the case.
          */
         /* (for space not at EOF, it may be put into free space managers) */
@@ -3228,30 +3228,30 @@ H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled)
         if(H5MF__close_shrink_eoa(f) < 0)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTSHRINK, FAIL, "can't shrink eoa")
 
-        /* WARNING:  This approach settling the self referential free space 
-         *           managers and allocating space for them in the file will 
-         *           not work as currently implemented with the split and 
-         *           multi file drivers, as the self referential free space 
-         *           manager header and section info can be stored in up to 
-         *           two different files -- requiring that up to two EOA's 
-         *           be stored in the the free space managers super block 
-         *           extension message.  
+        /* WARNING:  This approach settling the self referential free space
+         *           managers and allocating space for them in the file will
+         *           not work as currently implemented with the split and
+         *           multi file drivers, as the self referential free space
+         *           manager header and section info can be stored in up to
+         *           two different files -- requiring that up to two EOA's
+         *           be stored in the the free space managers super block
+         *           extension message.
          *
-         *           As of this writing, we are solving this problem by 
-         *           simply not supporting persistent FSMs with the split 
+         *           As of this writing, we are solving this problem by
+         *           simply not supporting persistent FSMs with the split
          *           and multi file drivers.
          *
-         *           Current plans are to do away with the multi file 
+         *           Current plans are to do away with the multi file
          *           driver, so this should be a non-issue in this case.
          *
-         *           We should be able to support the split file driver 
-         *           without a file format change.  However, the code to 
+         *           We should be able to support the split file driver
+         *           without a file format change.  However, the code to
          *           do so does not exist at present.
          * NOTE: not sure whether to remove or keep the above comments
          */
 
-        /* 
-         * Continue allocating file space for the header and section info until 
+        /*
+         * Continue allocating file space for the header and section info until
          * they are all settled,
          */
         do {
@@ -3288,8 +3288,8 @@ H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled)
 
         /* All free space managers should have file space allocated for them
          * now, and should see no further allocations / deallocations.
-         * For backward compatibility, store the eoa in f->shared->eoa_fsm_fsalloc 
-         * which will be set to fsinfo.eoa_pre_fsm_fsalloc when we actually write 
+         * For backward compatibility, store the eoa in f->shared->eoa_fsm_fsalloc
+         * which will be set to fsinfo.eoa_pre_fsm_fsalloc when we actually write
          * the free-space info message to the superblock extension.
          * This will allow the 1.10 library with the hack to open the file with
          * the new solution.
@@ -3330,7 +3330,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5MF__continue_alloc_fsm(H5F_shared_t *f_sh, H5FS_t *sm_hdr_fspace, H5FS_t *sm_sinfo_fspace, 
+H5MF__continue_alloc_fsm(H5F_shared_t *f_sh, H5FS_t *sm_hdr_fspace, H5FS_t *sm_sinfo_fspace,
     H5FS_t  *lg_hdr_fspace, H5FS_t *lg_sinfo_fspace, hbool_t *continue_alloc_fsm)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index d716ae2..0124555 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -189,11 +189,11 @@ HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
      * The line in #ifdef REPLACE triggers the following problem:
      *   test/objcopy.c: test_copy_group_deep() test fails with the family driver
      *
-     * When closing the destination file after H5Ocopy, the library flushes the fractal 
+     * When closing the destination file after H5Ocopy, the library flushes the fractal
      * heap direct block via H5HF__cache_dblock_pre_serialize().  While doing so,
      * the cache eventually adjusts/evicts ageout entries and ends up flushing out the
      * same entry that is being serialized (flush_in_progress).
-     */ 
+     */
     if((f->shared->feature_flags & aggr->feature_flag) && f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && (!f->shared->closing || !f->shared->fs_persist)) {
 #ifdef REPLACE
     if((f->shared->feature_flags & aggr->feature_flag) && f->shared->fs_strategy != H5F_FSPACE_STRATEGY_NONE && !f->shared->closing) {
@@ -405,7 +405,7 @@ HDfprintf(stderr, "%s: ret_value = %a\n", FUNC, ret_value);
  *-------------------------------------------------------------------------
  */
 htri_t
-H5MF__aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr, 
+H5MF__aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr,
     H5FD_mem_t type, haddr_t blk_end, hsize_t extra_requested)
 {
     htri_t ret_value = FALSE;           /* Return value */
@@ -419,7 +419,7 @@ H5MF__aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr,
 
     /* Check if this aggregator is active */
     if(f->shared->feature_flags & aggr->feature_flag) {
-        /* 
+        /*
          * If the block being tested adjoins the beginning of the aggregator
          *      block, check if the aggregator can accommodate the extension.
          */
@@ -443,7 +443,7 @@ H5MF__aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr,
                 /*
                  * If extra_requested is above percentage threshold:
                  * 1) "bubble" up the aggregator by aggr->alloc_size or extra_requested
-                 * 2) extend the block into the aggregator 
+                 * 2) extend the block into the aggregator
                  */
                 else {
                     hsize_t extra = (extra_requested < aggr->alloc_size) ? aggr->alloc_size : extra_requested;
diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c
index 7bb77e8..43e2305 100644
--- a/src/H5MFdbg.c
+++ b/src/H5MFdbg.c
@@ -115,8 +115,8 @@ H5MF__sects_debug_cb(H5FS_section_info_t *_sect, void *_udata)
     /* Print generic section information */
     HDfprintf(udata->stream, "%*s%-*s %s\n", udata->indent, "", udata->fwidth,
 	      "Section type:",
-          (sect->sect_info.type == H5MF_FSPACE_SECT_SIMPLE ? "simple" : 
-          (sect->sect_info.type == H5MF_FSPACE_SECT_SMALL ? "small" : 
+          (sect->sect_info.type == H5MF_FSPACE_SECT_SIMPLE ? "simple" :
+          (sect->sect_info.type == H5MF_FSPACE_SECT_SMALL ? "small" :
           (sect->sect_info.type == H5MF_FSPACE_SECT_LARGE ? "large" : "unknown"))));
     HDfprintf(udata->stream, "%*s%-*s %a\n", udata->indent, "", udata->fwidth,
 	      "Section address:",
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index de1bdfb..acd773b 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -75,9 +75,9 @@ H5_DLL htri_t H5MF_aggrs_try_shrink_eoa(H5F_t *f);
 H5_DLL herr_t H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled);
 H5_DLL herr_t H5MF_settle_meta_data_fsm(H5F_t *f, hbool_t *fsm_settled);
 
-/* This function has to be declared in H5MFprivate.h as it is needed 
- * in our test code to allow us to manually start a self referential 
- * free space manager prior to the first file space allocations / 
+/* This function has to be declared in H5MFprivate.h as it is needed
+ * in our test code to allow us to manually start a self referential
+ * free space manager prior to the first file space allocations /
  * deallocation without causing assertion failures on the first
  * file space allocation / deallocation.
  */
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index f661ef9..715ece4 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -186,7 +186,7 @@ H5FS_section_class_t H5MF_FSPACE_SECT_CLS_LARGE[1] = {{
 /* Declare a free list to manage the H5MF_free_section_t struct */
 H5FL_DEFINE(H5MF_free_section_t);
 
-/* 
+/*
  * "simple/small/large" section callbacks
  */
 
@@ -371,7 +371,7 @@ done:
     FUNC_LEAVE_NOAPI((H5FS_section_info_t *)ret_value)
 } /* end H5MF__sect_split() */
 
-/* 
+/*
  * "simple" section callbacks
  */
 
@@ -615,7 +615,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF__sect_simple_shrink() */
 
-/* 
+/*
  * "small" section callbacks
  */
 
@@ -625,7 +625,7 @@ done:
  *
  * Purpose:     Perform actions on a small "meta" action before adding it to the free space manager:
  *              1) Drop the section if it is at page end and its size <= page end threshold
- *              2) Adjust section size to include page end threshold if 
+ *              2) Adjust section size to include page end threshold if
  *                 (section size + threshold) is at page end
  *
  * Return:      Success:        non-negative
@@ -792,7 +792,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5MF__sect_small_merge() */
 
-/* 
+/*
  * "Large" section callbacks
  */
 
diff --git a/src/H5MM.c b/src/H5MM.c
index 4ac0ddc..33247ba 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -254,7 +254,7 @@ H5MM_final_sanity_check(void)
  *              difficult to check as a return value. This is still
  *              considered an error condition since allocations of zero
  *              bytes usually indicate problems.
- *  
+ *
  * Return:      Success:    Pointer to new memory
  *              Failure:    NULL
  *
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 573bb7a..aeaebea 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -36,7 +36,7 @@ static void *H5O__attr_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_ty
     void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
     H5O_copy_t *cpy_info, void *udata);
 static herr_t H5O__attr_post_copy_file(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, 
+    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
     H5O_copy_t *cpy_info);
 static herr_t H5O_attr_get_crt_index(const void *_mesg, H5O_msg_crt_idx_t *crt_idx);
 static herr_t H5O_attr_set_crt_index(void *_mesg, H5O_msg_crt_idx_t crt_idx);
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index a4a746e..d498be5 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -830,7 +830,7 @@ H5O__attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
             HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to load object header chunk")
 
         /* Because the attribute structure is shared now. The only situation that requires
-         * copying the data is when the metadata cache evicts and reloads this attribute. 
+         * copying the data is when the metadata cache evicts and reloads this attribute.
          * The shared attribute structure will be different in that situation. SLU-2010/7/29 */
         if(((H5A_t *)mesg->native)->shared != udata->attr->shared) {
             /* Sanity check */
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 8bad181..45c55fd 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -66,17 +66,17 @@ static herr_t H5O__cache_get_final_load_size(const void *image_ptr, size_t image
     void *udata, size_t *actual_len);
 static htri_t H5O__cache_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5O__cache_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5O__cache_image_len(const void *thing, size_t *image_len);
 static herr_t H5O__cache_serialize(const H5F_t *f, void *image, size_t len,
-    void *thing); 
+    void *thing);
 static herr_t H5O__cache_notify(H5AC_notify_action_t action, void *_thing);
 static herr_t H5O__cache_free_icr(void *thing);
 
 static herr_t H5O__cache_chk_get_initial_load_size(void *udata, size_t *image_len);
 static htri_t H5O__cache_chk_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5O__cache_chk_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5O__cache_chk_image_len(const void *thing, size_t *image_len);
 static herr_t H5O__cache_chk_serialize(const H5F_t *f, void *image, size_t len,
     void *thing);
@@ -161,7 +161,7 @@ H5FL_SEQ_DEFINE(H5O_cont_t);
 /*-------------------------------------------------------------------------
  * Function:    H5O__cache_get_initial_load_size()
  *
- * Purpose:	Tell the metadata cache how much data to read from file in 
+ * Purpose:	Tell the metadata cache how much data to read from file in
  *		the first speculative read for the object header.
  *
  * Return:      Success:        SUCCEED
@@ -288,12 +288,12 @@ H5O__cache_verify_chksum(const void *_image, size_t len, void *_udata)
 /*-------------------------------------------------------------------------
  * Function:    H5O__cache_deserialize
  *
- * Purpose:	Attempt to deserialize the object header contained in the 
- *		supplied buffer, load the data into an instance of H5O_t, and 
+ * Purpose:	Attempt to deserialize the object header contained in the
+ *		supplied buffer, load the data into an instance of H5O_t, and
  *		return a pointer to the new instance.
  *
- *		Note that the object header is read with with a speculative read.  
- *		If the initial read is too small, make note of this fact and return 
+ *		Note that the object header is read with with a speculative read.
+ *		If the initial read is too small, make note of this fact and return
  *     		without error.  H5C_load_entry() will note the size discrepency
  *		and retry the deserialize operation with the correct size read.
  *
@@ -317,7 +317,7 @@ H5O__cache_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void
 
     /* Check arguments */
     HDassert(image);
-    HDassert(len > 0); 
+    HDassert(len > 0);
     HDassert(udata);
     HDassert(udata->common.f);
     HDassert(udata->common.cont_msg_info);
@@ -441,15 +441,15 @@ H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *_thing)
     H5O__assert(oh);
 #endif /* H5O_DEBUG */
 
-    /* Point to raw data 'image' for first chunk, which 
-     * has room for the prefix 
+    /* Point to raw data 'image' for first chunk, which
+     * has room for the prefix
      */
     chunk_image = oh->chunk[0].image;
 
     /* Later versions of object header prefix have different format and
      * also require that chunk 0 always be updated, since the checksum
      * on the entire block of memory needs to be updated if anything is
-     * modified 
+     * modified
      */
     if(oh->version > H5O_VERSION_1) {
         uint64_t chunk0_size;       /* Size of chunk 0's data */
@@ -536,11 +536,11 @@ H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *_thing)
     HDassert((size_t)(chunk_image - oh->chunk[0].image) == (size_t)(H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
 
     /* Serialize messages for this chunk */
-    if(H5O__chunk_serialize(f, oh, (unsigned)0) < 0) 
+    if(H5O__chunk_serialize(f, oh, (unsigned)0) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, "unable to serialize first object header chunk")
 
-    /* copy the chunk into the image -- this is potentially expensive.  
-     * Can we rework things so that the object header and the cache 
+    /* copy the chunk into the image -- this is potentially expensive.
+     * Can we rework things so that the object header and the cache
      * share a buffer?
      */
     H5MM_memcpy(image, oh->chunk[0].image, len);
@@ -651,7 +651,7 @@ done:
  */
 static herr_t
 H5O__cache_free_icr(void *_thing)
-{ 
+{
     H5O_t      *oh = (H5O_t *)_thing;   /* Object header to destroy */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -674,8 +674,8 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5O__cache_chk_get_initial_load_size()
  *
- * Purpose:	Tell the metadata cache how large the on disk image of the 
- *		chunk proxy is, so it can load the image into a buffer for the 
+ * Purpose:	Tell the metadata cache how large the on disk image of the
+ *		chunk proxy is, so it can load the image into a buffer for the
  *		deserialize call.
  *
  * Return:      Success:        SUCCEED
@@ -751,7 +751,7 @@ H5O__cache_chk_verify_chksum(const void *_image, size_t len, void *_udata)
  * Function:    H5O__cache_chk_deserialize
  *
  * Purpose:	Attempt to deserialize the object header continuation chunk
- *		contained in the supplied buffer, load the data into an instance 
+ *		contained in the supplied buffer, load the data into an instance
  *		of H5O_chunk_proxy_t, and return a pointer to the new instance.
  *
  * Return:      Success:        Pointer to in core representation
@@ -780,7 +780,7 @@ H5O__cache_chk_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len,
     HDassert(dirty);
 
     /* Allocate space for the object header data structure */
-    if(NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t))) 
+    if(NULL == (chk_proxy = H5FL_CALLOC(H5O_chunk_proxy_t)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTALLOC, NULL, "memory allocation failed")
 
     /* Check if we are still decoding the object header */
@@ -804,7 +804,7 @@ H5O__cache_chk_deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len,
         /* Set the chunk number for the chunk proxy */
         chk_proxy->chunkno = udata->chunkno;
 
-        /* Sanity check that the chunk representation we have in memory is 
+        /* Sanity check that the chunk representation we have in memory is
          * the same as the one being brought in from disk.
          */
         HDassert(0 == HDmemcmp(image, udata->oh->chunk[chk_proxy->chunkno].image, udata->oh->chunk[chk_proxy->chunkno].size));
@@ -830,7 +830,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5O__cache_chk_image_len
  *
- * Purpose:	Return the on disk image size of a object header chunk to the 
+ * Purpose:	Return the on disk image size of a object header chunk to the
  *		metadata cache via the image_len.
  *
  * Return:      Success:        SUCCEED
@@ -864,9 +864,9 @@ H5O__cache_chk_image_len(const void *_thing, size_t *image_len)
 /*-------------------------------------------------------------------------
  * Function:    H5O__cache_chk_serialize
  *
- * Purpose:	Given a pointer to an instance of an object header chunk and an 
- *		appropriately sized buffer, serialize the contents of the 
- *		instance for writing to disk, and copy the serialized data 
+ * Purpose:	Given a pointer to an instance of an object header chunk and an
+ *		appropriately sized buffer, serialize the contents of the
+ *		instance for writing to disk, and copy the serialized data
  *		into the buffer.
  *
  * Return:      Success:        SUCCEED
@@ -1263,19 +1263,19 @@ H5O__prefix_deserialize(const uint8_t *_image, H5O_cache_ud_t *udata)
     /* Verify object header prefix length */
     HDassert((size_t)(image - _image) == (size_t)(H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
 
-    /* If udata->oh is to be freed (see H5O__cache_verify_chksum), 
+    /* If udata->oh is to be freed (see H5O__cache_verify_chksum),
        save the pointer to udata->oh and free it later after setting
        udata->oh with the new object header */
     if(udata->free_oh) {
         H5O_t *saved_oh = udata->oh;
-        HDassert(udata->oh); 
+        HDassert(udata->oh);
 
         /* Save the object header for later use in 'deserialize' callback */
         udata->oh = oh;
         if(H5O__free(saved_oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't destroy object header")
         udata->free_oh = FALSE;
-    } else 
+    } else
         /* Save the object header for later use in 'deserialize' callback */
         udata->oh = oh;
 
@@ -1491,7 +1491,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image
                 mesg->type = H5O_msg_class_g[H5O_UNKNOWN_ID];
 
                 /* Check for "fail if unknown" message flags */
-                if(((udata->file_intent & H5F_ACC_RDWR) && 
+                if(((udata->file_intent & H5F_ACC_RDWR) &&
                         (flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE))
                         || (flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_ALWAYS))
                     HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "unknown message with 'fail if unknown' flag found")
diff --git a/src/H5Ocache_image.c b/src/H5Ocache_image.c
index 70d9ef5..6ac04c8 100644
--- a/src/H5Ocache_image.c
+++ b/src/H5Ocache_image.c
@@ -40,10 +40,10 @@
 /* Callbacks for message class */
 static void *H5O__mdci_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags,
     unsigned *ioflags, size_t p_size, const uint8_t *p);
-static herr_t H5O__mdci_encode(H5F_t *f, hbool_t disable_shared, 
+static herr_t H5O__mdci_encode(H5F_t *f, hbool_t disable_shared,
     uint8_t *p, const void *_mesg);
 static void *H5O__mdci_copy(const void *_mesg, void *_dest);
-static size_t H5O__mdci_size(const H5F_t *f, hbool_t disable_shared, 
+static size_t H5O__mdci_size(const H5F_t *f, hbool_t disable_shared,
     const void *_mesg);
 static herr_t H5O__mdci_free(void *mesg);
 static herr_t H5O__mdci_delete(H5F_t *f, H5O_t *open_oh, void *_mesg);
@@ -143,7 +143,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__mdci_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, 
+H5O__mdci_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared,
     uint8_t *p, const void *_mesg)
 {
     const H5O_mdci_t *mesg = (const H5O_mdci_t *)_mesg;
@@ -220,7 +220,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O__mdci_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, 
+H5O__mdci_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared,
     const void H5_ATTR_UNUSED *_mesg)
 {
     size_t ret_value = 0;       /* Return value */
@@ -228,7 +228,7 @@ H5O__mdci_size(const H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared,
     FUNC_ENTER_STATIC_NOERR
 
     /* Set return value */
-    ret_value = (size_t)( 1 +                   /* Version number           */ 
+    ret_value = (size_t)( 1 +                   /* Version number           */
                           H5F_SIZEOF_ADDR(f) +  /* addr of metadata cache   */
                                                 /* image block              */
                           H5F_SIZEOF_SIZE(f) ); /* length of metadata cache */
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index c27ece0..6eaaae9 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -43,7 +43,7 @@ static void *H5O__dtype_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_t
     void *native_src, H5F_t *file_dst, hbool_t *recompute_size,
     H5O_copy_t *cpy_info, void *udata);
 static herr_t H5O__dtype_shared_post_copy_upd(const H5O_loc_t *src_oloc,
-    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst, 
+    const void *mesg_src, H5O_loc_t *dst_oloc, void *mesg_dst,
     H5O_copy_t *cpy_info);
 static herr_t H5O__dtype_debug(H5F_t *f, const void *_mesg, FILE * stream,
     int indent, int fwidth);
diff --git a/src/H5Oflush.c b/src/H5Oflush.c
index b441840..898184b 100644
--- a/src/H5Oflush.c
+++ b/src/H5Oflush.c
@@ -270,11 +270,11 @@ done:
  * Purpose:     Refreshes all buffers associated with an object.
  *
  * Note:	This is based on the original H5O_refresh_metadata() but
- *	        is split into 2 routines.  
+ *	        is split into 2 routines.
  *	        This is done so that H5Fstart_swmr_write() can use these
- *	        2 routines to refresh opened objects.  This may be 
+ *	        2 routines to refresh opened objects.  This may be
  *	        restored back to the original code when H5Fstart_swmr_write()
- *	        uses a different approach to handle issues with opened objects.	
+ *	        uses a different approach to handle issues with opened objects.
  *	 	H5Fstart_swmr_write() no longer calls the 1st routine.	(12/24/15)
  *
  * Return:    	Non-negative on success, negative on failure
@@ -383,7 +383,7 @@ H5O__refresh_metadata_close(hid_t oid, H5O_loc_t oloc, H5G_loc_t *obj_loc)
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
-    
+
     /* Make deep local copy of object's location information */
     if(obj_loc) {
         H5G_loc_t tmp_loc;
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 2a2a07b..8e6e204 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -373,7 +373,7 @@ H5O__layout_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh,
                 /* Check version */
                 if(mesg->version < H5O_LAYOUT_VERSION_4)
                     HGOTO_ERROR(H5E_OHDR, H5E_VERSION, NULL, "invalid layout version with virtual layout")
-                
+
                 /* Heap information */
                 H5F_addr_decode(f, &p, &(mesg->storage.u.virt.serial_list_hobjid.addr));
                 UINT32DECODE(p, mesg->storage.u.virt.serial_list_hobjid.idx);
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 0ecc0d7..fbf7613 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -11,20 +11,20 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* Programmer:    Robb Matzke <matzke@llnl.gov>
- *        Friday, July 24, 1998
+/* Programmer:	Robb Matzke <matzke@llnl.gov>
+ *		Friday, July 24, 1998
  *
- * Purpose:    The object modification time message.
+ * Purpose:	The object modification time message.
  */
 
 #include "H5Omodule.h"          /* This source code file is part of the H5O module */
 
 
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5FLprivate.h"    /* Free lists                           */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Opkg.h"             /* Object headers            */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5FLprivate.h"	/* Free lists                           */
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Opkg.h"             /* Object headers			*/
 
 
 static void *H5O__mtime_new_decode(H5F_t *f, H5O_t *open_oh, unsigned mesg_flags,
@@ -43,62 +43,62 @@ static herr_t H5O__mtime_debug(H5F_t *f, const void *_mesg, FILE *stream,
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_MTIME[1] = {{
-    H5O_MTIME_ID,        /*message id number        */
-    "mtime",            /*message name for debugging    */
-    sizeof(time_t),        /*native message size        */
-    0,                /* messages are sharable?       */
-    H5O__mtime_decode,        /*decode message        */
-    H5O_mtime_encode,        /*encode message        */
-    H5O_mtime_copy,        /*copy the native value        */
-    H5O_mtime_size,        /*raw message size        */
-    NULL,            /* reset method            */
-    H5O__mtime_free,        /* free method            */
-    NULL,                /* file delete method        */
-    NULL,            /* link method            */
-    NULL,            /*set share method        */
-    NULL,                /*can share method        */
-    NULL,            /* pre copy native value to file */
-    NULL,            /* copy native value to file    */
-    NULL,            /* post copy native value to file    */
-    NULL,            /* get creation index        */
-    NULL,            /* set creation index        */
-    H5O__mtime_debug        /*debug the message        */
+    H5O_MTIME_ID,		/*message id number		*/
+    "mtime",			/*message name for debugging	*/
+    sizeof(time_t),		/*native message size		*/
+    0,				/* messages are sharable?       */
+    H5O__mtime_decode,		/*decode message		*/
+    H5O_mtime_encode,		/*encode message		*/
+    H5O_mtime_copy,		/*copy the native value		*/
+    H5O_mtime_size,		/*raw message size		*/
+    NULL,			/* reset method			*/
+    H5O__mtime_free,		/* free method			*/
+    NULL,		        /* file delete method		*/
+    NULL,			/* link method			*/
+    NULL,			/*set share method		*/
+    NULL,		    	/*can share method		*/
+    NULL,			/* pre copy native value to file */
+    NULL,			/* copy native value to file    */
+    NULL,			/* post copy native value to file    */
+    NULL,			/* get creation index		*/
+    NULL,			/* set creation index		*/
+    H5O__mtime_debug		/*debug the message		*/
 }};
 
 /* This message derives from H5O message class */
 /* (Only encode, decode & size routines are different from old mtime routines) */
 const H5O_msg_class_t H5O_MSG_MTIME_NEW[1] = {{
-    H5O_MTIME_NEW_ID,        /*message id number        */
-    "mtime_new",        /*message name for debugging    */
-    sizeof(time_t),        /*native message size        */
-    0,                /* messages are sharable?       */
-    H5O__mtime_new_decode,    /*decode message        */
-    H5O_mtime_new_encode,    /*encode message        */
-    H5O_mtime_copy,        /*copy the native value        */
-    H5O_mtime_new_size,        /*raw message size        */
-    NULL,            /* reset method            */
-    H5O__mtime_free,        /* free method            */
-    NULL,                /* file delete method        */
-    NULL,            /* link method            */
-    NULL,            /*set share method        */
-    NULL,                /*can share method        */
-    NULL,            /* pre copy native value to file */
-    NULL,            /* copy native value to file    */
-    NULL,            /* post copy native value to file    */
-    NULL,            /* get creation index        */
-    NULL,            /* set creation index        */
-    H5O__mtime_debug        /*debug the message        */
+    H5O_MTIME_NEW_ID,		/*message id number		*/
+    "mtime_new",		/*message name for debugging	*/
+    sizeof(time_t),		/*native message size		*/
+    0,				/* messages are sharable?       */
+    H5O__mtime_new_decode,	/*decode message		*/
+    H5O_mtime_new_encode,	/*encode message		*/
+    H5O_mtime_copy,		/*copy the native value		*/
+    H5O_mtime_new_size,		/*raw message size		*/
+    NULL,			/* reset method			*/
+    H5O__mtime_free,		/* free method			*/
+    NULL,		        /* file delete method		*/
+    NULL,			/* link method			*/
+    NULL,			/*set share method		*/
+    NULL,		    	/*can share method		*/
+    NULL,			/* pre copy native value to file */
+    NULL,			/* copy native value to file    */
+    NULL,			/* post copy native value to file    */
+    NULL,			/* get creation index		*/
+    NULL,			/* set creation index		*/
+    H5O__mtime_debug		/*debug the message		*/
 }};
 
 /* Current version of new mtime information */
-#define H5O_MTIME_VERSION     1
+#define H5O_MTIME_VERSION 	1
 
 /* Declare a free list to manage the time_t struct */
 H5FL_DEFINE(time_t);
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O__mtime_new_decode
+ * Function:	H5O__mtime_new_decode
  *
  * Purpose:     Decode a new modification time message and return a pointer to
  *              a new time_t value.
@@ -106,13 +106,13 @@ H5FL_DEFINE(time_t);
  *              The new modification time message format was added due to the
  *              performance overhead of the old format.
  *
- * Return:    Success:    Ptr to new message in native struct.
+ * Return:	Success:	Ptr to new message in native struct.
  *
- *        Failure:    NULL
+ *		Failure:	NULL
  *
- * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
- *        Jan  3 2002
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		Jan  3 2002
  *
  *-------------------------------------------------------------------------
  */
@@ -121,7 +121,7 @@ H5O__mtime_new_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
     unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
     size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    time_t    *mesg;
+    time_t	*mesg;
     uint32_t    tmp_time;               /* Temporary copy of the time */
     void        *ret_value = NULL;      /* Return value */
 
@@ -153,9 +153,9 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__mtime_new_decode() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O__mtime_decode
+ * Function:	H5O__mtime_decode
  *
  * Purpose:     Decode a modification time message and return a pointer to a
  *              new time_t value.
@@ -163,13 +163,13 @@ done:
  *              The new modification time message format was added due to the
  *              performance overhead of the old format.
  *
- * Return:    Success:    Ptr to new message in native struct.
+ * Return:	Success:	Ptr to new message in native struct.
  *
- *        Failure:    NULL
+ *		Failure:	NULL
  *
- * Programmer:    Robb Matzke
- *        matzke@llnl.gov
- *        Jul 24 1998
+ * Programmer:	Robb Matzke
+ *		matzke@llnl.gov
+ *		Jul 24 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -178,9 +178,9 @@ H5O__mtime_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
     unsigned H5_ATTR_UNUSED mesg_flags, unsigned H5_ATTR_UNUSED *ioflags,
     size_t H5_ATTR_UNUSED p_size, const uint8_t *p)
 {
-    time_t    *mesg, the_time;
-    struct tm    tm;
-    int    i;                              /* Local index variable */
+    time_t	*mesg, the_time;
+    struct tm	tm;
+    int	i;                              /* Local index variable */
     void        *ret_value = NULL;      /* Return value */
 
     FUNC_ENTER_STATIC
@@ -218,24 +218,24 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__mtime_decode() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O_mtime_new_encode
+ * Function:	H5O_mtime_new_encode
  *
- * Purpose:    Encodes a new modification time message.
+ * Purpose:	Encodes a new modification time message.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
- *        Jan  3 2002
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		Jan  3 2002
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const time_t    *mesg = (const time_t *) _mesg;
+    const time_t	*mesg = (const time_t *) _mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -258,17 +258,17 @@ H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_mtime_new_encode() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O_mtime_encode
+ * Function:	H5O_mtime_encode
  *
- * Purpose:    Encodes a modification time message.
+ * Purpose:	Encodes a modification time message.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Robb Matzke
- *        matzke@llnl.gov
- *        Jul 24 1998
+ * Programmer:	Robb Matzke
+ *		matzke@llnl.gov
+ *		Jul 24 1998
  *
  * Modifications:
  *
@@ -277,8 +277,8 @@ H5O_mtime_new_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_sha
 static herr_t
 H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
-    const time_t    *mesg = (const time_t *) _mesg;
-    struct tm        *tm;
+    const time_t	*mesg = (const time_t *) _mesg;
+    struct tm		*tm;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -296,20 +296,20 @@ H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O_mtime_copy
+ * Function:	H5O_mtime_copy
  *
- * Purpose:    Copies a message from _MESG to _DEST, allocating _DEST if
- *        necessary.
+ * Purpose:	Copies a message from _MESG to _DEST, allocating _DEST if
+ *		necessary.
  *
- * Return:    Success:    Ptr to _DEST
+ * Return:	Success:	Ptr to _DEST
  *
- *        Failure:    NULL
+ *		Failure:	NULL
  *
- * Programmer:    Robb Matzke
- *        matzke@llnl.gov
- *        Jul 24 1998
+ * Programmer:	Robb Matzke
+ *		matzke@llnl.gov
+ *		Jul 24 1998
  *
  * Modifications:
  *
@@ -318,8 +318,8 @@ H5O_mtime_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
 static void *
 H5O_mtime_copy(const void *_mesg, void *_dest)
 {
-    const time_t    *mesg = (const time_t *) _mesg;
-    time_t        *dest = (time_t *) _dest;
+    const time_t	*mesg = (const time_t *) _mesg;
+    time_t		*dest = (time_t *) _dest;
     void                *ret_value = NULL;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
@@ -339,22 +339,22 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O_mtime_new_size
+ * Function:	H5O_mtime_new_size
  *
- * Purpose:    Returns the size of the raw message in bytes not
- *        counting the message type or size fields, but only the data
- *        fields.     This function doesn't take into account
- *        alignment.
+ * Purpose:	Returns the size of the raw message in bytes not
+ *		counting the message type or size fields, but only the data
+ *		fields.	 This function doesn't take into account
+ *		alignment.
  *
- * Return:    Success:    Message data size in bytes w/o alignment.
+ * Return:	Success:	Message data size in bytes w/o alignment.
  *
- *        Failure:    0
+ *		Failure:	0
  *
- * Programmer:    Quincey Koziol
- *        koziol@ncsa.uiuc.edu
- *        Jan  3 2002
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		Jan  3 2002
  *
  * Modifications:
  *
@@ -372,22 +372,22 @@ H5O_mtime_new_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disabl
     FUNC_LEAVE_NOAPI(8)
 } /* end H5O_mtime_new_size() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O_mtime_size
+ * Function:	H5O_mtime_size
  *
- * Purpose:    Returns the size of the raw message in bytes not
- *        counting the message type or size fields, but only the data
- *        fields.     This function doesn't take into account
- *        alignment.
+ * Purpose:	Returns the size of the raw message in bytes not
+ *		counting the message type or size fields, but only the data
+ *		fields.	 This function doesn't take into account
+ *		alignment.
  *
- * Return:    Success:    Message data size in bytes w/o alignment.
+ * Return:	Success:	Message data size in bytes w/o alignment.
  *
- *        Failure:    0
+ *		Failure:	0
  *
- * Programmer:    Robb Matzke
- *        matzke@llnl.gov
- *        Jul 14 1998
+ * Programmer:	Robb Matzke
+ *		matzke@llnl.gov
+ *		Jul 14 1998
  *
  * Modifications:
  *
@@ -405,15 +405,15 @@ H5O_mtime_size(const H5F_t H5_ATTR_UNUSED * f, hbool_t H5_ATTR_UNUSED disable_sh
     FUNC_LEAVE_NOAPI(16)
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O__mtime_free
+ * Function:	H5O__mtime_free
  *
- * Purpose:    Frees the message
+ * Purpose:	Frees the message
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Quincey Koziol
+ * Programmer:	Quincey Koziol
  *              Thursday, March 30, 2000
  *
  *-------------------------------------------------------------------------
@@ -430,17 +430,17 @@ H5O__mtime_free(void *mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__mtime_free() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:    H5O__mtime_debug
+ * Function:	H5O__mtime_debug
  *
- * Purpose:    Prints debugging info for the message.
+ * Purpose:	Prints debugging info for the message.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:	Non-negative on success/Negative on failure
  *
- * Programmer:    Robb Matzke
- *        matzke@llnl.gov
- *        Jul 24 1998
+ * Programmer:	Robb Matzke
+ *		matzke@llnl.gov
+ *		Jul 24 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -448,9 +448,9 @@ static herr_t
 H5O__mtime_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream,
     int indent, int fwidth)
 {
-    const time_t    *mesg = (const time_t *)_mesg;
-    struct tm        *tm;
-    char        buf[128];
+    const time_t	*mesg = (const time_t *)_mesg;
+    struct tm		*tm;
+    char		buf[128];
 
     FUNC_ENTER_STATIC_NOERR
 
diff --git a/src/H5Oname.c b/src/H5Oname.c
index dbfa710..1f20f10 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -25,10 +25,10 @@
 #include "H5Omodule.h"          /* This source code file is part of the H5O module */
 
 
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Opkg.h"             /* Object headers            */
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5MMprivate.h"	/* Memory management			*/
+#include "H5Opkg.h"             /* Object headers			*/
 
 
 /* PRIVATE PROTOTYPES */
@@ -43,29 +43,29 @@ static herr_t H5O__name_debug(H5F_t *f, const void *_mesg, FILE * stream,
 
 /* This message derives from H5O message class */
 const H5O_msg_class_t H5O_MSG_NAME[1] = {{
-    H5O_NAME_ID,                /*message id number             */
-    "name",                     /*message name for debugging    */
-    sizeof(H5O_name_t),         /*native message size           */
-    0,                /* messages are sharable?       */
-    H5O__name_decode,            /*decode message                */
-    H5O_name_encode,            /*encode message                */
-    H5O_name_copy,              /*copy the native value         */
-    H5O_name_size,              /*raw message size              */
-    H5O__name_reset,             /*free internal memory          */
-    NULL,            /* free method            */
-    NULL,                /* file delete method        */
-    NULL,            /* link method            */
-    NULL,            /*set share method        */
-    NULL,                /*can share method        */
-    NULL,            /* pre copy native value to file */
-    NULL,            /* copy native value to file    */
-    NULL,            /* post copy native value to file    */
-    NULL,            /* get creation index        */
-    NULL,            /* set creation index        */
-    H5O__name_debug             /*debug the message             */
+    H5O_NAME_ID,            	/*message id number             */
+    "name",                 	/*message name for debugging    */
+    sizeof(H5O_name_t),     	/*native message size           */
+    0,				/* messages are sharable?       */
+    H5O__name_decode,        	/*decode message                */
+    H5O_name_encode,        	/*encode message                */
+    H5O_name_copy,          	/*copy the native value         */
+    H5O_name_size,          	/*raw message size              */
+    H5O__name_reset,         	/*free internal memory          */
+    NULL,			/* free method			*/
+    NULL,		        /* file delete method		*/
+    NULL,			/* link method			*/
+    NULL,			/*set share method		*/
+    NULL,		    	/*can share method		*/
+    NULL,			/* pre copy native value to file */
+    NULL,			/* copy native value to file    */
+    NULL,			/* post copy native value to file    */
+    NULL,			/* get creation index		*/
+    NULL,			/* set creation index		*/
+    H5O__name_debug         	/*debug the message             */
 }};
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O__name_decode
  *
@@ -98,9 +98,9 @@ H5O__name_decode(H5F_t H5_ATTR_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh,
 
     /* decode */
     if(NULL == (mesg = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))))
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
     if(NULL == (mesg->s = (char *)H5MM_strdup((const char *)p)))
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Set return value */
     ret_value = mesg;
@@ -113,7 +113,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__name_decode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_encode
  *
@@ -147,7 +147,7 @@ H5O_name_encode(H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shared,
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_copy
  *
@@ -179,7 +179,7 @@ H5O_name_copy(const void *_mesg, void *_dest)
     HDassert(mesg);
 
     if(!dest && NULL == (dest = (H5O_name_t *)H5MM_calloc(sizeof(H5O_name_t))))
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* copy */
     *dest = *mesg;
@@ -197,7 +197,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_name_copy() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O_name_size
  *
@@ -235,7 +235,7 @@ H5O_name_size(const H5F_t H5_ATTR_UNUSED *f, hbool_t H5_ATTR_UNUSED disable_shar
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O__name_reset
  *
@@ -266,7 +266,7 @@ H5O__name_reset(void *_mesg)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__name_reset() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5O__name_debug
  *
@@ -286,7 +286,7 @@ static herr_t
 H5O__name_debug(H5F_t H5_ATTR_UNUSED *f, const void *_mesg, FILE *stream,
     int indent, int fwidth)
 {
-    const H5O_name_t    *mesg = (const H5O_name_t *)_mesg;
+    const H5O_name_t	*mesg = (const H5O_name_t *)_mesg;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index fb08f7d..16ea8e5 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -391,15 +391,15 @@ typedef struct H5O_chunk_proxy_t {
     H5O_t       *oh;                    /* Object header for this chunk */
     unsigned    chunkno;                /* Chunk number for this chunk */
 
-    /* Flush depencency parent information (not stored) 
+    /* Flush depencency parent information (not stored)
      *
-     * The following field is used to store a pointer 
+     * The following field is used to store a pointer
      * to the in-core representation of a new chunk proxy's flush dependency
      * parent -- if it exists.  If it does not exist, this field will
      * contain NULL.
      *
-     * If the file is opened in SWMR write mode, the flush dependency 
-     * parent of the chunk proxy will be either its object header 
+     * If the file is opened in SWMR write mode, the flush dependency
+     * parent of the chunk proxy will be either its object header
      * or the chunk with the continuation message that references this chunk.
      */
     void *fd_parent;                    /* Pointer to flush dependency parent */
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 40df939..57fa8dc 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -13,7 +13,7 @@
 
 /*
  * Programmer:    Robb Matzke <matzke@llnl.gov>
- *                Wednesday, April 15, 1998
+ *        Wednesday, April 15, 1998
  *
  * Purpose:    Data filter pipeline message.
  */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index ceaa96d..0be6d89 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -223,7 +223,7 @@ typedef struct H5O_copy_t {
 #define H5O_MDCI_MSG_ID 0x0018		/* Metadata Cache Image Message */
 #define H5O_UNKNOWN_ID  0x0019          /* Placeholder message ID for unknown message.  */
                                         /* (this should never exist in a file) */
-/* 
+/*
  * Note: Must increment H5O_MSG_TYPES in H5Opkg.h and update H5O_msg_class_g
  *      in H5O.c when creating a new message type.  Also bump the value of
  *      H5O_BOGUS_INVALID_ID, below, to be one greater than the value of
@@ -482,7 +482,7 @@ typedef struct H5O_storage_chunk_t {
     const struct H5D_chunk_ops_t *ops;  /* Pointer to chunked storage operations */
     union {
         H5O_storage_chunk_btree_t btree;   /* Information for v1 B-tree index   */
-        H5O_storage_chunk_bt2_t btree2;    /* Information for v2 B-tree index */	
+        H5O_storage_chunk_bt2_t btree2;    /* Information for v2 B-tree index */
         H5O_storage_chunk_earray_t earray; /* Information for extensible array index   */
         H5O_storage_chunk_farray_t farray; /* Information for fixed array index   */
         H5O_storage_chunk_single_filt_t single; /* Information for single chunk w/ filters index */
@@ -583,8 +583,8 @@ typedef struct H5O_storage_t {
 typedef struct H5O_layout_chunk_farray_t {
     /* Creation parameters for fixed array data structure */
     struct {
-        uint8_t max_dblk_page_nelmts_bits;  /* Log2(Max. # of elements in a data block page) - 
-                                               i.e. # of bits needed to store max. # of elements 
+        uint8_t max_dblk_page_nelmts_bits;  /* Log2(Max. # of elements in a data block page) -
+                                               i.e. # of bits needed to store max. # of elements
                                                in a data block page */
     } cparam;
 } H5O_layout_chunk_farray_t;
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index 32f6313..d0f8ab3 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -38,7 +38,7 @@
 #define H5O_COPY_SHALLOW_HIERARCHY_FLAG (0x0001u)   /* Copy only immediate members */
 #define H5O_COPY_EXPAND_SOFT_LINK_FLAG  (0x0002u)   /* Expand soft links into new objects */
 #define H5O_COPY_EXPAND_EXT_LINK_FLAG   (0x0004u)   /* Expand external links into new objects */
-#define H5O_COPY_EXPAND_REFERENCE_FLAG  (0x0008u)   /* Copy objects that are pointed by references */
+#define H5O_COPY_EXPAND_REFERENCE_FLAG	(0x0008u)   /* Copy objects that are pointed by references */
 #define H5O_COPY_WITHOUT_ATTR_FLAG      (0x0010u)   /* Copy object without copying attributes */
 #define H5O_COPY_PRESERVE_NULL_FLAG     (0x0020u)   /* Copy NULL messages (empty space) */
 #define H5O_COPY_MERGE_COMMITTED_DTYPE_FLAG (0x0040u)   /* Merge committed datatypes in dest file */
@@ -100,29 +100,29 @@
 
 /* Types of objects in file */
 typedef enum H5O_type_t {
-    H5O_TYPE_UNKNOWN = -1,    /* Unknown object type        */
-    H5O_TYPE_GROUP,            /* Object is a group        */
-    H5O_TYPE_DATASET,        /* Object is a dataset        */
-    H5O_TYPE_NAMED_DATATYPE,     /* Object is a named data type */
+    H5O_TYPE_UNKNOWN = -1,	/* Unknown object type		*/
+    H5O_TYPE_GROUP,	        /* Object is a group		*/
+    H5O_TYPE_DATASET,		/* Object is a dataset		*/
+    H5O_TYPE_NAMED_DATATYPE, 	/* Object is a named data type	*/
     H5O_TYPE_MAP,               /* Object is a map */
     H5O_TYPE_NTYPES             /* Number of different object types (must be last!) */
 } H5O_type_t;
 
 /* Information struct for object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx) */
 typedef struct H5O_hdr_info_t {
-    unsigned version;        /* Version number of header format in file */
-    unsigned nmesgs;        /* Number of object header messages */
-    unsigned nchunks;        /* Number of object header chunks */
+    unsigned version;		/* Version number of header format in file */
+    unsigned nmesgs;		/* Number of object header messages */
+    unsigned nchunks;		/* Number of object header chunks */
     unsigned flags;             /* Object header status flags */
     struct {
-        hsize_t total;        /* Total space for storing object header in file */
-        hsize_t meta;        /* Space within header for object header metadata information */
-        hsize_t mesg;        /* Space within header for actual message information */
-        hsize_t free;        /* Free space within object header */
+        hsize_t total;		/* Total space for storing object header in file */
+        hsize_t meta;		/* Space within header for object header metadata information */
+        hsize_t mesg;		/* Space within header for actual message information */
+        hsize_t free;		/* Free space within object header */
     } space;
     struct {
-        uint64_t present;    /* Flags to indicate presence of message type in header */
-        uint64_t shared;    /* Flags to indicate message type is shared in header */
+        uint64_t present;	/* Flags to indicate presence of message type in header */
+        uint64_t shared;	/* Flags to indicate message type is shared in header */
     } mesg;
 } H5O_hdr_info_t;
 
@@ -159,14 +159,15 @@ typedef herr_t (*H5O_iterate2_t)(hid_t obj, const char *name, const H5O_info2_t
     void *op_data);
 
 typedef enum H5O_mcdt_search_ret_t {
-    H5O_MCDT_SEARCH_ERROR = -1,    /* Abort H5Ocopy */
-    H5O_MCDT_SEARCH_CONT,    /* Continue the global search of all committed datatypes in the destination file */
-    H5O_MCDT_SEARCH_STOP    /* Stop the search, but continue copying.  The committed datatype will be copied but not merged. */
+    H5O_MCDT_SEARCH_ERROR = -1,	/* Abort H5Ocopy */
+    H5O_MCDT_SEARCH_CONT,	/* Continue the global search of all committed datatypes in the destination file */
+    H5O_MCDT_SEARCH_STOP	/* Stop the search, but continue copying.  The committed datatype will be copied but not merged. */
 } H5O_mcdt_search_ret_t;
 
 /* Callback to invoke when completing the search for a matching committed datatype from the committed dtype list */
 typedef H5O_mcdt_search_ret_t (*H5O_mcdt_search_cb_t)(void *op_data);
 
+
 /********************/
 /* Public Variables */
 /********************/
diff --git a/src/H5P.c b/src/H5P.c
index 09ff7f0..9bc293b 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -820,7 +820,7 @@ done:
     H5Pencode2
  PURPOSE
     Routine to convert the property values in a property list into a binary buffer.
-    The encoding of property values will be done according to the file format 
+    The encoding of property values will be done according to the file format
     setting in fapl_id.
  USAGE
     herr_t H5Pencode(plist_id, buf, nalloc, fapl_id)
@@ -878,7 +878,7 @@ done:
     Failure: H5I_INVALID_HID (negative)
  DESCRIPTION
      Decodes a property list from a binary buffer. The contents of the buffer
-     contain the values for the correponding properties of the plist. The decode 
+     contain the values for the correponding properties of the plist. The decode
      callback of a certain property decodes its value from the buffer and sets it
      in the property list.
  GLOBAL VARIABLES
diff --git a/src/H5PB.c b/src/H5PB.c
index 6c83217..45f24e3 100644
--- a/src/H5PB.c
+++ b/src/H5PB.c
@@ -166,7 +166,7 @@ H5FL_DEFINE_STATIC(H5PB_entry_t);
  *
  *-------------------------------------------------------------------------
  */
-herr_t 
+herr_t
 H5PB_reset_stats(H5PB_t *page_buf)
 {
     FUNC_ENTER_NOAPI_NOERR
@@ -208,7 +208,7 @@ H5PB_reset_stats(H5PB_t *page_buf)
  *
  *-------------------------------------------------------------------------
  */
-herr_t 
+herr_t
 H5PB_get_stats(const H5PB_t *page_buf, unsigned accesses[2], unsigned hits[2],
     unsigned misses[2], unsigned evictions[2], unsigned bypasses[2])
 {
@@ -517,9 +517,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5PB_add_new_page
  *
- * Purpose:	Add a new page to the new page skip list. This is called 
- *              from the MF layer when a new page is allocated to 
- *              indicate to the page buffer layer that a read of the page 
+ * Purpose:	Add a new page to the new page skip list. This is called
+ *              from the MF layer when a new page is allocated to
+ *              indicate to the page buffer layer that a read of the page
  *              from the file is not necessary since it's an empty page.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -577,9 +577,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5PB_update_entry
  *
- * Purpose:	In PHDF5, entries that are written by other processes and just 
- *              marked clean by this process have to have their corresponding 
- *              pages updated if they exist in the page buffer. 
+ * Purpose:	In PHDF5, entries that are written by other processes and just
+ *              marked clean by this process have to have their corresponding
+ *              pages updated if they exist in the page buffer.
  *              This routine checks and update the pages.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -588,7 +588,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-herr_t 
+herr_t
 H5PB_update_entry(H5PB_t *page_buf, haddr_t addr, size_t size, const void *buf)
 {
     H5PB_entry_t *page_entry;   /* Pointer to the corresponding page entry */
@@ -743,7 +743,7 @@ H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void *
                 page_buf->bypasses[0] ++;
         } /* end if */
 
-        /* If page buffering is disabled, or if this is a large metadata access, 
+        /* If page buffering is disabled, or if this is a large metadata access,
          * or if this is parallel raw data access, we are done here
          */
         if(NULL == page_buf || (size >= page_buf->page_size && H5FD_MEM_DRAW != type) ||
@@ -769,7 +769,7 @@ H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void *
         last_page_addr = ((addr + size - 1) / page_buf->page_size) * page_buf->page_size;
 
         /* How many pages does this write span */
-        num_touched_pages = (last_page_addr / page_buf->page_size + 1) - 
+        num_touched_pages = (last_page_addr / page_buf->page_size + 1) -
                 (first_page_addr / page_buf->page_size);
         if(first_page_addr == last_page_addr) {
             HDassert(1 == num_touched_pages);
@@ -822,7 +822,7 @@ H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void *
                         offset = addr - first_page_addr;
                         HDassert(page_buf->page_size > offset);
 
-                        H5MM_memcpy(buf, (uint8_t *)page_entry->page_buf_ptr + offset, 
+                        H5MM_memcpy(buf, (uint8_t *)page_entry->page_buf_ptr + offset,
                                  page_buf->page_size - (size_t)offset);
 
                         /* move to top of LRU list */
@@ -830,7 +830,7 @@ H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void *
                     } /* end if */
                     /* special handling for the last page if it is not a full page access */
                     else if(num_touched_pages > 1 && i == num_touched_pages-1 && search_addr < addr+size) {
-                        offset = (num_touched_pages-2)*page_buf->page_size + 
+                        offset = (num_touched_pages-2)*page_buf->page_size +
                             (page_buf->page_size - (addr - first_page_addr));
 
                         H5MM_memcpy((uint8_t *)buf + offset, page_entry->page_buf_ptr,
@@ -843,7 +843,7 @@ H5PB_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, void *
                     else {
                         offset = i*page_buf->page_size;
 
-                        H5MM_memcpy((uint8_t *)buf+(i*page_buf->page_size) , page_entry->page_buf_ptr, 
+                        H5MM_memcpy((uint8_t *)buf+(i*page_buf->page_size) , page_entry->page_buf_ptr,
                              page_buf->page_size);
                     } /* end else */
                 } /* end if */
@@ -1039,7 +1039,7 @@ H5PB_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr,
                 page_buf->bypasses[0]++;
         } /* end if */
 
-        /* If page buffering is disabled, or if this is a large metadata access, 
+        /* If page buffering is disabled, or if this is a large metadata access,
          * or if this is a parallel raw data access, we are done here
          */
         if(NULL == page_buf || (size >= page_buf->page_size && H5FD_MEM_DRAW != type) ||
@@ -1073,7 +1073,7 @@ H5PB_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr,
         last_page_addr = (addr + size - 1) / page_buf->page_size * page_buf->page_size;
 
         /* how many pages does this write span */
-        num_touched_pages = (last_page_addr/page_buf->page_size + 1) - 
+        num_touched_pages = (last_page_addr/page_buf->page_size + 1) -
             (first_page_addr / page_buf->page_size);
         if(first_page_addr == last_page_addr) {
             HDassert(1 == num_touched_pages);
@@ -1114,18 +1114,18 @@ H5PB_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr,
                 } /* end if */
             } /* end if */
             /* Special handling for the last page if it is not a full page update */
-            else if(num_touched_pages > 1 && i == (num_touched_pages - 1) && 
+            else if(num_touched_pages > 1 && i == (num_touched_pages - 1) &&
                     (search_addr + page_buf->page_size) != (addr + size)) {
                 HDassert(search_addr+page_buf->page_size > addr+size);
 
                 /* Lookup the page in the skip list */
                 page_entry = (H5PB_entry_t *)H5SL_search(page_buf->slist_ptr, (void *)(&search_addr));
                 if(page_entry) {
-                    offset = (num_touched_pages - 2) * page_buf->page_size + 
+                    offset = (num_touched_pages - 2) * page_buf->page_size +
                         (page_buf->page_size - (addr - first_page_addr));
 
                     /* Update page's data */
-                    H5MM_memcpy(page_entry->page_buf_ptr, (const uint8_t *)buf + offset, 
+                    H5MM_memcpy(page_entry->page_buf_ptr, (const uint8_t *)buf + offset,
                              (size_t)((addr + size) - last_page_addr));
 
                     /* Mark page dirty and push to top of LRU */
@@ -1313,7 +1313,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5PB__insert_entry()
  *
- * Purpose: ??? 
+ * Purpose: ???
  *
  *          This function was created without documentation.
  *          What follows is my best understanding of Mohamad's intent.
@@ -1334,7 +1334,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5PB__insert_entry(H5PB_t *page_buf, H5PB_entry_t *page_entry)
 {
     herr_t ret_value = SUCCEED;    /* Return value */
@@ -1399,7 +1399,7 @@ H5PB__make_space(H5F_shared_t *f_sh, H5PB_t *page_buf, H5FD_mem_t inserted_type)
 
         /* check the metadata threshold before evicting metadata items */
         while(1) {
-            if(page_entry->prev && H5F_MEM_PAGE_META == page_entry->type && 
+            if(page_entry->prev && H5F_MEM_PAGE_META == page_entry->type &&
                     page_buf->min_meta_count >= page_buf->meta_count)
                 page_entry = page_entry->prev;
             else
@@ -1416,7 +1416,7 @@ H5PB__make_space(H5F_shared_t *f_sh, H5PB_t *page_buf, H5FD_mem_t inserted_type)
 
         /* check the raw data threshold before evicting raw data items */
         while(1) {
-            if(page_entry->prev && (H5F_MEM_PAGE_DRAW == page_entry->type || H5F_MEM_PAGE_GHEAP == page_entry->type) && 
+            if(page_entry->prev && (H5F_MEM_PAGE_DRAW == page_entry->type || H5F_MEM_PAGE_GHEAP == page_entry->type) &&
                     page_buf->min_raw_count >= page_buf->raw_count)
                 page_entry = page_entry->prev;
             else
@@ -1461,7 +1461,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5PB__write_entry()
  *
- * Purpose: ??? 
+ * Purpose: ???
  *
  *          This function was created without documentation.
  *          What follows is my best understanding of Mohamad's intent.
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 7b98f1e..7e49c4b 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -246,30 +246,30 @@ static hbool_t H5P_dcrt_def_layout_init_g = FALSE;
 static herr_t
 H5P__dcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t  ret_value   = SUCCEED;         /* Return value */
 
     FUNC_ENTER_STATIC
 
     /* Register the storage layout property */
-    if(H5P__register_real(pclass, H5D_CRT_LAYOUT_NAME, H5D_CRT_LAYOUT_SIZE, &H5D_def_layout_g, 
+    if(H5P__register_real(pclass, H5D_CRT_LAYOUT_NAME, H5D_CRT_LAYOUT_SIZE, &H5D_def_layout_g,
             NULL, H5D_CRT_LAYOUT_SET, H5D_CRT_LAYOUT_GET, H5D_CRT_LAYOUT_ENC, H5D_CRT_LAYOUT_DEC,
             H5D_CRT_LAYOUT_DEL, H5D_CRT_LAYOUT_COPY, H5D_CRT_LAYOUT_CMP, H5D_CRT_LAYOUT_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the fill value property */
-    if(H5P__register_real(pclass, H5D_CRT_FILL_VALUE_NAME, H5D_CRT_FILL_VALUE_SIZE, &H5D_def_fill_g, 
+    if(H5P__register_real(pclass, H5D_CRT_FILL_VALUE_NAME, H5D_CRT_FILL_VALUE_SIZE, &H5D_def_fill_g,
             NULL, H5D_CRT_FILL_VALUE_SET, H5D_CRT_FILL_VALUE_GET, H5D_CRT_FILL_VALUE_ENC, H5D_CRT_FILL_VALUE_DEC,
             H5D_CRT_FILL_VALUE_DEL, H5D_CRT_FILL_VALUE_COPY, H5D_CRT_FILL_VALUE_CMP, H5D_CRT_FILL_VALUE_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the space allocation time state property */
-    if(H5P__register_real(pclass, H5D_CRT_ALLOC_TIME_STATE_NAME, H5D_CRT_ALLOC_TIME_STATE_SIZE, &H5D_def_alloc_time_state_g, 
+    if(H5P__register_real(pclass, H5D_CRT_ALLOC_TIME_STATE_NAME, H5D_CRT_ALLOC_TIME_STATE_SIZE, &H5D_def_alloc_time_state_g,
             NULL, NULL, NULL, H5D_CRT_ALLOC_TIME_STATE_ENC, H5D_CRT_ALLOC_TIME_STATE_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the external file list property */
-    if(H5P__register_real(pclass, H5D_CRT_EXT_FILE_LIST_NAME, H5D_CRT_EXT_FILE_LIST_SIZE, &H5D_def_efl_g, 
+    if(H5P__register_real(pclass, H5D_CRT_EXT_FILE_LIST_NAME, H5D_CRT_EXT_FILE_LIST_SIZE, &H5D_def_efl_g,
             NULL, H5D_CRT_EXT_FILE_LIST_SET, H5D_CRT_EXT_FILE_LIST_GET, H5D_CRT_EXT_FILE_LIST_ENC, H5D_CRT_EXT_FILE_LIST_DEC,
             H5D_CRT_EXT_FILE_LIST_DEL, H5D_CRT_EXT_FILE_LIST_COPY, H5D_CRT_EXT_FILE_LIST_CMP, H5D_CRT_EXT_FILE_LIST_CLOSE) < 0)
        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
@@ -1512,7 +1512,7 @@ H5P__dcrt_ext_file_list_dec(const void **_pp, void *_value)
         size_t len;
         if(efl->nused >= efl->nalloc) {
             size_t na = efl->nalloc + H5O_EFL_ALLOC;
-            H5O_efl_entry_t *x = (H5O_efl_entry_t *)H5MM_realloc(efl->slot, 
+            H5O_efl_entry_t *x = (H5O_efl_entry_t *)H5MM_realloc(efl->slot,
                                                                  na * sizeof(H5O_efl_entry_t));
             if(!x)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "memory allocation failed")
@@ -2222,7 +2222,7 @@ H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name,
     if((ent->psfn_nsubs == 0) && (ent->psdn_nsubs == 0)) {
         if(ent->parsed_source_file_name)
             ent->source_dset.file_name = ent->parsed_source_file_name->name_segment;
-        else 
+        else
             ent->source_dset.file_name = ent->source_file_name;
         if(ent->parsed_source_dset_name)
             ent->source_dset.dset_name = ent->parsed_source_dset_name->name_segment;
@@ -2342,7 +2342,7 @@ done:
  * Purpose:     Takes the dataset creation property list for the virtual
  *              dataset, dcpl_id, and the mapping index, index, and
  *              returns a dataspace identifier for the selection within
- *              the virtual dataset used in the mapping. 
+ *              the virtual dataset used in the mapping.
  *
  * Return:      Returns a dataspace identifier if successful; otherwise
  *              returns a negative value.
@@ -2400,7 +2400,7 @@ done:
  * Purpose:     Takes the dataset creation property list for the virtual
  *              dataset, dcpl_id, and the mapping index, index, and
  *              returns a dataspace identifier for the selection within
- *              the source dataset used in the mapping. 
+ *              the source dataset used in the mapping.
  *
  * Return:      Returns a dataspace identifier if successful; otherwise
  *              returns a negative value.
@@ -2504,7 +2504,7 @@ done:
  *              be the size in bytes of the filename.  That value, plus 1
  *              for a NULL terminator, is then assigned to size for a
  *              second H5Pget_virtual_filename call, which will retrieve
- *              the actual filename. 
+ *              the actual filename.
  *
  * Return:      Returns the length of the name if successful, otherwise
  *              returns a negative value.
@@ -2567,7 +2567,7 @@ done:
  *              be the size in bytes of the dataset name.  That value, plus 1
  *              for a NULL terminator, is then assigned to size for a
  *              second H5Pget_virtual_dsetname call, which will retrieve
- *              the actual dataset name. 
+ *              the actual dataset name.
  *
  * Return:      Returns the length of the name if successful, otherwise
  *              returns a negative value.
diff --git a/src/H5Pdeprec.c b/src/H5Pdeprec.c
index 1b5f581..b9efaee 100644
--- a/src/H5Pdeprec.c
+++ b/src/H5Pdeprec.c
@@ -563,9 +563,9 @@ H5Pset_file_space(hid_t plist_id, H5F_file_space_type_t strategy, hsize_t thresh
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid strategy")
     /*
      *  For 1.10.0 H5Pset_file_space:
-     *      If strategy is zero, the property is not changed; 
+     *      If strategy is zero, the property is not changed;
      *      the existing strategy is retained.
-     *      If threshold is zero, the property is not changed; 
+     *      If threshold is zero, the property is not changed;
      *      the existing threshold is retained.
      */
     if(!in_strategy)
@@ -579,7 +579,7 @@ H5Pset_file_space(hid_t plist_id, H5F_file_space_type_t strategy, hsize_t thresh
             new_persist = TRUE;
             new_threshold = in_threshold;
             break;
-    
+
         case H5F_FILE_SPACE_ALL:
             new_strategy = H5F_FSPACE_STRATEGY_FSM_AGGR;
             new_threshold = in_threshold;
@@ -592,7 +592,7 @@ H5Pset_file_space(hid_t plist_id, H5F_file_space_type_t strategy, hsize_t thresh
         case H5F_FILE_SPACE_VFD:
             new_strategy = H5F_FSPACE_STRATEGY_NONE;
             break;
-        
+
         case H5F_FILE_SPACE_NTYPES:
         case H5F_FILE_SPACE_DEFAULT:
         default:
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 9baa201..3f5754e 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -128,7 +128,7 @@
 #define H5D_MPIO_ACTUAL_IO_MODE_DEF     H5D_MPIO_NO_COLLECTIVE
 /* Definitions for cause of broken collective io property */
 #define H5D_MPIO_NO_COLLECTIVE_CAUSE_SIZE   sizeof(uint32_t)
-#define H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF   H5D_MPIO_COLLECTIVE 
+#define H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF   H5D_MPIO_COLLECTIVE
 
 /* Definitions for EDC property */
 #define H5D_XFER_EDC_SIZE           sizeof(H5Z_EDC_t)
@@ -245,7 +245,7 @@ static const unsigned H5D_def_mpio_chunk_opt_num_g = H5D_XFER_MPIO_CHUNK_OPT_NUM
 static const unsigned H5D_def_mpio_chunk_opt_ratio_g = H5D_XFER_MPIO_CHUNK_OPT_RATIO_DEF;
 static const H5D_mpio_actual_chunk_opt_mode_t H5D_def_mpio_actual_chunk_opt_mode_g = H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_DEF;
 static const H5D_mpio_actual_io_mode_t H5D_def_mpio_actual_io_mode_g = H5D_MPIO_ACTUAL_IO_MODE_DEF;
-static const H5D_mpio_no_collective_cause_t H5D_def_mpio_no_collective_cause_g = H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF; 
+static const H5D_mpio_no_collective_cause_t H5D_def_mpio_no_collective_cause_g = H5D_MPIO_NO_COLLECTIVE_CAUSE_DEF;
 static const H5Z_EDC_t H5D_def_enable_edc_g = H5D_XFER_EDC_DEF;            /* Default value for EDC property */
 static const H5Z_cb_t H5D_def_filter_cb_g = H5D_XFER_FILTER_CB_DEF;        /* Default value for filter callback */
 static const H5T_conv_cb_t H5D_def_conv_cb_g = H5D_XFER_CONV_CB_DEF;       /* Default value for datatype conversion callback */
@@ -271,96 +271,96 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_STATIC
 
     /* Register the max. temp buffer size property */
-    if(H5P__register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &H5D_def_max_temp_buf_g, 
+    if(H5P__register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &H5D_def_max_temp_buf_g,
             NULL, NULL, NULL, H5D_XFER_MAX_TEMP_BUF_ENC, H5D_XFER_MAX_TEMP_BUF_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the type conversion buffer property */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_XFER_TCONV_BUF_NAME, H5D_XFER_TCONV_BUF_SIZE, &H5D_def_tconv_buf_g, 
+    if(H5P__register_real(pclass, H5D_XFER_TCONV_BUF_NAME, H5D_XFER_TCONV_BUF_SIZE, &H5D_def_tconv_buf_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the background buffer property */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_XFER_BKGR_BUF_NAME, H5D_XFER_BKGR_BUF_SIZE, &H5D_def_bkgr_buf_g, 
+    if(H5P__register_real(pclass, H5D_XFER_BKGR_BUF_NAME, H5D_XFER_BKGR_BUF_SIZE, &H5D_def_bkgr_buf_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the background buffer type property */
-    if(H5P__register_real(pclass, H5D_XFER_BKGR_BUF_TYPE_NAME, H5D_XFER_BKGR_BUF_TYPE_SIZE, &H5D_def_bkgr_buf_type_g, 
+    if(H5P__register_real(pclass, H5D_XFER_BKGR_BUF_TYPE_NAME, H5D_XFER_BKGR_BUF_TYPE_SIZE, &H5D_def_bkgr_buf_type_g,
              NULL, NULL, NULL, H5D_XFER_BKGR_BUF_TYPE_ENC, H5D_XFER_BKGR_BUF_TYPE_DEC,
              NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the B-Tree node splitting ratios property */
-    if(H5P__register_real(pclass, H5D_XFER_BTREE_SPLIT_RATIO_NAME, H5D_XFER_BTREE_SPLIT_RATIO_SIZE, H5D_def_btree_split_ratio_g, 
+    if(H5P__register_real(pclass, H5D_XFER_BTREE_SPLIT_RATIO_NAME, H5D_XFER_BTREE_SPLIT_RATIO_SIZE, H5D_def_btree_split_ratio_g,
             NULL, NULL, NULL, H5D_XFER_BTREE_SPLIT_RATIO_ENC, H5D_XFER_BTREE_SPLIT_RATIO_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen allocation function property */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_XFER_VLEN_ALLOC_NAME, H5D_XFER_VLEN_ALLOC_SIZE, &H5D_def_vlen_alloc_g, 
+    if(H5P__register_real(pclass, H5D_XFER_VLEN_ALLOC_NAME, H5D_XFER_VLEN_ALLOC_SIZE, &H5D_def_vlen_alloc_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen allocation information property */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_XFER_VLEN_ALLOC_INFO_NAME, H5D_XFER_VLEN_ALLOC_INFO_SIZE, &H5D_def_vlen_alloc_info_g, 
+    if(H5P__register_real(pclass, H5D_XFER_VLEN_ALLOC_INFO_NAME, H5D_XFER_VLEN_ALLOC_INFO_SIZE, &H5D_def_vlen_alloc_info_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen free function property */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_XFER_VLEN_FREE_NAME, H5D_XFER_VLEN_FREE_SIZE, &H5D_def_vlen_free_g, 
+    if(H5P__register_real(pclass, H5D_XFER_VLEN_FREE_NAME, H5D_XFER_VLEN_FREE_SIZE, &H5D_def_vlen_free_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vlen free information property */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_XFER_VLEN_FREE_INFO_NAME, H5D_XFER_VLEN_FREE_INFO_SIZE, &H5D_def_vlen_free_info_g, 
+    if(H5P__register_real(pclass, H5D_XFER_VLEN_FREE_INFO_NAME, H5D_XFER_VLEN_FREE_INFO_SIZE, &H5D_def_vlen_free_info_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the vector size property */
-    if(H5P__register_real(pclass, H5D_XFER_HYPER_VECTOR_SIZE_NAME, H5D_XFER_HYPER_VECTOR_SIZE_SIZE, &H5D_def_hyp_vec_size_g, 
+    if(H5P__register_real(pclass, H5D_XFER_HYPER_VECTOR_SIZE_NAME, H5D_XFER_HYPER_VECTOR_SIZE_SIZE, &H5D_def_hyp_vec_size_g,
             NULL, NULL, NULL, H5D_XFER_HYPER_VECTOR_SIZE_ENC, H5D_XFER_HYPER_VECTOR_SIZE_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the I/O transfer mode properties */
-    if(H5P__register_real(pclass, H5D_XFER_IO_XFER_MODE_NAME, H5D_XFER_IO_XFER_MODE_SIZE, &H5D_def_io_xfer_mode_g, 
+    if(H5P__register_real(pclass, H5D_XFER_IO_XFER_MODE_NAME, H5D_XFER_IO_XFER_MODE_SIZE, &H5D_def_io_xfer_mode_g,
             NULL, NULL, NULL, H5D_XFER_IO_XFER_MODE_ENC, H5D_XFER_IO_XFER_MODE_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P__register_real(pclass, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE, &H5D_def_mpio_collective_opt_mode_g, 
+    if(H5P__register_real(pclass, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, H5D_XFER_MPIO_COLLECTIVE_OPT_SIZE, &H5D_def_mpio_collective_opt_mode_g,
             NULL, NULL, NULL, H5D_XFER_MPIO_COLLECTIVE_OPT_ENC, H5D_XFER_MPIO_COLLECTIVE_OPT_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P__register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE, &H5D_def_mpio_chunk_opt_mode_g, 
+    if(H5P__register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, H5D_XFER_MPIO_CHUNK_OPT_HARD_SIZE, &H5D_def_mpio_chunk_opt_mode_g,
             NULL, NULL, NULL, H5D_XFER_MPIO_CHUNK_OPT_HARD_ENC, H5D_XFER_MPIO_CHUNK_OPT_HARD_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P__register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE, &H5D_def_mpio_chunk_opt_num_g, 
+    if(H5P__register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, H5D_XFER_MPIO_CHUNK_OPT_NUM_SIZE, &H5D_def_mpio_chunk_opt_num_g,
             NULL, NULL, NULL, H5D_XFER_MPIO_CHUNK_OPT_NUM_ENC, H5D_XFER_MPIO_CHUNK_OPT_NUM_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
-    if(H5P__register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, H5D_XFER_MPIO_CHUNK_OPT_RATIO_SIZE, &H5D_def_mpio_chunk_opt_ratio_g, 
+    if(H5P__register_real(pclass, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, H5D_XFER_MPIO_CHUNK_OPT_RATIO_SIZE, &H5D_def_mpio_chunk_opt_ratio_g,
             NULL, NULL, NULL, H5D_XFER_MPIO_CHUNK_OPT_RATIO_ENC, H5D_XFER_MPIO_CHUNK_OPT_RATIO_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the chunk optimization mode property. */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_SIZE, &H5D_def_mpio_actual_chunk_opt_mode_g, 
+    if(H5P__register_real(pclass, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_NAME, H5D_MPIO_ACTUAL_CHUNK_OPT_MODE_SIZE, &H5D_def_mpio_actual_chunk_opt_mode_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the actual I/O mode property. */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5D_MPIO_ACTUAL_IO_MODE_NAME, H5D_MPIO_ACTUAL_IO_MODE_SIZE, &H5D_def_mpio_actual_io_mode_g, 
+    if(H5P__register_real(pclass, H5D_MPIO_ACTUAL_IO_MODE_NAME, H5D_MPIO_ACTUAL_IO_MODE_SIZE, &H5D_def_mpio_actual_io_mode_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -396,7 +396,7 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass)
 
     /* Register the data transform property */
     if(H5P__register_real(pclass, H5D_XFER_XFORM_NAME, H5D_XFER_XFORM_SIZE, &H5D_def_xfer_xform_g,
-            NULL, H5D_XFER_XFORM_SET, H5D_XFER_XFORM_GET, H5D_XFER_XFORM_ENC, H5D_XFER_XFORM_DEC, 
+            NULL, H5D_XFER_XFORM_SET, H5D_XFER_XFORM_GET, H5D_XFER_XFORM_ENC, H5D_XFER_XFORM_DEC,
             H5D_XFER_XFORM_DEL, H5D_XFER_XFORM_COPY, H5D_XFER_XFORM_CMP, H5D_XFER_XFORM_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -860,7 +860,7 @@ H5P__dxfr_xform_cmp(const void *_xform1, const void *_xform2, size_t H5_ATTR_UNU
 
     if(*xform1) {
         HDassert(*xform2);
-    
+
         /* Get the transform expressions */
         pexp1 = H5Z_xform_extract_xform_str(*xform1);
         pexp2 = H5Z_xform_extract_xform_str(*xform2);
@@ -1964,7 +1964,7 @@ H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, H5D_mpio_actual_chunk_opt_mode
 {
     H5P_genplist_t     *plist;
     herr_t ret_value = SUCCEED;   /* return value */
-    
+
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Do", plist_id, actual_chunk_opt_mode);
 
@@ -2000,7 +2000,7 @@ H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_
 {
     H5P_genplist_t     *plist;
     herr_t ret_value = SUCCEED;   /* return value */
-    
+
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*Di", plist_id, actual_io_mode);
 
@@ -2034,7 +2034,7 @@ H5Pget_mpio_no_collective_cause(hid_t plist_id, uint32_t *local_no_collective_ca
 {
     H5P_genplist_t     *plist;
     herr_t ret_value = SUCCEED;   /* return value */
-    
+
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "i*Iu*Iu", plist_id, local_no_collective_cause,
              global_no_collective_cause);
diff --git a/src/H5Pencdec.c b/src/H5Pencdec.c
index 2a07a67..d4b6b5f 100644
--- a/src/H5Pencdec.c
+++ b/src/H5Pencdec.c
@@ -687,7 +687,7 @@ done:
         on failure.
  DESCRIPTION
      Decodes a property list from a binary buffer. The contents of the buffer
-     contain the values for the correponding properties of the plist. The decode 
+     contain the values for the correponding properties of the plist. The decode
      callback of a certain property decodes its value from the buffer and sets it
      in the property list.
  GLOBAL VARIABLES
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 3668229..b157e5e 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -5789,7 +5789,7 @@ H5P__facc_vol_cmp(const void *_info1, const void *_info2, size_t H5_ATTR_UNUSED
 
     /* Set return value */
     ret_value = cmp_value;
-    
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5P__facc_vol_cmp() */
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 56af8b1..3b0ce66 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -212,38 +212,38 @@ H5P_fcrt_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register the user block size */
-    if(H5P__register_real(pclass, H5F_CRT_USER_BLOCK_NAME, H5F_CRT_USER_BLOCK_SIZE, &H5F_def_userblock_size_g, 
-            NULL, NULL, NULL, H5F_CRT_USER_BLOCK_ENC, H5F_CRT_USER_BLOCK_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_USER_BLOCK_NAME, H5F_CRT_USER_BLOCK_SIZE, &H5F_def_userblock_size_g,
+            NULL, NULL, NULL, H5F_CRT_USER_BLOCK_ENC, H5F_CRT_USER_BLOCK_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the 1/2 rank for symbol table leaf nodes */
-    if(H5P__register_real(pclass, H5F_CRT_SYM_LEAF_NAME, H5F_CRT_SYM_LEAF_SIZE, &H5F_def_sym_leaf_k_g, 
-            NULL, NULL, NULL, H5F_CRT_SYM_LEAF_ENC, H5F_CRT_SYM_LEAF_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_SYM_LEAF_NAME, H5F_CRT_SYM_LEAF_SIZE, &H5F_def_sym_leaf_k_g,
+            NULL, NULL, NULL, H5F_CRT_SYM_LEAF_ENC, H5F_CRT_SYM_LEAF_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the 1/2 rank for btree internal nodes */
-    if(H5P__register_real(pclass, H5F_CRT_BTREE_RANK_NAME, H5F_CRT_BTREE_RANK_SIZE, H5F_def_btree_k_g, 
-            NULL, NULL, NULL, H5F_CRT_BTREE_RANK_ENC, H5F_CRT_BTREE_RANK_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_BTREE_RANK_NAME, H5F_CRT_BTREE_RANK_SIZE, H5F_def_btree_k_g,
+            NULL, NULL, NULL, H5F_CRT_BTREE_RANK_ENC, H5F_CRT_BTREE_RANK_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the byte number for an address */
-    if(H5P__register_real(pclass, H5F_CRT_ADDR_BYTE_NUM_NAME, H5F_CRT_ADDR_BYTE_NUM_SIZE, &H5F_def_sizeof_addr_g, 
-            NULL, NULL, NULL, H5F_CRT_ADDR_BYTE_NUM_ENC, H5F_CRT_ADDR_BYTE_NUM_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_ADDR_BYTE_NUM_NAME, H5F_CRT_ADDR_BYTE_NUM_SIZE, &H5F_def_sizeof_addr_g,
+            NULL, NULL, NULL, H5F_CRT_ADDR_BYTE_NUM_ENC, H5F_CRT_ADDR_BYTE_NUM_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the byte number for object size */
-    if(H5P__register_real(pclass, H5F_CRT_OBJ_BYTE_NUM_NAME, H5F_CRT_OBJ_BYTE_NUM_SIZE, &H5F_def_sizeof_size_g, 
-            NULL, NULL, NULL, H5F_CRT_OBJ_BYTE_NUM_ENC, H5F_CRT_OBJ_BYTE_NUM_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_OBJ_BYTE_NUM_NAME, H5F_CRT_OBJ_BYTE_NUM_SIZE, &H5F_def_sizeof_size_g,
+            NULL, NULL, NULL, H5F_CRT_OBJ_BYTE_NUM_ENC, H5F_CRT_OBJ_BYTE_NUM_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the superblock version number */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5F_CRT_SUPER_VERS_NAME, H5F_CRT_SUPER_VERS_SIZE, &H5F_def_superblock_ver_g, 
+    if(H5P__register_real(pclass, H5F_CRT_SUPER_VERS_NAME, H5F_CRT_SUPER_VERS_SIZE, &H5F_def_superblock_ver_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -272,8 +272,8 @@ H5P_fcrt_reg_prop(H5P_genclass_t *pclass)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the file space handling strategy */
-    if(H5P__register_real(pclass, H5F_CRT_FILE_SPACE_STRATEGY_NAME, H5F_CRT_FILE_SPACE_STRATEGY_SIZE, &H5F_def_file_space_strategy_g, 
-            NULL, NULL, NULL, H5F_CRT_FILE_SPACE_STRATEGY_ENC, H5F_CRT_FILE_SPACE_STRATEGY_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_FILE_SPACE_STRATEGY_NAME, H5F_CRT_FILE_SPACE_STRATEGY_SIZE, &H5F_def_file_space_strategy_g,
+            NULL, NULL, NULL, H5F_CRT_FILE_SPACE_STRATEGY_ENC, H5F_CRT_FILE_SPACE_STRATEGY_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -284,8 +284,8 @@ H5P_fcrt_reg_prop(H5P_genclass_t *pclass)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the free space section threshold */
-    if(H5P__register_real(pclass, H5F_CRT_FREE_SPACE_THRESHOLD_NAME, H5F_CRT_FREE_SPACE_THRESHOLD_SIZE, &H5F_def_free_space_threshold_g, 
-            NULL, NULL, NULL, H5F_CRT_FREE_SPACE_THRESHOLD_ENC, H5F_CRT_FREE_SPACE_THRESHOLD_DEC, 
+    if(H5P__register_real(pclass, H5F_CRT_FREE_SPACE_THRESHOLD_NAME, H5F_CRT_FREE_SPACE_THRESHOLD_SIZE, &H5F_def_free_space_threshold_g,
+            NULL, NULL, NULL, H5F_CRT_FREE_SPACE_THRESHOLD_ENC, H5F_CRT_FREE_SPACE_THRESHOLD_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -1333,7 +1333,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5Pget_file_space_strategy
  *
- * Purpose:	Retrieves the strategy, persist, and threshold that the library 
+ * Purpose:	Retrieves the strategy, persist, and threshold that the library
  *          uses in managing file space.
  *
  * Return:	Non-negative on success/Negative on failure
diff --git a/src/H5Pfmpl.c b/src/H5Pfmpl.c
index 1e39749..41ad078 100644
--- a/src/H5Pfmpl.c
+++ b/src/H5Pfmpl.c
@@ -124,7 +124,7 @@ H5P_fmnt_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register property of whether symlinks is local to file */
-    if(H5P__register_real(pclass, H5F_MNT_SYM_LOCAL_NAME, H5F_MNT_SYM_LOCAL_SIZE, &H5F_def_local_g, 
+    if(H5P__register_real(pclass, H5F_MNT_SYM_LOCAL_NAME, H5F_MNT_SYM_LOCAL_SIZE, &H5F_def_local_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index e2fdcea..03874c8 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -133,13 +133,13 @@ H5P__gcrt_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_STATIC
 
     /* Register group info property */
-    if(H5P__register_real(pclass, H5G_CRT_GROUP_INFO_NAME, H5G_CRT_GROUP_INFO_SIZE, &H5G_def_ginfo_g, 
+    if(H5P__register_real(pclass, H5G_CRT_GROUP_INFO_NAME, H5G_CRT_GROUP_INFO_SIZE, &H5G_def_ginfo_g,
             NULL, NULL, NULL, H5G_CRT_GROUP_INFO_ENC, H5G_CRT_GROUP_INFO_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register link info property */
-    if(H5P__register_real(pclass, H5G_CRT_LINK_INFO_NAME, H5G_CRT_LINK_INFO_SIZE, &H5G_def_linfo_g, 
+    if(H5P__register_real(pclass, H5G_CRT_LINK_INFO_NAME, H5G_CRT_LINK_INFO_SIZE, &H5G_def_linfo_g,
             NULL, NULL, NULL, H5G_CRT_LINK_INFO_ENC, H5G_CRT_LINK_INFO_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
@@ -545,7 +545,7 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size)
 {
     const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)value; /* Create local aliases for values */
@@ -558,7 +558,7 @@ H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size)
         UINT16ENCODE(*pp, ginfo->max_compact)
         UINT16ENCODE(*pp, ginfo->min_dense)
         UINT16ENCODE(*pp, ginfo->est_num_entries)
-        UINT16ENCODE(*pp, ginfo->est_name_len)      
+        UINT16ENCODE(*pp, ginfo->est_name_len)
     } /* end if */
 
     *size += sizeof(uint16_t) * 4 + sizeof(uint32_t);
@@ -582,7 +582,7 @@ H5P__gcrt_group_info_enc(const void *value, void **_pp, size_t *size)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5P__gcrt_group_info_dec(const void **_pp, void *_value)
 {
     H5O_ginfo_t *ginfo = (H5O_ginfo_t *)_value;     /* Group info settings */
@@ -599,16 +599,16 @@ H5P__gcrt_group_info_dec(const void **_pp, void *_value)
     UINT16DECODE(*pp, ginfo->max_compact)
     UINT16DECODE(*pp, ginfo->min_dense)
     UINT16DECODE(*pp, ginfo->est_num_entries)
-    UINT16DECODE(*pp, ginfo->est_name_len)      
+    UINT16DECODE(*pp, ginfo->est_name_len)
 
     /* Update fields */
-    if(ginfo->max_compact != H5G_CRT_GINFO_MAX_COMPACT || 
+    if(ginfo->max_compact != H5G_CRT_GINFO_MAX_COMPACT ||
             ginfo->min_dense != H5G_CRT_GINFO_MIN_DENSE)
         ginfo->store_link_phase_change = TRUE;
     else
         ginfo->store_link_phase_change = FALSE;
 
-    if(ginfo->est_num_entries != H5G_CRT_GINFO_EST_NUM_ENTRIES || 
+    if(ginfo->est_num_entries != H5G_CRT_GINFO_EST_NUM_ENTRIES ||
             ginfo->est_name_len != H5G_CRT_GINFO_EST_NAME_LEN)
         ginfo->store_est_entry_info = TRUE;
     else
@@ -633,7 +633,7 @@ H5P__gcrt_group_info_dec(const void **_pp, void *_value)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size)
 {
     const H5O_linfo_t *linfo = (const H5O_linfo_t *)value; /* Create local aliases for values */
@@ -675,7 +675,7 @@ H5P__gcrt_link_info_enc(const void *value, void **_pp, size_t *size)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5P__gcrt_link_info_dec(const void **_pp, void *_value)
 {
     H5O_linfo_t *linfo = (H5O_linfo_t *)_value;  /* Link info settings */
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 0810427..3cefb64 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -111,7 +111,7 @@ static H5P_genprop_t *H5P__create_prop(const char *name, size_t size, H5P_prop_w
 static H5P_genprop_t *H5P__dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type);
 static herr_t H5P__free_prop(H5P_genprop_t *prop);
 static int H5P__cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2);
-static herr_t H5P__do_prop(H5P_genplist_t *plist, const char *name, H5P_do_plist_op_t plist_op, 
+static herr_t H5P__do_prop(H5P_genplist_t *plist, const char *name, H5P_do_plist_op_t plist_op,
     H5P_do_pclass_op_t pclass_op, void *udata);
 static int H5P__open_class_path_cb(void *_obj, hid_t H5_ATTR_UNUSED id, void *_key);
 static H5P_genprop_t *H5P__find_prop_pclass(H5P_genclass_t *pclass, const char *name);
@@ -1947,7 +1947,7 @@ done:
  PURPOSE
     Internal routine to register a new property in a property list class.
  USAGE
-    herr_t H5P__register_real(class, name, size, default, prp_create, prp_set, 
+    herr_t H5P__register_real(class, name, size, default, prp_create, prp_set,
                              prp_get, prp_close, prp_encode, prp_decode)
         H5P_genclass_t *class;  IN: Property list class to modify
         const char *name;       IN: Name of property to register
@@ -2081,7 +2081,7 @@ done:
 
         The 'encode' callback is called when a property list with this
     property is being encoded.  H5P_prp_encode_func_t is defined as:
-        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size, 
+        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size,
         void *value, void *plist, uint8_t **buf);
     where the parameters to the callback function are:
         void *f;            IN: A fake file structure used to encode.
@@ -2090,12 +2090,12 @@ done:
         void *plist;        IN: The property list structure.
         uint8_t **buf;      OUT: The buffer that holds the encoded property;
     The 'encode' routine returns the size needed to encode the property value
-    if the buffer passed in is NULL or the size is zero. Otherwise it encodes 
+    if the buffer passed in is NULL or the size is zero. Otherwise it encodes
     the property value into binary in buf.
 
         The 'decode' callback is called when a property list with this
     property is being decoded.  H5P_prp_encode_func_t is defined as:
-        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size, 
+        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size,
         void *value, void *plist, uint8_t **buf);
     where the parameters to the callback function are:
         void *f;            IN: A fake file structure used to decode.
@@ -2150,7 +2150,7 @@ H5P__register_real(H5P_genclass_t *pclass, const char *name, size_t size,
         HGOTO_ERROR(H5E_PLIST, H5E_EXISTS, FAIL, "property already exists")
 
     /* Create property object from parameters */
-    if(NULL == (new_prop = H5P__create_prop(name, size, H5P_PROP_WITHIN_CLASS, 
+    if(NULL == (new_prop = H5P__create_prop(name, size, H5P_PROP_WITHIN_CLASS,
             def_value, prp_create, prp_set, prp_get, prp_encode, prp_decode,
             prp_delete, prp_copy, prp_cmp, prp_close)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL,"Can't create property")
@@ -2259,7 +2259,7 @@ done:
 
         The 'encode' callback is called when a property list with this
     property is being encoded.  H5P_prp_encode_func_t is defined as:
-        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size, 
+        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size,
         void *value, void *plist, uint8_t **buf);
     where the parameters to the callback function are:
         void *f;            IN: A fake file structure used to encode.
@@ -2268,12 +2268,12 @@ done:
         void *plist;        IN: The property list structure.
         uint8_t **buf;      OUT: The buffer that holds the encoded property;
     The 'encode' routine returns the size needed to encode the property value
-    if the buffer passed in is NULL or the size is zero. Otherwise it encodes 
+    if the buffer passed in is NULL or the size is zero. Otherwise it encodes
     the property value into binary in buf.
 
         The 'decode' callback is called when a property list with this
     property is being decoded.  H5P_prp_encode_func_t is defined as:
-        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size, 
+        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size,
         void *value, void *plist, uint8_t **buf);
     where the parameters to the callback function are:
         void *f;            IN: A fake file structure used to decode.
@@ -2416,7 +2416,7 @@ H5P__register(H5P_genclass_t **ppclass, const char *name, size_t size,
     } /* end if */
 
     /* Really register the property in the class */
-    if(H5P__register_real(pclass, name, size, def_value, prp_create, prp_set, prp_get, 
+    if(H5P__register_real(pclass, name, size, def_value, prp_create, prp_set, prp_get,
             prp_encode, prp_decode, prp_delete, prp_copy, prp_cmp, prp_close) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "can't register property")
 
@@ -2439,7 +2439,7 @@ done:
  PURPOSE
     Internal routine to insert a new property in a property list.
  USAGE
-    herr_t H5P_insert(plist, name, size, value, prp_set, prp_get, prp_close, 
+    herr_t H5P_insert(plist, name, size, value, prp_set, prp_get, prp_close,
                       prp_encode, prp_decode)
         H5P_genplist_t *plist;  IN: Property list to add property to
         const char *name;       IN: Name of property to add
@@ -2500,7 +2500,7 @@ done:
 
         The 'encode' callback is called when a property list with this
     property is being encoded.  H5P_prp_encode_func_t is defined as:
-        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size, 
+        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size,
         void *value, void *plist, uint8_t **buf);
     where the parameters to the callback function are:
         void *f;            IN: A fake file structure used to encode.
@@ -2509,12 +2509,12 @@ done:
         void *plist;        IN: The property list structure.
         uint8_t **buf;      OUT: The buffer that holds the encoded property;
     The 'encode' routine returns the size needed to encode the property value
-    if the buffer passed in is NULL or the size is zero. Otherwise it encodes 
+    if the buffer passed in is NULL or the size is zero. Otherwise it encodes
     the property value into binary in buf.
 
         The 'decode' callback is called when a property list with this
     property is being decoded.  H5P_prp_encode_func_t is defined as:
-        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size, 
+        typedef herr_t (*H5P_prp_encode_func_t)(void *f, size_t *size,
         void *value, void *plist, uint8_t **buf);
     where the parameters to the callback function are:
         void *f;            IN: A fake file structure used to decode.
@@ -2653,8 +2653,8 @@ H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
     /* Ok to add to property list */
 
     /* Create property object from parameters */
-    if(NULL == (new_prop = H5P__create_prop(name, size, H5P_PROP_WITHIN_LIST, value, NULL, 
-            prp_set, prp_get, prp_encode, prp_decode, prp_delete, prp_copy, 
+    if(NULL == (new_prop = H5P__create_prop(name, size, H5P_PROP_WITHIN_LIST, value, NULL,
+            prp_set, prp_get, prp_encode, prp_decode, prp_delete, prp_copy,
             prp_cmp, prp_close)))
         HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "Can't create property")
 
@@ -2698,7 +2698,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5P__do_prop(H5P_genplist_t *plist, const char *name, H5P_do_plist_op_t plist_op, 
+H5P__do_prop(H5P_genplist_t *plist, const char *name, H5P_do_plist_op_t plist_op,
     H5P_do_pclass_op_t pclass_op, void *udata)
 {
     H5P_genclass_t *tclass;     /* Temporary class pointer */
@@ -2780,7 +2780,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5P__poke_plist_cb(H5P_genplist_t H5_ATTR_NDEBUG_UNUSED *plist, const char H5_ATTR_NDEBUG_UNUSED *name, 
+H5P__poke_plist_cb(H5P_genplist_t H5_ATTR_NDEBUG_UNUSED *plist, const char H5_ATTR_NDEBUG_UNUSED *name,
     H5P_genprop_t *prop, void *_udata)
 {
     H5P_prop_set_ud_t *udata = (H5P_prop_set_ud_t *)_udata;    /* User data for callback */
@@ -3149,7 +3149,7 @@ done:
  COMMENTS, BUGS, ASSUMPTIONS
         The 'get' callback routine registered for this property will _NOT_ be
     called, this routine is designed for internal library use only!
-    
+
         This routine may not be called for zero-sized properties and will
     return an error in that case.
  EXAMPLES
@@ -3203,7 +3203,7 @@ done:
  COMMENTS, BUGS, ASSUMPTIONS
         The 'set' callback routine registered for this property will _NOT_ be
     called, this routine is designed for internal library use only!
-    
+
         This routine may not be called for zero-sized properties and will
     return an error in that case.
 
@@ -4396,7 +4396,7 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5P__peek_cb(H5P_genplist_t H5_ATTR_NDEBUG_UNUSED *plist, const char H5_ATTR_NDEBUG_UNUSED *name, 
+H5P__peek_cb(H5P_genplist_t H5_ATTR_NDEBUG_UNUSED *plist, const char H5_ATTR_NDEBUG_UNUSED *name,
     H5P_genprop_t *prop, void *_udata)
 {
     H5P_prop_get_ud_t *udata = (H5P_prop_get_ud_t *)_udata;    /* User data for callback */
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 6e582fb..3d00c12 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -194,39 +194,39 @@ H5P__lacc_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_STATIC
 
     /* Register property for number of links traversed */
-    if(H5P__register_real(pclass, H5L_ACS_NLINKS_NAME, H5L_ACS_NLINKS_SIZE, &H5L_def_nlinks_g, 
+    if(H5P__register_real(pclass, H5L_ACS_NLINKS_NAME, H5L_ACS_NLINKS_SIZE, &H5L_def_nlinks_g,
             NULL, NULL, NULL, H5L_ACS_NLINKS_ENC, H5L_ACS_NLINKS_DEC,
             NULL, NULL, NULL, NULL) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external link prefix */
-    if(H5P__register_real(pclass, H5L_ACS_ELINK_PREFIX_NAME, H5L_ACS_ELINK_PREFIX_SIZE, &H5L_def_elink_prefix_g, 
+    if(H5P__register_real(pclass, H5L_ACS_ELINK_PREFIX_NAME, H5L_ACS_ELINK_PREFIX_SIZE, &H5L_def_elink_prefix_g,
             NULL, H5L_ACS_ELINK_PREFIX_SET, H5L_ACS_ELINK_PREFIX_GET, H5L_ACS_ELINK_PREFIX_ENC, H5L_ACS_ELINK_PREFIX_DEC,
             H5L_ACS_ELINK_PREFIX_DEL, H5L_ACS_ELINK_PREFIX_COPY, H5L_ACS_ELINK_PREFIX_CMP, H5L_ACS_ELINK_PREFIX_CLOSE) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register fapl for link access */
-    if(H5P__register_real(pclass, H5L_ACS_ELINK_FAPL_NAME, H5L_ACS_ELINK_FAPL_SIZE, &H5L_def_fapl_id_g, 
+    if(H5P__register_real(pclass, H5L_ACS_ELINK_FAPL_NAME, H5L_ACS_ELINK_FAPL_SIZE, &H5L_def_fapl_id_g,
              NULL, H5L_ACS_ELINK_FAPL_SET, H5L_ACS_ELINK_FAPL_GET, H5L_ACS_ELINK_FAPL_ENC, H5L_ACS_ELINK_FAPL_DEC,
              H5L_ACS_ELINK_FAPL_DEL, H5L_ACS_ELINK_FAPL_COPY, H5L_ACS_ELINK_FAPL_CMP, H5L_ACS_ELINK_FAPL_CLOSE) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external link file access flags */
-    if(H5P__register_real(pclass, H5L_ACS_ELINK_FLAGS_NAME, H5L_ACS_ELINK_FLAGS_SIZE, &H5L_def_elink_flags_g, 
+    if(H5P__register_real(pclass, H5L_ACS_ELINK_FLAGS_NAME, H5L_ACS_ELINK_FLAGS_SIZE, &H5L_def_elink_flags_g,
              NULL, NULL, NULL, H5L_ACS_ELINK_FLAGS_ENC, H5L_ACS_ELINK_FLAGS_DEC,
              NULL, NULL, NULL, NULL) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for external link file traversal callback */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5L_ACS_ELINK_CB_NAME, H5L_ACS_ELINK_CB_SIZE, &H5L_def_elink_cb_g, 
+    if(H5P__register_real(pclass, H5L_ACS_ELINK_CB_NAME, H5L_ACS_ELINK_CB_SIZE, &H5L_def_elink_cb_g,
              NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
 #ifdef H5_HAVE_PARALLEL
     /* Register the metadata collective read flag */
-    if(H5P__register_real(pclass, H5_COLL_MD_READ_FLAG_NAME, H5L_ACS_COLL_MD_READ_SIZE, &H5L_def_coll_md_read_g, 
-            NULL, NULL, NULL, H5L_ACS_COLL_MD_READ_ENC, H5L_ACS_COLL_MD_READ_DEC, 
+    if(H5P__register_real(pclass, H5_COLL_MD_READ_FLAG_NAME, H5L_ACS_COLL_MD_READ_SIZE, &H5L_def_coll_md_read_g,
+            NULL, NULL, NULL, H5L_ACS_COLL_MD_READ_ENC, H5L_ACS_COLL_MD_READ_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 #endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c
index 5079548..fc1a3b9 100644
--- a/src/H5Plcpl.c
+++ b/src/H5Plcpl.c
@@ -48,6 +48,7 @@
 #define H5L_CRT_INTERMEDIATE_GROUP_ENC          H5P__encode_unsigned
 #define H5L_CRT_INTERMEDIATE_GROUP_DEC          H5P__decode_unsigned
 
+
 /******************/
 /* Local Typedefs */
 /******************/
@@ -118,12 +119,12 @@ static const unsigned H5L_def_intmd_group_g = H5L_CRT_INTERMEDIATE_GROUP_DEF;
 herr_t
 H5P_lcrt_reg_prop(H5P_genclass_t *pclass)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t              ret_value   = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Register create intermediate groups property */
-    if(H5P__register_real(pclass, H5L_CRT_INTERMEDIATE_GROUP_NAME, H5L_CRT_INTERMEDIATE_GROUP_SIZE, &H5L_def_intmd_group_g, 
+    if(H5P__register_real(pclass, H5L_CRT_INTERMEDIATE_GROUP_NAME, H5L_CRT_INTERMEDIATE_GROUP_SIZE, &H5L_def_intmd_group_g,
             NULL, NULL, NULL, H5L_CRT_INTERMEDIATE_GROUP_ENC, H5L_CRT_INTERMEDIATE_GROUP_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index 2dc92f9..7390cae 100644
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -64,7 +64,7 @@
 #define H5O_CPY_MERGE_COMM_DT_LIST_CLOSE       H5P__ocpy_merge_comm_dt_list_close
 /* Definitions for callback function when completing the search for a matching committed datatype from the committed dtype list */
 #define H5O_CPY_MCDT_SEARCH_CB_SIZE           sizeof(H5O_mcdt_cb_info_t)
-#define H5O_CPY_MCDT_SEARCH_CB_DEF            {NULL,NULL} 
+#define H5O_CPY_MCDT_SEARCH_CB_DEF            {NULL,NULL}
 
 
 /******************/
@@ -161,20 +161,20 @@ H5P__ocpy_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_STATIC
 
     /* Register copy options property */
-    if(H5P__register_real(pclass, H5O_CPY_OPTION_NAME, H5O_CPY_OPTION_SIZE, &H5O_def_ocpy_option_g, 
+    if(H5P__register_real(pclass, H5O_CPY_OPTION_NAME, H5O_CPY_OPTION_SIZE, &H5O_def_ocpy_option_g,
             NULL, NULL, NULL, H5O_CPY_OPTION_ENC, H5O_CPY_OPTION_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register merge named dtype list property */
-    if(H5P__register_real(pclass, H5O_CPY_MERGE_COMM_DT_LIST_NAME, H5O_CPY_MERGE_COMM_DT_LIST_SIZE, &H5O_def_merge_comm_dtype_list_g, 
+    if(H5P__register_real(pclass, H5O_CPY_MERGE_COMM_DT_LIST_NAME, H5O_CPY_MERGE_COMM_DT_LIST_SIZE, &H5O_def_merge_comm_dtype_list_g,
             NULL, H5O_CPY_MERGE_COMM_DT_LIST_SET, H5O_CPY_MERGE_COMM_DT_LIST_GET, H5O_CPY_MERGE_COMM_DT_LIST_ENC, H5O_CPY_MERGE_COMM_DT_LIST_DEC,
             H5O_CPY_MERGE_COMM_DT_LIST_DEL, H5O_CPY_MERGE_COMM_DT_LIST_COPY, H5O_CPY_MERGE_COMM_DT_LIST_CMP, H5O_CPY_MERGE_COMM_DT_LIST_CLOSE) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register property for callback when completing the search for a matching named datatype from the named dtype list */
     /* (Note: this property should not have an encode/decode callback -QAK) */
-    if(H5P__register_real(pclass, H5O_CPY_MCDT_SEARCH_CB_NAME, H5O_CPY_MCDT_SEARCH_CB_SIZE, &H5O_def_mcdt_cb_g, 
+    if(H5P__register_real(pclass, H5O_CPY_MCDT_SEARCH_CB_NAME, H5O_CPY_MCDT_SEARCH_CB_SIZE, &H5O_def_mcdt_cb_g,
             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -421,7 +421,7 @@ H5P__ocpy_merge_comm_dt_list_enc(const void *value, void **_pp, size_t *size)
  *
  *-------------------------------------------------------------------------
  */
-static herr_t 
+static herr_t
 H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *_value)
 {
     H5O_copy_dtype_merge_list_t **dt_list = (H5O_copy_dtype_merge_list_t **)_value;        /* Pointer to merge named datatype list */
@@ -439,7 +439,7 @@ H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *_value)
 
     /* Start off with NULL (default value) */
     *dt_list = NULL;
-    
+
     /* Decode the string sequence */
     len = HDstrlen(*(const char **)pp);
     while(len > 0) {
@@ -469,7 +469,7 @@ H5P__ocpy_merge_comm_dt_list_dec(const void **_pp, void *_value)
     /* Advance past terminator for string sequence */
     *pp += 1;
 
-done: 
+done:
     if(ret_value < 0) {
         *dt_list = H5P__free_merge_comm_dtype_list(*dt_list);
         if(tmp_dt_list) {
@@ -874,7 +874,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_mcdt_search_cb
  *
- * Purpose:     Retrieves the callback function and user data from the specified 
+ * Purpose:     Retrieves the callback function and user data from the specified
  *		object copy property list.
  *
  * Usage:       H5Pget_mcdt_search_cb(plist_id, H5O_mcdt_search_cb_t *func, void **op_data)
@@ -905,7 +905,7 @@ H5Pget_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t *func, void **op_data
     /* Get callback info */
     if(H5P_get(plist, H5O_CPY_MCDT_SEARCH_CB_NAME, &cb_info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get callback info")
-    
+
     if(func)
 	*func = cb_info.func;
 
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c
index 45343c6..97d6119 100644
--- a/src/H5Pstrcpl.c
+++ b/src/H5Pstrcpl.c
@@ -130,7 +130,7 @@ H5P__strcrt_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_STATIC
 
     /* Register character encoding */
-    if(H5P__register_real(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE, &H5P_def_char_encoding_g, 
+    if(H5P__register_real(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE, &H5P_def_char_encoding_g,
             NULL, NULL, NULL, H5P_STRCRT_CHAR_ENCODING_ENC, H5P_STRCRT_CHAR_ENCODING_DEC,
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
diff --git a/src/H5Rint.c b/src/H5Rint.c
index 131336b..30f3dbb 100644
--- a/src/H5Rint.c
+++ b/src/H5Rint.c
@@ -157,7 +157,7 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
 /* Flag indicating "top" of interface has been initialized */
 static hbool_t H5R_top_package_initialize_s = FALSE;
 
-
+
 /*--------------------------------------------------------------------------
 NAME
    H5R__init_package -- Initialize interface-specific information
@@ -184,7 +184,7 @@ H5R__init_package(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5R__init_package() */
 
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5R_top_term_package
@@ -206,7 +206,7 @@ H5R__init_package(void)
 int
 H5R_top_term_package(void)
 {
-    int	n = 0;
+    int    n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -218,7 +218,7 @@ H5R_top_term_package(void)
     FUNC_LEAVE_NOAPI(n)
 } /* end H5R_top_term_package() */
 
-
+
 /*--------------------------------------------------------------------------
  NAME
     H5R_term_package
@@ -242,7 +242,7 @@ H5R_top_term_package(void)
 int
 H5R_term_package(void)
 {
-    int	n = 0;
+    int    n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -258,7 +258,7 @@ H5R_term_package(void)
     FUNC_LEAVE_NOAPI(n)
 } /* end H5R_term_package() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__create_object
  *
@@ -299,7 +299,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__create_object() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__create_region
  *
@@ -350,7 +350,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5R__create_region */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__create_attr
  *
@@ -404,7 +404,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5R__create_attr */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__destroy
  *
@@ -469,7 +469,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__destroy() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__set_loc_id
  *
@@ -514,7 +514,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__set_loc_id() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__get_loc_id
  *
@@ -538,7 +538,7 @@ H5R__get_loc_id(const H5R_ref_priv_t *ref)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__get_loc_id() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__reopen_file
  *
@@ -607,7 +607,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__reopen_file() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__get_type
  *
@@ -631,7 +631,7 @@ H5R__get_type(const H5R_ref_priv_t *ref)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__get_type() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__equal
  *
@@ -696,7 +696,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__equal() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__copy
  *
@@ -762,7 +762,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__copy() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__get_obj_token
  *
@@ -795,7 +795,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__get_obj_token() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__set_obj_token
  *
@@ -825,7 +825,7 @@ H5R__set_obj_token(H5R_ref_priv_t *ref, const H5O_token_t *obj_token,
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__set_obj_token() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__get_region
  *
@@ -856,7 +856,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__get_region() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__get_file_name
  *
@@ -898,7 +898,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__get_file_name() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__get_attr_name
  *
@@ -936,7 +936,7 @@ H5R__get_attr_name(const H5R_ref_priv_t *ref, char *buf, size_t size)
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__get_attr_name() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode
  *
@@ -1034,7 +1034,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__encode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode
  *
@@ -1127,7 +1127,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__decode() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode_obj_token
  *
@@ -1162,7 +1162,7 @@ H5R__encode_obj_token(const H5O_token_t *obj_token, size_t token_size,
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__encode_obj_token() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_obj_token
  *
@@ -1207,7 +1207,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__decode_obj_token() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode_region
  *
@@ -1256,7 +1256,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__encode_region() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_region
  *
@@ -1312,7 +1312,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__decode_region() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode_string
  *
@@ -1354,7 +1354,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__encode_string() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_string
  *
@@ -1401,7 +1401,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__decode_string() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode_heap
  *
@@ -1442,7 +1442,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__encode_heap() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_heap
  *
@@ -1489,7 +1489,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__decode_heap() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__free_heap
  *
@@ -1534,7 +1534,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__free_heap() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_token_compat
  *
@@ -1606,7 +1606,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__decode_token_compat() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode_token_obj_compat
  *
@@ -1637,7 +1637,7 @@ H5R__encode_token_obj_compat(const H5O_token_t *obj_token, size_t token_size,
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5R__encode_token_obj_compat() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_token_obj_compat
  *
@@ -1672,7 +1672,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5R__decode_token_obj_compat() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__encode_token_region_compat
  *
@@ -1748,7 +1748,7 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5R__encode_token_region_compat() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    H5R__decode_token_region_compat
  *
diff --git a/src/H5SM.c b/src/H5SM.c
index 290e575..6eea80d 100644
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -57,7 +57,7 @@ static herr_t H5SM__create_index(H5F_t *f, H5SM_index_header_t *header);
 static herr_t H5SM__delete_index(H5F_t *f, H5SM_index_header_t *header,
     hbool_t delete_heap);
 static haddr_t H5SM__create_list(H5F_t *f, H5SM_index_header_t *header);
-static herr_t H5SM__find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key, 
+static herr_t H5SM__find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key,
     size_t *empty_pos, size_t *list_pos);
 static herr_t H5SM__convert_list_to_btree(H5F_t * f, H5SM_index_header_t * header,
     H5SM_list_t **_list, H5HF_t *fheap, H5O_t *open_oh);
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 6d0f2b0..7f243a6 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -59,16 +59,16 @@
 static herr_t H5SM__cache_table_get_initial_load_size(void *udata, size_t *image_len);
 static htri_t H5SM__cache_table_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5SM__cache_table_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5SM__cache_table_image_len(const void *thing, size_t *image_len);
 static herr_t H5SM__cache_table_serialize(const H5F_t *f, void *image,
-    size_t len, void *thing); 
+    size_t len, void *thing);
 static herr_t H5SM__cache_table_free_icr(void *thing);
 
 static herr_t H5SM__cache_list_get_initial_load_size(void *udata, size_t *image_len);
 static htri_t H5SM__cache_list_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
 static void *H5SM__cache_list_deserialize(const void *image, size_t len,
-    void *udata, hbool_t *dirty); 
+    void *udata, hbool_t *dirty);
 static herr_t H5SM__cache_list_image_len(const void *thing, size_t *image_len);
 static herr_t H5SM__cache_list_serialize(const H5F_t *f, void *image,
     size_t len, void *thing);
@@ -129,7 +129,7 @@ const H5AC_class_t H5AC_SOHM_LIST[1] = {{
 /*-------------------------------------------------------------------------
  * Function:    H5SM__cache_table_get_initial_load_size()
  *
- * Purpose:	Return the size of the master table of Shared Object Header 
+ * Purpose:	Return the size of the master table of Shared Object Header
  *		Message indexes on disk.
  *
  * Return:      Success:        SUCCEED
@@ -198,9 +198,9 @@ H5SM__cache_table_verify_chksum(const void *_image, size_t len, void H5_ATTR_UNU
 /*-------------------------------------------------------------------------
  * Function:    H5SM__cache_table_deserialize
  *
- * Purpose:	Given a buffer containing the on disk representation of the 
+ * Purpose:	Given a buffer containing the on disk representation of the
  *		master table of Shared Object Header Message indexes, deserialize
- *		the table, copy the contents into a newly allocated instance of 
+ *		the table, copy the contents into a newly allocated instance of
  *		H5SM_master_table_t, and return a pointer to the new instance.
  *
  * Return:      Success:        Pointer to in core representation
@@ -212,7 +212,7 @@ H5SM__cache_table_verify_chksum(const void *_image, size_t len, void H5_ATTR_UNU
  *-------------------------------------------------------------------------
  */
 static void *
-H5SM__cache_table_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, 
+H5SM__cache_table_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len,
     void *_udata, hbool_t H5_ATTR_UNUSED *dirty)
 {
     H5F_t		   *f;                  /* File pointer -- from user data */
@@ -264,7 +264,7 @@ H5SM__cache_table_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l
     /* Read in the index headers */
     for(u = 0; u < table->num_indexes; ++u) {
         /* Verify correct version of index list */
-        if(H5SM_LIST_VERSION != *image++) 
+        if(H5SM_LIST_VERSION != *image++)
             HGOTO_ERROR(H5E_SOHM, H5E_VERSION, NULL, "bad shared message list version number")
 
         /* Type of the index (list or B-tree) */
@@ -555,8 +555,8 @@ H5SM__cache_list_verify_chksum(const void *_image, size_t H5_ATTR_UNUSED len, vo
 /*-------------------------------------------------------------------------
  * Function:    H5SM__cache_list_deserialize
  *
- * Purpose:	Given a buffer containing the on disk image of a list of 
- *		SOHM message, deserialize the list, load it into a newly allocated 
+ * Purpose:	Given a buffer containing the on disk image of a list of
+ *		SOHM message, deserialize the list, load it into a newly allocated
  *		instance of H5SM_list_t, and return a pointer to same.
  *
  * Return:      Success:        Pointer to in core representation
@@ -568,7 +568,7 @@ H5SM__cache_list_verify_chksum(const void *_image, size_t H5_ATTR_UNUSED len, vo
  *-------------------------------------------------------------------------
  */
 static void *
-H5SM__cache_list_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len, 
+H5SM__cache_list_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len,
     void *_udata, hbool_t H5_ATTR_UNUSED *dirty)
 {
     H5SM_list_t          *list = NULL;     /* The SOHM list being read in */
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 77fb582..8290ae2 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -675,7 +675,7 @@ H5S__all_deserialize(H5S_t **space, const uint8_t **p)
     HDassert(*p);
 
     /* As part of the efforts to push all selection-type specific coding
-       to the callbacks, the coding for the allocation of a null dataspace 
+       to the callbacks, the coding for the allocation of a null dataspace
        is moved from H5S_select_deserialize() in H5Sselect.c.
        This is needed for decoding virtual layout in H5O__layout_decode() */
 
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 6397f4b..33dd492 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -899,7 +899,7 @@ if(H5DEBUG(S))
 
         /* Calculate start and extent values of this dimension */
         /* Check if value overflow to cast to type MPI_Aint */
-        if(d[i].start > LONG_MAX || offset[i] > LONG_MAX || elmt_size > LONG_MAX) 
+        if(d[i].start > LONG_MAX || offset[i] > LONG_MAX || elmt_size > LONG_MAX)
             HGOTO_ERROR(H5E_DATASET, H5E_BADVALUE, FAIL, "result overflow")
 	    start_disp = (MPI_Aint)d[i].start * (MPI_Aint)offset[i] * (MPI_Aint)elmt_size;
 
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index f7c5ae7..1ca79ea 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -47,7 +47,7 @@
 #define H5S_SEL_ITER_SHARE_WITH_DATASPACE 0x0002 /* Don't copy the dataspace
                                                  * selection when creating the
                                                  * selection iterator.
-                                                 * 
+                                                 *
                                                  * This can improve performance
                                                  * of creating the iterator, but
                                                  * the dataspace _MUST_NOT_ be
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 9814e38..e433dc1 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -3036,7 +3036,7 @@ done:
     Retrieve a list of offset / length pairs (a list of "sequences") matching
     the selected elements for an iterator, according to the iteration order for
     the iterator.  The lengths returned are in _bytes_, not elements.
-    
+
     Note that the iteration order for "all" and "hyperslab" selections is
     row-major (i.e. "C-ordered"), but the iteration order for "point"
     selections is "in order selected", unless the H5S_SEL_ITER_GET_SEQ_LIST_SORTED
diff --git a/src/H5TS.c b/src/H5TS.c
index 98eba41..3643ed5 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -179,7 +179,7 @@ H5TS_thread_id(void)
 
     /* An ID is *not* already assigned: reuse an ID that's on the
      * free list, or else generate a new ID.
-     * 
+     *
      * Allocating memory while holding a mutex is bad form, so
      * point `tid` at `proto_tid` if we need to allocate some
      * memory.
@@ -292,7 +292,7 @@ herr_t
 H5TS_mutex_lock(H5TS_mutex_t *mutex)
 {
 #ifdef  H5_HAVE_WIN_THREADS
-    EnterCriticalSection( &mutex->CriticalSection); 
+    EnterCriticalSection( &mutex->CriticalSection);
     return 0;
 #else /* H5_HAVE_WIN_THREADS */
     herr_t ret_value = pthread_mutex_lock(&mutex->atomic_lock);
@@ -313,7 +313,7 @@ H5TS_mutex_lock(H5TS_mutex_t *mutex)
         mutex->lock_count = 1;
     }
 
-    return pthread_mutex_unlock(&mutex->atomic_lock); 
+    return pthread_mutex_unlock(&mutex->atomic_lock);
 #endif /* H5_HAVE_WIN_THREADS */
 }
 
@@ -344,7 +344,7 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
 #ifdef  H5_HAVE_WIN_THREADS
     /* Releases ownership of the specified critical section object. */
     LeaveCriticalSection(&mutex->CriticalSection);
-    return 0; 
+    return 0;
 #else  /* H5_HAVE_WIN_THREADS */
     herr_t ret_value = pthread_mutex_lock(&mutex->atomic_lock);
 
@@ -363,7 +363,7 @@ H5TS_mutex_unlock(H5TS_mutex_t *mutex)
             ret_value = err;
     } /* end if */
 
-    return ret_value; 
+    return ret_value;
 #endif /* H5_HAVE_WIN_THREADS */
 } /* H5TS_mutex_unlock */
 
@@ -400,15 +400,15 @@ H5TS_cancel_count_inc(void)
     return SUCCEED;
 #else /* H5_HAVE_WIN_THREADS */
     H5TS_cancel_t *cancel_counter;
-    herr_t ret_value = SUCCEED; 
+    herr_t ret_value = SUCCEED;
 
-    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g); 
+    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g);
 
     if (!cancel_counter) {
         /*
          * First time thread calls library - create new counter and associate
          * with key.
-         * 
+         *
          * Don't use H5MM calls here since the destructor has to use HDfree in
          * order to avoid codestack calls.
          */
@@ -429,7 +429,7 @@ H5TS_cancel_count_inc(void)
 
     ++cancel_counter->cancel_count;
 
-    return ret_value; 
+    return ret_value;
 #endif /* H5_HAVE_WIN_THREADS */
 }
 
@@ -459,19 +459,19 @@ H5TS_cancel_count_inc(void)
 herr_t
 H5TS_cancel_count_dec(void)
 {
-#ifdef  H5_HAVE_WIN_THREADS 
+#ifdef  H5_HAVE_WIN_THREADS
     /* unsupported; will just return 0 */
     return SUCCEED;
 #else /* H5_HAVE_WIN_THREADS */
-    register H5TS_cancel_t *cancel_counter; 
+    register H5TS_cancel_t *cancel_counter;
     herr_t ret_value = SUCCEED;
 
-    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g); 
+    cancel_counter = (H5TS_cancel_t *)H5TS_get_thread_local_value(H5TS_cancel_key_g);
 
     if (cancel_counter->cancel_count == 1)
         ret_value = pthread_setcancelstate(cancel_counter->previous_state, NULL);
 
-    --cancel_counter->cancel_count; 
+    --cancel_counter->cancel_count;
 
     return ret_value;
 #endif /* H5_HAVE_WIN_THREADS */
@@ -491,7 +491,7 @@ H5TS_cancel_count_dec(void)
  *
  *--------------------------------------------------------------------------
  */
-H5_DLL BOOL CALLBACK 
+H5_DLL BOOL CALLBACK
 H5TS_win32_process_enter(PINIT_ONCE InitOnce, PVOID Parameter, PVOID *lpContex)
 {
     BOOL ret_value = TRUE;
@@ -653,7 +653,7 @@ H5TS_create_thread(void *(*func)(void *), H5TS_attr_t *attr, void *udata)
 {
     H5TS_thread_t ret_value;
 
-#ifdef  H5_HAVE_WIN_THREADS 
+#ifdef  H5_HAVE_WIN_THREADS
 
     /* When calling C runtime functions, you should use _beginthread or
      * _beginthreadex instead of CreateThread.  Threads created with
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 7d26af3..bb660c2 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -1084,7 +1084,7 @@ H5T_update_shared(H5T_t *dt)
 /*-------------------------------------------------------------------------
  * Function:    H5T_construct_datatype
  *
- * Purpose:     Create a Library datatype with a connector specific datatype object 
+ * Purpose:     Create a Library datatype with a connector specific datatype object
  *
  * Return:      Success:    A type structure
  *              Failure:    NULL
@@ -1156,7 +1156,7 @@ H5T_get_named_type(const H5T_t *dt)
  * Function:    H5T_get_actual_type
  *
  * Purpose:     Returns underlying native datatype created by native connector
- *              if datatype is committed, otherwise return the datatype 
+ *              if datatype is committed, otherwise return the datatype
  *              object associate with the ID.
  *
  * Return:      Success:    Pointer to the VOL-managed data for this datatype
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 2b1283e..06eb44e 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -2157,7 +2157,7 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
             if(H5T_COMPOUND != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
-            if(H5T_COMPOUND != dst->shared->type) 
+            if(H5T_COMPOUND != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
 
             if(H5T_conv_struct_init(src, dst, cdata) < 0)
@@ -2385,7 +2385,7 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             if(H5T_COMPOUND != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
-            if(H5T_COMPOUND != dst->shared->type) 
+            if(H5T_COMPOUND != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_COMPOUND datatype")
 
             /* Initialize data which is relatively constant */
@@ -2648,14 +2648,14 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
      * that array are the index numbers in the destination type or negative
      * if the entry is unused.
      *
-     * (This optimized algorithm doesn't work when the byte orders are different.  
+     * (This optimized algorithm doesn't work when the byte orders are different.
      * The code such as "n = *((int*)(src->shared->u.enumer.value+i*src->shared->size));"
      * can change the value significantly. i.g. if the source value is big-endian 0x0000000f,
      * executing the casting on little-endian machine will get a big number 0x0f000000.
-     * Then it can't meet the condition 
+     * Then it can't meet the condition
      * "if(src->shared->u.enumer.nmembs<2 || (double)length/src->shared->u.enumer.nmembs<1.2)"
-     * Because this is the optimized code, we won't fix it. It should still work in some 
-     * situations. SLU - 2011/5/24) 
+     * Because this is the optimized code, we won't fix it. It should still work in some
+     * situations. SLU - 2011/5/24)
      */
     if(1 == src->shared->size || sizeof(short) == src->shared->size || sizeof(int) == src->shared->size) {
 	for(i = 0; i < src->shared->u.enumer.nmembs; i++) {
@@ -2763,7 +2763,7 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a datatype")
             if(H5T_ENUM != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
-            if(H5T_ENUM != dst->shared->type) 
+            if(H5T_ENUM != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
 
             if(H5T_conv_enum_init(src, dst, cdata) < 0)
@@ -2790,7 +2790,7 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
             if(H5T_ENUM != src->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
-            if(H5T_ENUM != dst->shared->type) 
+            if(H5T_ENUM != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_ENUM datatype")
 
             /* priv->src2dst map was computed for certain sort keys. Make sure those same
@@ -2830,10 +2830,10 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                     /* Use O(1) lookup */
                     /* (The casting won't work when the byte orders are different. i.g. if the source value
                      * is big-endian 0x0000000f, the direct casting "n = *((int*)s);" will make it a big
-                     * number 0x0f000000 on little-endian machine. But we won't fix it because it's an 
+                     * number 0x0f000000 on little-endian machine. But we won't fix it because it's an
                      * optimization code. Please also see the comment in the H5T_conv_enum_init() function.
                      * SLU - 2011/5/24)
-                     */ 
+                     */
                     if(1 == src->shared->size)
                         n = *((signed char*)s);
                     else if(sizeof(short) == src->shared->size)
@@ -2912,9 +2912,9 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5T__conv_enum_numeric
  *
- * Purpose:	Converts enumerated data to a numeric type (integer or 
- *              floating-point number). This function is registered into 
- *              the conversion table twice in H5T_init_interface in H5T.c.  
+ * Purpose:	Converts enumerated data to a numeric type (integer or
+ *              floating-point number). This function is registered into
+ *              the conversion table twice in H5T_init_interface in H5T.c.
  *              Once for enum-integer conversion. Once for enum-float conversion.
  *
  * Return:	Success:	Non-negative
@@ -2966,7 +2966,7 @@ H5T__conv_enum_numeric(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t ne
             if(NULL == (tpath = H5T_path_find(src_parent, dst))) {
                 HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest datatype")
             } else if(!H5T_path_noop(tpath)) {
-                if((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) < 0) 
+                if((src_parent_id = H5I_register(H5I_DATATYPE, H5T_copy(src_parent, H5T_COPY_ALL), FALSE)) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion")
 
                 /* Convert the data */
@@ -3059,7 +3059,7 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
             if(H5T_VLEN != dst->shared->type)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "not a H5T_VLEN datatype")
             if(H5T_VLEN_STRING == src->shared->u.vlen.type && H5T_VLEN_STRING == dst->shared->u.vlen.type) {
-                if((H5T_CSET_ASCII == src->shared->u.vlen.cset && H5T_CSET_UTF8 == dst->shared->u.vlen.cset) 
+                if((H5T_CSET_ASCII == src->shared->u.vlen.cset && H5T_CSET_UTF8 == dst->shared->u.vlen.cset)
                         || (H5T_CSET_ASCII == dst->shared->u.vlen.cset && H5T_CSET_UTF8 == src->shared->u.vlen.cset))
                     HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "The library doesn't convert between strings of ASCII and UTF")
             } /* end if */
@@ -4701,7 +4701,7 @@ H5T__conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad source character set")
             if(H5T_CSET_ASCII != dst->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 != dst->shared->u.atomic.u.s.cset)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad destination character set")
-            if((H5T_CSET_ASCII == src->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 == dst->shared->u.atomic.u.s.cset) 
+            if((H5T_CSET_ASCII == src->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 == dst->shared->u.atomic.u.s.cset)
                     || (H5T_CSET_ASCII == dst->shared->u.atomic.u.s.cset && H5T_CSET_UTF8 == src->shared->u.atomic.u.s.cset))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "The library doesn't convert between strings of ASCII and UTF")
             if(src->shared->u.atomic.u.s.pad < 0 || src->shared->u.atomic.u.s.pad >= H5T_NSTR ||
diff --git a/src/H5Torder.c b/src/H5Torder.c
index 62662d6..b4babfa 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -86,7 +86,7 @@ static herr_t H5T_set_order(H5T_t *dtype, H5T_order_t order);
  *
  * Programmer:	Robb Matzke
  *		Wednesday, January  7, 1998
- * 
+ *
  *-------------------------------------------------------------------------
  */
 H5T_order_t
@@ -159,7 +159,7 @@ H5T_get_order(const H5T_t *dtype)
                 if(memb_order != H5T_ORDER_NONE && ret_value == H5T_ORDER_NONE)
                     ret_value = memb_order;
 
-                /* If the orders are mixed, stop the loop and report it.  
+                /* If the orders are mixed, stop the loop and report it.
                  * (H5T_ORDER_NONE is ignored)
                  */
                 if(memb_order != H5T_ORDER_NONE && ret_value != H5T_ORDER_NONE
@@ -186,7 +186,7 @@ done:
  *		2. H5T_ORDER_NONE only works for reference and fixed-length
  *			string.
  *		3. For opaque type, the order will be ignored.
- *		4. For compound type, all restrictions above apply to the 
+ *		4. For compound type, all restrictions above apply to the
  *			members.
  *
  * Return:	Non-negative on success/Negative on failure
@@ -246,12 +246,12 @@ H5T_set_order(H5T_t *dtype, H5T_order_t order)
     if(H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined")
 
-    /* For derived data type, defer to parent */ 
+    /* For derived data type, defer to parent */
     while(dtype->shared->parent)
         dtype = dtype->shared->parent;
 
     /* Check for setting order on inappropriate datatype */
-    if(order == H5T_ORDER_NONE && !(H5T_REFERENCE == dtype->shared->type || 
+    if(order == H5T_ORDER_NONE && !(H5T_REFERENCE == dtype->shared->type ||
             H5T_OPAQUE == dtype->shared->type || H5T_IS_FIXED_STRING(dtype->shared)))
 	HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "illegal byte order for type")
 
diff --git a/src/H5UC.c b/src/H5UC.c
index 2277818..dd61539 100644
--- a/src/H5UC.c
+++ b/src/H5UC.c
@@ -16,7 +16,7 @@
  *
  * These are used for various internal buffers which are shared.
  *
- * The module used to be H5RC, but changed to H5UC because of 
+ * The module used to be H5RC, but changed to H5UC because of
  * conflicting requirement for the use of H5RC.
  *
  */
diff --git a/src/H5UCprivate.h b/src/H5UCprivate.h
index c451f31..e4916df 100644
--- a/src/H5UCprivate.h
+++ b/src/H5UCprivate.h
@@ -13,7 +13,7 @@
 
 /*
  * This file contains private information about the H5UC module
- * The module used to be H5RC, but changed to H5UC because of 
+ * The module used to be H5RC, but changed to H5UC because of
  * conflicting requirement for the use of H5RC.
  */
 
diff --git a/src/H5VLnative_attr.c b/src/H5VLnative_attr.c
index e54c49f..16d3527 100644
--- a/src/H5VLnative_attr.c
+++ b/src/H5VLnative_attr.c
@@ -49,7 +49,7 @@ H5VL__native_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const c
 {
     H5G_loc_t       loc;                /* Object location */
     H5G_loc_t       obj_loc;            /* Location used to open group */
-    hbool_t         loc_found = FALSE;  
+    hbool_t         loc_found = FALSE;
     H5T_t           *type, *dt;         /* Datatype to use for attribute */
     H5S_t           *space;             /* Dataspace to use for attribute */
     H5A_t           *attr = NULL;
@@ -89,7 +89,7 @@ H5VL__native_attr_create(void *obj, const H5VL_loc_params_t *loc_params, const c
 done:
     /* Release resources */
     if(loc_found && H5G_loc_free(&obj_loc) < 0)
-        HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, NULL, "can't free location") 
+        HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, NULL, "can't free location")
 
    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5VL__native_attr_create() */
@@ -106,7 +106,7 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5VL__native_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name, 
+H5VL__native_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const char *attr_name,
     hid_t H5_ATTR_UNUSED aapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5G_loc_t    loc;             /* Object location */
@@ -134,9 +134,9 @@ H5VL__native_attr_open(void *obj, const H5VL_loc_params_t *loc_params, const cha
     else if(loc_params->type == H5VL_OBJECT_BY_IDX) {
         /* H5Aopen_by_idx */
         /* Open the attribute in the object header */
-        if(NULL == (attr = H5A__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name, 
-                                           loc_params->loc_data.loc_by_idx.idx_type, 
-                                           loc_params->loc_data.loc_by_idx.order, 
+        if(NULL == (attr = H5A__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name,
+                                           loc_params->loc_data.loc_by_idx.idx_type,
+                                           loc_params->loc_data.loc_by_idx.order,
                                            loc_params->loc_data.loc_by_idx.n)))
             HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, NULL, "unable to open attribute")
     } /* end else-if */
@@ -279,15 +279,15 @@ H5VL__native_attr_get(void *obj, H5VL_attr_get_t get_type,
                 }
                 else if(H5VL_OBJECT_BY_IDX == loc_params->type) {
                     H5G_loc_t loc;
-                    
+
                     /* check arguments */
                     if(H5G_loc_real(obj, loc_params->obj_type, &loc) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
 
                     /* Open the attribute on the object header */
-                    if(NULL == (attr = H5A__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name, 
-                                                       loc_params->loc_data.loc_by_idx.idx_type, 
-                                                       loc_params->loc_data.loc_by_idx.order, 
+                    if(NULL == (attr = H5A__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name,
+                                                       loc_params->loc_data.loc_by_idx.idx_type,
+                                                       loc_params->loc_data.loc_by_idx.order,
                                                        loc_params->loc_data.loc_by_idx.n)))
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
@@ -326,7 +326,7 @@ H5VL__native_attr_get(void *obj, H5VL_attr_get_t get_type,
                 else if(H5VL_OBJECT_BY_NAME == loc_params->type) {
                     char *attr_name = HDva_arg(arguments, char *);
                     H5G_loc_t loc;
-                    
+
                     /* check arguments */
                     if(H5G_loc_real(obj, loc_params->obj_type, &loc) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
@@ -345,15 +345,15 @@ H5VL__native_attr_get(void *obj, H5VL_attr_get_t get_type,
                 }
                 else if(H5VL_OBJECT_BY_IDX == loc_params->type) {
                     H5G_loc_t loc;
-                    
+
                     /* check arguments */
                     if(H5G_loc_real(obj, loc_params->obj_type, &loc) < 0)
                         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
 
                     /* Open the attribute on the object header */
-                    if(NULL == (attr = H5A__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name, 
-                                                       loc_params->loc_data.loc_by_idx.idx_type, 
-                                                       loc_params->loc_data.loc_by_idx.order, 
+                    if(NULL == (attr = H5A__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name,
+                                                       loc_params->loc_data.loc_by_idx.idx_type,
+                                                       loc_params->loc_data.loc_by_idx.order,
                                                        loc_params->loc_data.loc_by_idx.n)))
                         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
@@ -400,7 +400,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_attr_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_attr_specific_t specific_type, 
+H5VL__native_attr_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_attr_specific_t specific_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5G_loc_t   loc;
diff --git a/src/H5VLnative_dataset.c b/src/H5VLnative_dataset.c
index 8660e80..3f62e00 100644
--- a/src/H5VLnative_dataset.c
+++ b/src/H5VLnative_dataset.c
@@ -108,7 +108,7 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5VL__native_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, 
+H5VL__native_dataset_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name,
     hid_t dapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5D_t       *dset = NULL;
@@ -316,7 +316,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_dataset_specific(void *obj, H5VL_dataset_specific_t specific_type, 
+H5VL__native_dataset_specific(void *obj, H5VL_dataset_specific_t specific_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5D_t       *dset = (H5D_t *)obj;
@@ -328,7 +328,7 @@ H5VL__native_dataset_specific(void *obj, H5VL_dataset_specific_t specific_type,
         /* H5Dspecific_space */
         case H5VL_DATASET_SET_EXTENT:
             { /* H5Dset_extent (H5Dextend - deprecated) */
-                const hsize_t *size = HDva_arg(arguments, const hsize_t *); 
+                const hsize_t *size = HDva_arg(arguments, const hsize_t *);
 
                 if(H5D__set_extent(dset, size) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extent of dataset")
diff --git a/src/H5VLnative_datatype.c b/src/H5VLnative_datatype.c
index 3c9463d..1e9d739 100644
--- a/src/H5VLnative_datatype.c
+++ b/src/H5VLnative_datatype.c
@@ -112,7 +112,7 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5VL__native_datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, 
+H5VL__native_datatype_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name,
     hid_t H5_ATTR_UNUSED tapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5T_t       *type = NULL;           /* Datatype opened in file */
@@ -147,7 +147,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_datatype_get(void *obj, H5VL_datatype_get_t get_type, 
+H5VL__native_datatype_get(void *obj, H5VL_datatype_get_t get_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5T_t       *dt = (H5T_t *)obj;
@@ -199,7 +199,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_datatype_specific(void *obj, H5VL_datatype_specific_t specific_type, 
+H5VL__native_datatype_specific(void *obj, H5VL_datatype_specific_t specific_type,
                              hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5T_t       *dt = (H5T_t *)obj;
diff --git a/src/H5VLnative_file.c b/src/H5VLnative_file.c
index 1f213dd..5275898 100644
--- a/src/H5VLnative_file.c
+++ b/src/H5VLnative_file.c
@@ -44,7 +44,7 @@
  *-------------------------------------------------------------------------
  */
 void *
-H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, 
+H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5F_t *new_file = NULL;
@@ -60,7 +60,7 @@ H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t
         flags |= H5F_ACC_EXCL;              /* default */
     flags |= H5F_ACC_RDWR | H5F_ACC_CREAT;
 
-    /* Create the file */ 
+    /* Create the file */
     if(NULL == (new_file = H5F_open(name, flags, fcpl_id, fapl_id)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to create file")
     new_file->id_exists = TRUE;
@@ -68,7 +68,7 @@ H5VL__native_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t
     ret_value = (void *)new_file;
 
 done:
-    if(NULL == ret_value && new_file) 
+    if(NULL == ret_value && new_file)
         if(H5F__close(new_file) < 0)
             HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "problems closing file")
 
@@ -95,7 +95,7 @@ H5VL__native_file_open(const char *name, unsigned flags, hid_t fapl_id,
 
     FUNC_ENTER_PACKAGE
 
-    /* Open the file */ 
+    /* Open the file */
     if(NULL == (new_file = H5F_open(name, flags, H5P_FILE_CREATE_DEFAULT, fapl_id)))
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file")
     new_file->id_exists = TRUE;
@@ -561,7 +561,7 @@ H5VL__native_file_optional(void *obj, H5VL_file_optional_t optional_type,
                 uint32_t cur_num_entries;
 
                 /* Go get the size data */
-                if(H5AC_get_cache_size(f->shared->cache, max_size_ptr, min_clean_size_ptr, 
+                if(H5AC_get_cache_size(f->shared->cache, max_size_ptr, min_clean_size_ptr,
                                        cur_size_ptr, &cur_num_entries) < 0)
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.")
 
diff --git a/src/H5VLnative_group.c b/src/H5VLnative_group.c
index 3fdb2d9..13864ab 100644
--- a/src/H5VLnative_group.c
+++ b/src/H5VLnative_group.c
@@ -65,7 +65,7 @@ H5VL__native_group_create(void *obj, const H5VL_loc_params_t *loc_params, const
 
         /* Create the new group & get its ID */
         if(NULL == (grp = H5G__create(loc.oloc->file, &gcrt_info)))
-            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group")            
+            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group")
     } /* end if */
     /* otherwise it's from H5Gcreate */
     else {
@@ -107,7 +107,7 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5VL__native_group_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name, 
+H5VL__native_group_open(void *obj, const H5VL_loc_params_t *loc_params, const char *name,
     hid_t H5_ATTR_UNUSED gapl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5G_loc_t       loc;                /* Location to open group   */
@@ -216,7 +216,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_group_specific(void *obj, H5VL_group_specific_t specific_type, 
+H5VL__native_group_specific(void *obj, H5VL_group_specific_t specific_type,
                              hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5G_t       *grp = (H5G_t *)obj;
diff --git a/src/H5VLnative_link.c b/src/H5VLnative_link.c
index 051de19..ceb8d61 100644
--- a/src/H5VLnative_link.c
+++ b/src/H5VLnative_link.c
@@ -75,7 +75,7 @@ H5VL__native_link_create(H5VL_link_create_type_t create_type, void *obj,
                         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.")
 
                     /* Create the link */
-                    if((ret_value = H5L_create_hard(cur_loc_p, cur_params->loc_data.loc_by_name.name, 
+                    if((ret_value = H5L_create_hard(cur_loc_p, cur_params->loc_data.loc_by_name.name,
                                                     link_loc_p, loc_params->loc_data.loc_by_name.name, lcpl_id)) < 0)
                         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
                 } /* end if */
@@ -136,7 +136,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_link_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, 
+H5VL__native_link_copy(void *src_obj, const H5VL_loc_params_t *loc_params1,
     void *dst_obj, const H5VL_loc_params_t *loc_params2, hid_t lcpl_id,
     hid_t H5_ATTR_UNUSED lapl_id, hid_t H5_ATTR_UNUSED dxpl_id,
     void H5_ATTR_UNUSED **req)
@@ -161,8 +161,8 @@ H5VL__native_link_copy(void *src_obj, const H5VL_loc_params_t *loc_params1,
         dst_loc_p = src_loc_p;
 
     /* Copy the link */
-    if(H5L_move(src_loc_p, loc_params1->loc_data.loc_by_name.name, 
-                dst_loc_p, loc_params2->loc_data.loc_by_name.name, 
+    if(H5L_move(src_loc_p, loc_params1->loc_data.loc_by_name.name,
+                dst_loc_p, loc_params2->loc_data.loc_by_name.name,
                 TRUE, lcpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTCOPY, FAIL, "unable to copy link")
 
@@ -181,7 +181,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_link_move(void *src_obj, const H5VL_loc_params_t *loc_params1, 
+H5VL__native_link_move(void *src_obj, const H5VL_loc_params_t *loc_params1,
     void *dst_obj, const H5VL_loc_params_t *loc_params2, hid_t lcpl_id,
     hid_t H5_ATTR_UNUSED lapl_id, hid_t H5_ATTR_UNUSED dxpl_id,
     void H5_ATTR_UNUSED **req)
@@ -206,8 +206,8 @@ H5VL__native_link_move(void *src_obj, const H5VL_loc_params_t *loc_params1,
         dst_loc_p = src_loc_p;
 
     /* Move the link */
-    if(H5L_move(src_loc_p, loc_params1->loc_data.loc_by_name.name, 
-                dst_loc_p, loc_params2->loc_data.loc_by_name.name, 
+    if(H5L_move(src_loc_p, loc_params1->loc_data.loc_by_name.name,
+                dst_loc_p, loc_params2->loc_data.loc_by_name.name,
                 FALSE, lcpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
@@ -226,7 +226,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_link_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_get_t get_type, 
+H5VL__native_link_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_get_t get_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5G_loc_t   loc;
@@ -289,7 +289,7 @@ H5VL__native_link_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_
 
                     if(H5L_get_val_by_idx(&loc, loc_params->loc_data.loc_by_idx.name, loc_params->loc_data.loc_by_idx.idx_type,
                             loc_params->loc_data.loc_by_idx.order, loc_params->loc_data.loc_by_idx.n, buf, size) < 0)
-                        HGOTO_ERROR(H5E_LINK, H5E_NOTFOUND, FAIL, "unable to get link val")                    
+                        HGOTO_ERROR(H5E_LINK, H5E_NOTFOUND, FAIL, "unable to get link val")
                 }
                 else
                     HGOTO_ERROR(H5E_LINK, H5E_NOTFOUND, FAIL, "unable to get link val")
@@ -316,7 +316,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_link_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_specific_t specific_type, 
+H5VL__native_link_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_link_specific_t specific_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c
index 3a29b6c..8f60ac4 100644
--- a/src/H5VLnative_object.c
+++ b/src/H5VLnative_object.c
@@ -41,7 +41,7 @@
  *-------------------------------------------------------------------------
  */
 void *
-H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_type_t *opened_type, 
+H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_type_t *opened_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5G_loc_t   loc;
@@ -104,15 +104,15 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-herr_t 
-H5VL__native_object_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, const char *src_name, 
-    void *dst_obj, const H5VL_loc_params_t *loc_params2, const char *dst_name, 
+herr_t
+H5VL__native_object_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, const char *src_name,
+    void *dst_obj, const H5VL_loc_params_t *loc_params2, const char *dst_name,
     hid_t ocpypl_id, hid_t lcpl_id, hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req)
 {
     H5G_loc_t   src_loc;                /* Source object group location */
     H5G_loc_t   dst_loc;                /* Destination group location */
     herr_t      ret_value = FAIL;
-    
+
     FUNC_ENTER_PACKAGE
 
     /* get location for objects */
@@ -123,7 +123,7 @@ H5VL__native_object_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, co
 
     /* Copy the object */
     if((ret_value = H5O_copy(&src_loc, src_name, &dst_loc, dst_name, ocpypl_id, lcpl_id)) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "unable to copy object")    
+        HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "unable to copy object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -140,7 +140,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_get_t get_type, 
+H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_get_t get_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
@@ -300,7 +300,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_specific_t specific_type, 
+H5VL__native_object_specific(void *obj, const H5VL_loc_params_t *loc_params, H5VL_object_specific_t specific_type,
     hid_t H5_ATTR_UNUSED dxpl_id, void H5_ATTR_UNUSED **req, va_list arguments)
 {
     H5G_loc_t    loc;
@@ -579,7 +579,7 @@ H5VL__native_object_optional(void *obj, H5VL_object_optional_t optional_type,
             }
 
         default:
-            HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't perform this operation on object");       
+            HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't perform this operation on object");
     } /* end switch */
 
 done:
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index 7c3c31e..c8df035 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -21,7 +21,6 @@
 #include "H5public.h"           /* Generic Functions                    */
 #include "H5Ipublic.h"          /* IDs                                  */
 
-
 /*****************/
 /* Public Macros */
 /*****************/
@@ -72,7 +71,6 @@ H5_DLL ssize_t H5VLget_connector_name(hid_t id, char *name/*out*/, size_t size);
 H5_DLL herr_t H5VLclose(hid_t connector_id);
 H5_DLL herr_t H5VLunregister_connector(hid_t connector_id);
 
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/H5VM.c b/src/H5VM.c
index f78da96..d12bea6 100644
--- a/src/H5VM.c
+++ b/src/H5VM.c
@@ -1227,7 +1227,7 @@ H5VM_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk,
 
     /* Defer to H5VM_chunk_index_scaled */
     chunk_idx = H5VM_chunk_index_scaled(ndims, coord, chunk, down_nchunks, scaled_coord);
-    
+
     FUNC_LEAVE_NOAPI(chunk_idx)
 } /* end H5VM_chunk_index() */
 
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c
index 34fdfec..6d7b87e 100644
--- a/src/H5Zdeflate.c
+++ b/src/H5Zdeflate.c
@@ -26,7 +26,7 @@
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER) 
+#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER)
 # define H5_ZLIB_HEADER "zlib.h"
 #endif
 #if defined(H5_ZLIB_HEADER)
diff --git a/src/H5Znbit.c b/src/H5Znbit.c
index 2f79725..8c0e876 100644
--- a/src/H5Znbit.c
+++ b/src/H5Znbit.c
@@ -751,7 +751,7 @@ H5Z_set_parms_compound(const H5T_t *type, unsigned *cd_values_index,
                     H5_CHECK_OVERFLOW(dtype_member_offset, size_t, unsigned);
                     H5_CHECK_OVERFLOW(dtype_next_member_offset, size_t, unsigned);
                     cd_values[(*cd_values_index)++] = (unsigned)dtype_next_member_offset - (unsigned)dtype_member_offset;
-                } 
+                }
                 break;
 
             case H5T_TIME:
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index 6d07513..dfc984a 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -105,10 +105,10 @@ static void H5Z_XFORM_DEBUG(H5Z_node *tree);
 static void H5Z_print(H5Z_node *tree, FILE *stream);
 #endif  /* H5Z_XFORM_DEBUG */
 
-/* PGCC (11.8-0) has trouble with the command *p++ = *p OP tree_val. It increments P first before 
+/* PGCC (11.8-0) has trouble with the command *p++ = *p OP tree_val. It increments P first before
  * doing the operation.  So I break down the command into two lines:
  *     *p = *p OP tree_val; p++;
- * Actually, the behavior of *p++ = *p OP tree_val is undefined. (SLU - 2012/3/19) 
+ * Actually, the behavior of *p++ = *p OP tree_val is undefined. (SLU - 2012/3/19)
  */
 #define H5Z_XFORM_DO_OP1(RESL,RESR,TYPE,OP,SIZE)                            \
 {   								  	    \
@@ -328,9 +328,9 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
     H5VM_array_fill(array, &val, sizeof(TYPE), (SIZE));                                             \
 }
 
-/* The difference of this macro from H5Z_XFORM_DO_OP3 is that it handles the operations when the left operand is empty, like -x or +x.  
- * The reason that it's separated from H5Z_XFORM_DO_OP3 is because compilers don't accept operations like *x or /x.  So in H5Z_do_op, 
- * these two macros are called in different ways. (SLU 2012/3/20) 
+/* The difference of this macro from H5Z_XFORM_DO_OP3 is that it handles the operations when the left operand is empty, like -x or +x.
+ * The reason that it's separated from H5Z_XFORM_DO_OP3 is because compilers don't accept operations like *x or /x.  So in H5Z_do_op,
+ * these two macros are called in different ways. (SLU 2012/3/20)
  */
 #define H5Z_XFORM_DO_OP6(OP)                                                                                                                    \
 {                                                                                                                                               \
@@ -1229,15 +1229,15 @@ H5Z_xform_find_type(const H5T_t* type)
     HDassert(type);
 
     /* Check for SHORT type */
-    if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_SHORT)) 
+    if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_SHORT))
             && 0 == H5T_cmp(type, tmp, FALSE))
 	HGOTO_DONE(H5T_NATIVE_SHORT)
     /* Check for INT type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_INT)) 
+    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_INT))
             && 0 == H5T_cmp(type, tmp, FALSE))
         HGOTO_DONE(H5T_NATIVE_INT)
     /* Check for LONG type */
-    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LONG)) 
+    else if((tmp = (H5T_t *)H5I_object(H5T_NATIVE_LONG))
             && 0 == H5T_cmp(type, tmp, FALSE))
 	HGOTO_DONE(H5T_NATIVE_LONG)
     /* Check for LONGLONG type */
@@ -1370,7 +1370,7 @@ done:
 
 /*-------------------------------------------------------------------------
  * Function:    H5Z_op_is_numbs
- * Purpose:     Internal function to facilitate the condition check in 
+ * Purpose:     Internal function to facilitate the condition check in
  *              H5Z_xform_reduce_tree to reduce the bulkiness of the code.
  * Return:      TRUE or FALSE
  * Programmer:  Raymond Lu
@@ -1397,7 +1397,7 @@ H5Z_op_is_numbs(H5Z_node* _tree)
 
 /*-------------------------------------------------------------------------
  * Function:    H5Z_op_is_numbs2
- * Purpose:     Internal function to facilitate the condition check in 
+ * Purpose:     Internal function to facilitate the condition check in
  *              H5Z_xform_reduce_tree to reduce the bulkiness of the code.
  *              The difference from H5Z_op_is_numbs is that the left child
  *              can be empty, like -x or +x.
diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
index fd67184..5f8de34 100644
--- a/src/H5make_libsettings.c
+++ b/src/H5make_libsettings.c
@@ -35,13 +35,14 @@ static const char *FileHeader = "\n\
 #include <stdio.h>
 #include <time.h>
 #include "H5private.h"
+
 /* Do NOT use HDfprintf in this file as it is not linked with the library,
  * which contains the H5system.c file in which the function is defined.
  */
 
 #define LIBSETTINGSFNAME "libhdf5.settings"
 
-FILE       *rawoutstream = NULL;
+FILE *rawoutstream = NULL;
 
 
 /*-------------------------------------------------------------------------
@@ -216,6 +217,7 @@ information about the library build configuration\n";
         HDfputc('\n', rawoutstream);
     } /* end if */
     fprintf(rawoutstream, " *\n * Purpose:\t\t");
+
     for(s = purpose; *s; s++) {
         HDfputc(*s, rawoutstream);
         if('\n' == *s && s[1])
diff --git a/src/H5mpi.c b/src/H5mpi.c
index d9f161c..0f8b554 100644
--- a/src/H5mpi.c
+++ b/src/H5mpi.c
@@ -124,7 +124,7 @@ H5_mpi_comm_dup(MPI_Comm comm, MPI_Comm *comm_new)
          */
         if (MPI_SUCCESS != (mpi_code = MPI_Comm_set_errhandler(comm_dup, MPI_ERRORS_RETURN)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Errhandler_set failed", mpi_code)
- 
+
     }
 
     /* Copy the new communicator to the return argument */
@@ -138,7 +138,7 @@ done:
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5_mpi_comm_dup() */ 
+} /* end H5_mpi_comm_dup() */
 
 
 /*-------------------------------------------------------------------------
@@ -191,7 +191,7 @@ done:
     }
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5_mpi_info_dup() */ 
+} /* end H5_mpi_info_dup() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5system.c b/src/H5system.c
index dd1f10d..ca0c6bf 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -422,7 +422,7 @@ HDfprintf(FILE *stream, const char *fmt, ...)
                         H5O_token_t token = HDva_arg(ap, H5O_token_t);
 
                         /* Print the raw token. */
-                        n = fprintf(stream, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X", 
+                        n = fprintf(stream, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",
                                 (unsigned char)token.__data[15],
                                 (unsigned char)token.__data[14],
                                 (unsigned char)token.__data[13],