File changes to affect formatting

9 files changed, 1638 insertions, 1564 deletions

diff --git a/test/big.c b/test/big.c
index fee7813..7917fa1 100644
--- a/test/big.c
+++ b/test/big.c
@@ -14,8 +14,8 @@
 /*
  * Programmer:  Robb Matzke
  *              Wednesday, April  8, 1998
- * Modified:	Albert Cheng
- * 		September 11, 2010
+ * Modified:    Albert Cheng
+ *         September 11, 2010
  */
 /*
  * The purpose of this test is to verify if a virtual file driver can handle:
@@ -53,20 +53,20 @@
  */
 #include "h5test.h"
 
-#define DNAME		"big.data"
+#define DNAME        "big.data"
 
-#define WRT_N		50
-#define WRT_SIZE	4*1024
-#define FAMILY_SIZE	1024*1024*1024
+#define WRT_N        50
+#define WRT_SIZE    4*1024
+#define FAMILY_SIZE    1024*1024*1024
 
 #define GB (HDoff_t)0x40000000L
 
-#define MAX_TRIES	100
+#define MAX_TRIES    100
 
 #if H5_SIZEOF_LONG_LONG >= 8
-#   define GB8LL	((unsigned long long)8*1024*1024*1024)
+#   define GB8LL    ((unsigned long long)8*1024*1024*1024)
 #else
-#   define GB8LL	0	/*cannot do the test*/
+#   define GB8LL    0    /*cannot do the test*/
 #endif
 
 /* Define Small, Large, Extra Large, Huge File which
@@ -96,19 +96,19 @@ static int test_family(hid_t fapl);
 /* Array used to record all addresses at which data has been written */
 /* so far.  Used to prevent overlapping writes. */
 static hsize_t values_used[WRT_N];
-
+
 /*-------------------------------------------------------------------------
- * Function:	randll
+ * Function:    randll
  *
- * Purpose:	Create a random long long value.
- * 		Ensures that a write at this value doesn't overlap any
- *		previous write.
+ * Purpose:    Create a random long long value.
+ *         Ensures that a write at this value doesn't overlap any
+ *        previous write.
  *
- * Return:	Success:	Random value
+ * Return:    Success:    Random value
  *
- *		Failure:	Random value which overlaps another write
+ *        Failure:    Random value which overlaps another write
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Tuesday, November 24, 1998
  *
  * Modifications:
@@ -118,10 +118,10 @@ static hsize_t values_used[WRT_N];
 static hsize_t
 randll(hsize_t limit, int current_index)
 {
-    hsize_t	acc = 0;
-    int 	overlap = 1;
-    int 	i;
-    int 	tries = 0;
+    hsize_t    acc = 0;
+    int     overlap = 1;
+    int     i;
+    int     tries = 0;
 
     /* Generate up to MAX_TRIES random numbers until one of them */
     /* does not overlap with any previous writes */
@@ -147,19 +147,19 @@ randll(hsize_t limit, int current_index)
     return acc;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	is_sparse
+ * Function:    is_sparse
  *
- * Purpose:	Determines if the file system of the current working
- *		directory supports holes.
+ * Purpose:    Determines if the file system of the current working
+ *        directory supports holes.
  *
- * Return:	Success:	Non-zero if holes are supported; zero
- *				otherwise.
+ * Return:    Success:    Non-zero if holes are supported; zero
+ *                otherwise.
  *
- *		Failure:	zero
+ *        Failure:    zero
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, July 15, 1998
  *
  * Modifications:
@@ -169,8 +169,8 @@ randll(hsize_t limit, int current_index)
 static int
 is_sparse(void)
 {
-    int		fd;
-    h5_stat_t	sb;
+    int        fd;
+    h5_stat_t    sb;
 
     if ((fd = HDopen("x.h5", O_RDWR|O_TRUNC|O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0) return 0;
     if (HDlseek(fd, (off_t)(1024*1024), SEEK_SET)!=1024*1024) return 0;
@@ -185,19 +185,19 @@ is_sparse(void)
 #endif
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	supports_big
+ * Function:    supports_big
  *
- * Purpose:	Determines if the file system of the current working
- *		directory supports big files.
+ * Purpose:    Determines if the file system of the current working
+ *        directory supports big files.
  *
- * Return:	Success:	Non-zero if big files are supported; zero
- *				otherwise.
+ * Return:    Success:    Non-zero if big files are supported; zero
+ *                otherwise.
  *
- *		Failure:	zero
+ *        Failure:    zero
  *
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              Wednesday, April 18, 2007
  *
  * Modifications:
@@ -207,7 +207,7 @@ is_sparse(void)
 static fsizes_t
 supports_big(void)
 {
-    int		fd = -1;
+    int        fd = -1;
     fsizes_t    fsize = NO_FILE;
 
     if((fd=HDopen("y.h5", O_RDWR|O_TRUNC|O_CREAT, H5_POSIX_CREATE_MODE_RW)) < 0)
@@ -256,19 +256,19 @@ error:
     return fsize;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	enough_room
+ * Function:    enough_room
  *
- * Purpose:	Tries to create a bunch of sparse files to see if quotas will
- *		get in the way.  Some systems also have problems opening
- *		enough files and we'll check that too.
+ * Purpose:    Tries to create a bunch of sparse files to see if quotas will
+ *        get in the way.  Some systems also have problems opening
+ *        enough files and we'll check that too.
  *
- * Return:	Success:	Non-zero
+ * Return:    Success:    Non-zero
  *
- *		Failure:	zero
+ *        Failure:    zero
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Thursday, August  6, 1998
  *
  * Modifications:
@@ -281,14 +281,14 @@ error:
  *      'name' in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static int
 enough_room(hid_t fapl)
 {
-    int		ret_value=0;
-    int		fd[68];
-    size_t	i, size = (size_t)1 << 30;
-    char	filename[1024], name[1024];
+    int        ret_value=0;
+    int        fd[68];
+    size_t    i, size = (size_t)1 << 30;
+    char    filename[1024], name[1024];
 
     /* Initialize file descriptors */
     for (i=0; i<NELMTS(fd); i++) fd[i] = -1;
@@ -322,38 +322,38 @@ done:
 
     return ret_value;
 }
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
+
 
-
 /*-------------------------------------------------------------------------
- * Function:	writer
+ * Function:    writer
  *
- * Purpose:	Creates a *big* dataset.
+ * Purpose:    Creates a *big* dataset.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	>0
+ *        Failure:    >0
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, April  8, 1998
  *
  * Modifications:
- * 	Robb Matzke, 15 Jul 1998
- *	Addresses are written to the file DNAME instead of stdout.
+ *     Robb Matzke, 15 Jul 1998
+ *    Addresses are written to the file DNAME instead of stdout.
  *
  *-------------------------------------------------------------------------
  */
 static int
 writer (char* filename, hid_t fapl, fsizes_t testsize, int wrt_n)
 {
-    hsize_t	size1[4] = {8, 1024, 1024, 1024};
-    hsize_t	size2[1] = {GB8LL};
-    hsize_t	hs_start[1];
-    hsize_t	hs_size[1];
-    hid_t	file=-1, space1=-1, space2=-1, mem_space=-1, d1=-1, d2=-1;
-    int		*buf = (int*)HDmalloc (sizeof(int) * WRT_SIZE);
-    int		i, j;
-    FILE	*out = HDfopen(DNAME, "w");
+    hsize_t    size1[4] = {8, 1024, 1024, 1024};
+    hsize_t    size2[1] = {GB8LL};
+    hsize_t    hs_start[1];
+    hsize_t    hs_size[1];
+    hid_t    file=-1, space1=-1, space2=-1, mem_space=-1, d1=-1, d2=-1;
+    int        *buf = (int*)HDmalloc (sizeof(int) * WRT_SIZE);
+    int        i, j;
+    FILE    *out = HDfopen(DNAME, "w");
     hid_t       dcpl;
 
     switch(testsize){
@@ -431,7 +431,7 @@ writer (char* filename, hid_t fapl, fsizes_t testsize, int wrt_n)
     hs_size[0] = WRT_SIZE;
     if ((mem_space = H5Screate_simple (1, hs_size, hs_size)) < 0) goto error;
     for (i=0; i<wrt_n; i++) {
-	/* start position must be at least hs_size from the end */
+    /* start position must be at least hs_size from the end */
         hs_start[0] = randll (size2[0]-hs_size[0], i);
         HDfprintf (out, "#%03d 0x%016Hx\n", i, hs_start[0]);
         if (H5Sselect_hyperslab (space2, H5S_SELECT_SET, hs_start, NULL,
@@ -468,17 +468,17 @@ error:
     return 1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reader
+ * Function:    reader
  *
- * Purpose:	Reads some data from random locations in the dataset.
+ * Purpose:    Reads some data from random locations in the dataset.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- * 		Failure:	>0
+ *         Failure:    >0
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, April 10, 1998
  *
  * Modifications:
@@ -488,13 +488,13 @@ error:
 static int
 reader(char *filename, hid_t fapl)
 {
-    FILE	*script = NULL;
-    hid_t	file = -1, mspace = -1, fspace = -1, d2 = -1;
-    char	ln[128], *s;
-    hsize_t	hs_offset[1];
-    hsize_t	hs_size[1] = {WRT_SIZE};
-    int		*buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE);
-    int		i, j, zero, wrong, nerrors = 0;
+    FILE    *script = NULL;
+    hid_t    file = -1, mspace = -1, fspace = -1, d2 = -1;
+    char    ln[128], *s;
+    hsize_t    hs_offset[1];
+    hsize_t    hs_size[1] = {WRT_SIZE};
+    int        *buf = (int *)HDmalloc(sizeof(int) * WRT_SIZE);
+    int        i, j, zero, wrong, nerrors = 0;
 
     /* Open script file */
     script = HDfopen(DNAME, "r");
@@ -566,15 +566,15 @@ error:
 }
 
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	usage
+ * Function:    usage
  *
- * Purpose:	Print command usage
+ * Purpose:    Print command usage
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Albert Chent
+ * Programmer:    Albert Chent
  *              Mar 28, 2002
  *
  * Modifications:
@@ -601,8 +601,8 @@ usage(void)
 static int
 test_sec2(hid_t fapl)
 {
-    char	filename[1024];
-    fsizes_t	testsize;
+    char    filename[1024];
+    fsizes_t    testsize;
 
     testsize = supports_big();
     if(testsize == NO_FILE) {
@@ -636,8 +636,8 @@ error:
 static int
 test_stdio(hid_t fapl)
 {
-    char	filename[1024];
-    fsizes_t	testsize;
+    char    filename[1024];
+    fsizes_t    testsize;
 
     testsize = supports_big();
     if(testsize == NO_FILE) {
@@ -675,7 +675,7 @@ error:
 static int
 test_family(hid_t fapl)
 {
-    char	filename[1024];
+    char    filename[1024];
 
     /* Test huge file with the family driver */
     HDputs("Testing big file with the Family Driver ");
@@ -731,24 +731,24 @@ error:
     return 1;
 } /* end test_family() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
  * Purpose:
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Friday, April 10, 1998
  *
  * Modifications:
- *		Albert Cheng, 2002/03/28
- *		Added command option -fsize.
- *		Albert Cheng, 2002/04/19
- *		Added command option -c.
+ *        Albert Cheng, 2002/03/28
+ *        Added command option -fsize.
+ *        Albert Cheng, 2002/04/19
+ *        Added command option -c.
  *
  *              Raymond Lu, 2007/05/25
  *              Added similar tests for SEC2 and STDIO drivers.
diff --git a/test/cache.c b/test/cache.c
index 46d8481..3046915 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -3162,8 +3162,8 @@ check_insert_entry(unsigned paged)
              ( cache_ptr->index_size != 4 * entry_sizes[entry_type] ) ||
              ( ( cache_ptr->slist_enabled ) &&
                ( ( cache_ptr->slist_len != 4 ) ||
-                 ( cache_ptr->slist_size != 4 * entry_sizes[entry_type] ) 
-               ) 
+                 ( cache_ptr->slist_size != 4 * entry_sizes[entry_type] )
+               )
             ) ||
             ( cache_ptr->pl_len != 0 ) ||
             ( cache_ptr->pl_size != (size_t)0 ) ||
@@ -3172,7 +3172,7 @@ check_insert_entry(unsigned paged)
             ( cache_ptr->LRU_list_len != 2 ) ||
             ( cache_ptr->LRU_list_size != 2 * entry_sizes[entry_type] )
 #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-            || 
+            ||
             ( cache_ptr->dLRU_list_len != 2 ) ||
             ( cache_ptr->dLRU_list_size != 2 * entry_sizes[entry_type] ) ||
             ( cache_ptr->cLRU_list_len != 0 ) ||
@@ -3200,14 +3200,14 @@ check_insert_entry(unsigned paged)
              ( cache_ptr->max_index_size != 4 * entry_sizes[entry_type] ) ||
              ( ( cache_ptr->slist_enabled ) &&
                ( ( cache_ptr->slist_len != 4 ) ||
-                 ( cache_ptr->slist_size != 4 * entry_sizes[entry_type] ) 
-               ) 
+                 ( cache_ptr->slist_size != 4 * entry_sizes[entry_type] )
+               )
              ) ||
              ( cache_ptr->max_pl_len != 0 ) ||
              ( cache_ptr->max_pl_size != (size_t)0 ) ||
              ( cache_ptr->max_pel_len != 2 ) ||
              ( cache_ptr->max_pel_size != 2 * entry_sizes[entry_type] ) ) {
-    
+
                 pass = FALSE;
                 failure_mssg = "Unexpected insert results 11.";
         }
@@ -4963,7 +4963,7 @@ check_flush_cache__multi_entry(H5F_t * file_ptr)
  * Purpose :    Run a multi entry flush cache test.
  *
  * Return:      void
- *          
+ *
  * Programmer:  John Mainzer
  *              1/13/05
  *
@@ -4995,7 +4995,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 #if 0 /* JRM */
     /* This gets used a lot, so lets leave it in. */
 
-    HDfprintf(stdout, "check_flush_cache__multi_entry_test: test %d\n", 
+    HDfprintf(stdout, "check_flush_cache__multi_entry_test: test %d\n",
               test_num);
 #endif /* JRM */
 
@@ -5028,7 +5028,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 
     u = 0;
     while ( pass && ( u < spec_size ) ) {
-    
+
         if ( ( (unsigned)spec[u].entry_num != u ) ||
              ( spec[u].entry_type < 0 ) ||
              ( spec[u].entry_type >= NUMBER_OF_ENTRY_TYPES ) ||
@@ -5046,7 +5046,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 
     u = 0;
     while ( pass && (u < spec_size) ) {
-    
+
         if(spec[u].insert_flag) {
 
             insert_entry(file_ptr, spec[u].entry_type, spec[u].entry_index,
@@ -5164,7 +5164,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 
     u = 0;
     while ( pass && ( u < spec_size ) ) {
-    
+
         base_addr = entries[spec[u].entry_type];
         entry_ptr = &(base_addr[spec[u].entry_index]);
 
@@ -9486,7 +9486,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->at_main_addr != check[i].at_main_addr ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "(%d,%d) at main addr (expected) = %d (%d).\n",
                               (int)(check[i].entry_type),
                               (int)(check[i].entry_index),
@@ -9496,7 +9496,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->is_dirty != check[i].is_dirty ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "entry_ptr->is_dirty (expected) = %d (%d).\n",
                               (int)(entry_ptr->is_dirty),
                               (int)(check[i].is_dirty));
@@ -9504,7 +9504,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->header.is_dirty != check[i].is_dirty ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                           "entry_ptr->header.is_dirty (expected) = %d (%d).\n",
                           (int)(entry_ptr->header.is_dirty),
                           (int)(check[i].is_dirty));
@@ -9512,7 +9512,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->is_protected != check[i].is_protected ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                               "entry_ptr->is_protected (expected) = %d (%d).\n",
                               (int)(entry_ptr->is_protected),
                               (int)(check[i].is_protected));
@@ -9520,7 +9520,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->header.is_protected != check[i].is_protected ) {
 
-                     HDfprintf(stdout, 
+                     HDfprintf(stdout,
                        "entry_ptr->header.is_protected (expected) = %d (%d).\n",
                        (int)(entry_ptr->is_protected),
                        (int)(check[i].is_protected));
@@ -9528,7 +9528,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->is_pinned != check[i].is_pinned ) {
 
-                     HDfprintf(stdout, 
+                     HDfprintf(stdout,
                               "entry_ptr->is_pinned (expected) = %d (%d).\n",
                               (int)(entry_ptr->is_pinned),
                               (int)(check[i].is_pinned));
@@ -9536,7 +9536,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
                 if ( entry_ptr->header.is_pinned != check[i].is_pinned ) {
 
-                    HDfprintf(stdout, 
+                    HDfprintf(stdout,
                           "entry_ptr->header.is_pinned (expected) = %d (%d).\n",
                           (int)(entry_ptr->header.is_pinned),
                           (int)(check[i].is_pinned));
@@ -12591,9 +12591,9 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
                    test_num);
         failure_mssg = msg;
     }
-    else if ( ( entry_type < 0 ) || 
+    else if ( ( entry_type < 0 ) ||
               ( entry_type >= NUMBER_OF_ENTRY_TYPES ) ||
-              ( entry_idx < 0 ) || 
+              ( entry_idx < 0 ) ||
               ( entry_idx > max_indices[entry_type] ) ) {
 
         pass = FALSE;
@@ -14292,7 +14292,7 @@ check_pin_protected_entry(unsigned paged)
  *
  * Purpose:     Verify that H5C_resize_entry() and H5C_unprotect() resize
  *              entries as expected.
- * 
+ *
  * Return:      void
  *
  * Programmer:  John Mainzer
@@ -16033,7 +16033,7 @@ check_evictions_enabled(unsigned paged)
 
 /*-------------------------------------------------------------------------
  * Function:    check_flush_protected_err()
- *              
+ *
  * Purpose:     Verify that an attempt to flush the cache when it contains
  *              a protected entry will generate an error.
  *
@@ -16045,7 +16045,7 @@ check_evictions_enabled(unsigned paged)
  * Modifications:
  *
  *              Added code to setup and take down the skip list before
- *              and after calls to H5C_flush_cache().  
+ *              and after calls to H5C_flush_cache().
  *
  *                                          JRM -- 5/14/20
  *
@@ -28266,6 +28266,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
     /* Set up the expected array. This is used to maintain a table of the
      * expected status of every entry used in this test.
      */
+    /* clang-format off */
     struct expected_entry_status expected[150] =
     {
       /* entry        entry            in    at main                                                flush dep flush dep child flush   flush       flush */
@@ -28421,6 +28422,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
       { HUGE_ENTRY_TYPE, 148,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { HUGE_ENTRY_TYPE, 149,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
+    /* clang-format on */
 
     pass = TRUE;
 
@@ -29100,16 +29102,19 @@ check_flush_deps(unsigned paged)
     test_entry_t *base_addr;            /* Base address of entries for test */
     int entry_type = PICO_ENTRY_TYPE;   /* Use very small entry size (size of entries doesn't matter) */
     unsigned u;                         /* Local index variable */
+
+    /* clang-format off */
     struct expected_entry_status expected[5] =
     {
-      /* entry            entry        in    at main                                                        flush dep flush dep child flush   flush       flush */
-      /* type:        index:    size:        cache:    addr:    dirty:    prot:    pinned:    dsrlzd:    srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd: order:    corked: */
+      /* entry        entry     in              at main   flush    dep       flush     dep       child     flush     flush       flush */
+      /* type:        index:   size:            cache:    addr:    dirty:    prot:     pinned:   dsrlzd:   srlzd:    dest:  par type[]: par idx[]: dep npart: dep nchd: dep ndirty chd:       order: corked: */
       { PICO_ENTRY_TYPE, 0,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { PICO_ENTRY_TYPE, 1,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { PICO_ENTRY_TYPE, 2,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { PICO_ENTRY_TYPE, 3,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { PICO_ENTRY_TYPE, 4,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
+    /* clang-format on */
 
     if(paged)
         TESTING("flush dependencies (paged aggregation)")
@@ -31048,11 +31053,11 @@ done:
  *              is correct
  *
  * Return:      0 on success, non-zero on failure
- *  
+ *
  * Programmer:  Quincey Koziol
  *              3/17/09
  *
- * Modifications: 
+ * Modifications:
  *
  *              Added code to setup and take down the skip list before
  *              and after calls to H5C_flush_cache().  Do this via the
@@ -31070,6 +31075,8 @@ check_flush_deps_order(unsigned paged)
     H5C_t * cache_ptr = NULL;           /* Metadata cache for this test */
     int entry_type = PICO_ENTRY_TYPE;   /* Use very small entry size (size of entries doesn't matter) */
     unsigned u;                         /* Local index variable */
+    unsigned flush_order;       /* Index for tracking flush order */
+    /* clang-format off */
     struct expected_entry_status expected[5] =
     {
       /* entry            entry        in    at main                                                        flush dep flush dep child flush   flush       flush */
@@ -31080,7 +31087,7 @@ check_flush_deps_order(unsigned paged)
       { PICO_ENTRY_TYPE, 3,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { PICO_ENTRY_TYPE, 4,    PICO_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
-    unsigned flush_order;       /* Index for tracking flush order */
+    /* clang-format on */
 
     if(paged)
         TESTING("flush dependencies flush order (paged aggregation)")
@@ -33617,6 +33624,7 @@ check_notify_cb(unsigned paged)
     test_entry_t * entry_ptr;           /* Cache entry to examine/manipulate */
     int entry_type = NOTIFY_ENTRY_TYPE;   /* Use entry w/notify callback (size of entries doesn't matter) */
     unsigned u;                         /* Local index variable */
+    /* clang-format off */
     struct expected_entry_status expected[5] =
     {
       /* entry            entry           in     at main                                               flush dep flush dep child flush   flush       flush */
@@ -33627,6 +33635,7 @@ check_notify_cb(unsigned paged)
       { NOTIFY_ENTRY_TYPE, 3,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { NOTIFY_ENTRY_TYPE, 4,    NOTIFY_ENTRY_SIZE, FALSE, TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     };
+    /* clang-format on */
 
     if(paged)
         TESTING("'notify' callback (paged)")
@@ -33833,6 +33842,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
     /* Set up the expected array. This is used to maintain a table of the
      * expected status of every entry used in this test.
      */
+    /* clang-format off */
     struct expected_entry_status expected[150] =
     {
       /* entry            entry        in    at main                                                flush dep flush dep child flush   flush       flush */
@@ -33988,6 +33998,7 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged)
       { HUGE_ENTRY_TYPE, 148,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE},
       { HUGE_ENTRY_TYPE, 149,    HUGE_ENTRY_SIZE, FALSE,    TRUE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE,    FALSE, {0,0,0,0,0,0,0,0},       {0,0,0,0,0,0,0,0},      0, 0, 0,          -1, FALSE}
     } ;
+    /* clang-format on */
 
     pass = TRUE;
 
@@ -34663,6 +34674,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
 {
     H5C_t *        cache_ptr = file_ptr->shared->cache;
     int           i;
+    /* clang-format off */
     struct expected_entry_status expected[36] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -34677,6 +34689,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
       { HUGE_ENTRY_TYPE,     2,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
       { HUGE_ENTRY_TYPE,     3,    HUGE_ENTRY_SIZE,     TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,  {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE}
     };
+    /* clang-format on */
 
     if(pass) {
 
@@ -34805,7 +34818,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
     /* If we are collecting stats, check to see if we get the expected
      * values.
      */
-    if(pass) 
+    if(pass)
     if((cache_ptr->insertions[HUGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->pinned_insertions[HUGE_ENTRY_TYPE] != 0) ||
              (cache_ptr->clears[HUGE_ENTRY_TYPE] != 1) ||
@@ -34892,6 +34905,7 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
     int           i;
     const int       num_huge_entries = 4;
     const int       num_monster_entries = 32;
+    /* clang-format off */
     struct expected_entry_status expected[36] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -34938,6 +34952,7 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
       { MONSTER_ENTRY_TYPE,    30,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
       { MONSTER_ENTRY_TYPE,    31,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
     };
+    /* clang-format on */
 
     if(pass) {
 
@@ -35272,6 +35287,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
     H5C_t *        cache_ptr = file_ptr->shared->cache;
     int           i;
     herr_t       result;
+    /* clang-format off */
     struct expected_entry_status expected[36] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -35314,6 +35330,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
       { MONSTER_ENTRY_TYPE,    30,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
       { MONSTER_ENTRY_TYPE,    31,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE, {-1,-1,-1,-1,-1,-1,-1,-1}, {-1,-1,-1,-1,-1,-1,-1,-1},     0, 0, 0, -1, FALSE},
     };
+    /* clang-format on */
     H5C_auto_size_ctl_t saved_auto_size_ctl;
     H5C_auto_size_ctl_t test_auto_size_ctl =
     {
@@ -35748,6 +35765,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
     test_entry_t *             entry_ptr;
     test_entry_t *             base_addr = NULL;
     struct H5C_cache_entry_t * scan_ptr;
+    /* clang-format off */
     struct expected_entry_status expected[5] =
     {
       /* the expected array is used to maintain a table of the expected status of every
@@ -35763,6 +35781,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
       { MONSTER_ENTRY_TYPE,     24,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    FALSE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,      {-1,0,0,0,0,0,0,0},                 {-1,0,0,0,0,0,0,0}, 0, 0, 0, -1, FALSE},
       { MONSTER_ENTRY_TYPE,     31,    MONSTER_ENTRY_SIZE,    TRUE,    TRUE,    TRUE,    FALSE,    FALSE,    TRUE,    FALSE,    FALSE,         {MONSTER_ENTRY_TYPE,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0},  1, 0, 0, -1, FALSE},
     };
+    /* clang-format on */
 
     if(pass) {
 
@@ -35967,7 +35986,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
         H5C_FLUSH_CACHE(file_ptr, H5C__FLUSH_INVALIDATE_FLAG, \
                 "Cache flush invalidate failed after flush op eviction test")
 
-        if ( ( pass ) && 
+        if ( ( pass ) &&
              ( ( cache_ptr->index_len != 0 ) ||
                ( cache_ptr->index_size != 0 ) ) ) {
 
@@ -36131,7 +36150,7 @@ check_stats(unsigned paged)
  *
  * Modifications:
  *
- *              Modified slist stats checks to allow for the case that 
+ *              Modified slist stats checks to allow for the case that
  *              the slist is disabled.
  *
  *              Also added code to setup and take down the skip list before
@@ -36453,7 +36472,7 @@ check_stats__smoke_check_1(H5F_t * file_ptr)
         H5C_FLUSH_CACHE(file_ptr, H5C__FLUSH_INVALIDATE_FLAG, \
                "Cache flush invalidate failed in check_stats__smoke_check_1()")
 
-        if ( ( pass ) && 
+        if ( ( pass ) &&
              ( ( cache_ptr->index_len != 0 ) ||
                ( cache_ptr->index_size != 0 ) ) ) {
 
diff --git a/test/error_test.c b/test/error_test.c
index 7c6cf9f..1408c46 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -329,7 +329,7 @@ long_desc_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *clie
  *      'full_desc' in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static herr_t
 test_long_desc(void)
 {
@@ -384,7 +384,7 @@ error:
 
     return -1;
 } /* end test_long_desc() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/fheap.c b/test/fheap.c
index ed82ce3..8410c0a 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -20,9 +20,9 @@
  * This file needs to access private datatypes from the H5HF package.
  * This file also needs to access the fractal heap testing code.
  */
-#define H5HF_FRIEND		/*suppress error about including H5HFpkg	  */
+#define H5HF_FRIEND        /*suppress error about including H5HFpkg      */
 #define H5HF_TESTING
-#include "H5HFpkg.h"		/* Fractal heaps			*/
+#include "H5HFpkg.h"        /* Fractal heaps            */
 
 #define H5F_FRIEND      /*suppress error about including H5Fpkg   */
 #define H5F_TESTING
@@ -30,9 +30,9 @@
 
 /* Other private headers that this test requires */
 #include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5MMprivate.h"        /* Memory management			*/
+#include "H5MMprivate.h"        /* Memory management            */
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
-#include "H5VMprivate.h"        /* Vectors and arrays 			*/
+#include "H5VMprivate.h"        /* Vectors and arrays             */
 
 /* Max. testfile name length */
 #define FHEAP_FILENAME_LEN      1024
@@ -73,12 +73,18 @@
 #define HEAP_ID_LEN             7               /* # of bytes to use for heap ID */
 #define SMALL_HEAP_ID_LEN       7               /* # of bytes to use for "small" heap's IDs */
 #define LARGE_HEAP_ID_LEN      12               /* # of bytes to use for "large" heap's IDs */
-#define HEAP_MAX_ROOT_ROWS(fh) H5HF_get_max_root_rows(fh)       /* Max. # of rows in root indirect block */
-#define DTABLE_WIDTH(fh) H5HF_get_dtable_width_test(fh) /* Width of doubling table for heap */
-#define DTABLE_MAX_DROWS(fh) H5HF_get_dtable_max_drows_test(fh) /* Max. # of direct block rows in any indirect block */
-#define IBLOCK_MAX_DROWS(fh, pos) H5HF_get_iblock_max_drows_test(fh, pos) /* Max. # of direct block rows in a indirect block */
-#define DBLOCK_SIZE(fh, r) H5HF_get_dblock_size_test(fh, r)     /* Size of a direct block in a given row */
-#define DBLOCK_FREE(fh, r) H5HF_get_dblock_free_test(fh, r)     /* Free space in a direct block of a given row */
+/* Max. # of rows in root indirect block */
+#define HEAP_MAX_ROOT_ROWS(fh) H5HF_get_max_root_rows(fh)
+/* Width of doubling table for heap */
+#define DTABLE_WIDTH(fh) H5HF_get_dtable_width_test(fh)
+/* Max. # of direct block rows in any indirect block */
+#define DTABLE_MAX_DROWS(fh) H5HF_get_dtable_max_drows_test(fh)
+/* Max. # of direct block rows in a indirect block */
+#define IBLOCK_MAX_DROWS(fh, pos) H5HF_get_iblock_max_drows_test(fh, pos)
+/* Size of a direct block in a given row */
+#define DBLOCK_SIZE(fh, r) H5HF_get_dblock_size_test(fh, r)
+/* Free space in a direct block of a given row */
+#define DBLOCK_FREE(fh, r) H5HF_get_dblock_free_test(fh, r)
 
 /* The number of settings for testing: page buffering, file space strategy and persisting free-space */
 #define NUM_PB_FS                   6
@@ -173,18 +179,18 @@ static int check_stats(const H5HF_t *fh, const fheap_heap_state_t *state);
 static int del_objs(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam,
     fheap_heap_state_t *state, fheap_heap_ids_t *keep_ids);
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	init_small_cparam
+ * Function:    init_small_cparam
  *
- * Purpose:	Initialize heap creation parameter structure with small
+ * Purpose:    Initialize heap creation parameter structure with small
  *              settings
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -210,18 +216,18 @@ init_small_cparam(H5HF_create_t *cparam)
     return(0);
 } /* init_small_cparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	init_large_cparam
+ * Function:    init_large_cparam
  *
- * Purpose:	Initialize heap creation parameter structure with large
+ * Purpose:    Initialize heap creation parameter structure with large
  *              settings
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -247,17 +253,17 @@ init_large_cparam(H5HF_create_t *cparam)
     return(0);
 } /* init_large_cparam() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	check_stats
+ * Function:    check_stats
  *
- * Purpose:	Verify stats for a heap
+ * Purpose:    Verify stats for a heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -310,17 +316,17 @@ error:
     return(1);
 } /* check_stats() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	op_memcpy
+ * Function:    op_memcpy
  *
- * Purpose:	Perform 'memcpy' for an object
+ * Purpose:    Perform 'memcpy' for an object
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, September 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -334,11 +340,11 @@ op_memcpy(const void *obj, size_t obj_len, void *op_data)
     return(SUCCEED);
 } /* op_memcpy() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	add_obj
+ * Function:    add_obj
  *
- * Purpose:	Add an object to heap
+ * Purpose:    Add an object to heap
  *
  * Note:        The following fields in the 'state' structure are set to
  *              the values expected _after_ any block created for the object:
@@ -350,11 +356,11 @@ op_memcpy(const void *obj, size_t obj_len, void *op_data)
  *              the current state, before any block has been created:
  *                      nobjs
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -455,17 +461,17 @@ error:
     return(1);
 } /* add_obj() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_del_string
+ * Function:    get_del_string
  *
- * Purpose:	Return string describing the kind of deletion to perform
+ * Purpose:    Return string describing the kind of deletion to perform
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, June  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -492,16 +498,16 @@ get_del_string(const fheap_test_param_t *tparam)
     return(str);
 } /* get_del_string() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_fill_size
+ * Function:    get_fill_size
  *
- * Purpose:	Retrieve the size of objects to "bulk" fill blocks with
+ * Purpose:    Retrieve the size of objects to "bulk" fill blocks with
  *
- * Return:	Size of object to pass down to "fill_heap" routine on
+ * Return:    Size of object to pass down to "fill_heap" routine on
  *              success/can't fail
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Thursday, July 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -524,17 +530,17 @@ get_fill_size(const fheap_test_param_t *tparam)
     return(0);
 } /* get_fill_size() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	begin_test
+ * Function:    begin_test
  *
- * Purpose:	Perform common "test being" operations
+ * Purpose:    Perform common "test being" operations
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
  *
  *-------------------------------------------------------------------------
@@ -545,7 +551,7 @@ get_fill_size(const fheap_test_param_t *tparam)
  *      test_desc in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static int
 begin_test(fheap_test_param_t *tparam, const char *base_desc,
     fheap_heap_ids_t *keep_ids, size_t *fill_size)
@@ -574,18 +580,18 @@ begin_test(fheap_test_param_t *tparam, const char *base_desc,
     /* Success */
     return(0);
 } /* end begin_test() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
+
 
-
 /*-------------------------------------------------------------------------
- * Function:	reopen_file
+ * Function:    reopen_file
  *
- * Purpose:	Perform common "re-open" operations on file & heap for testing
+ * Purpose:    Perform common "re-open" operations on file & heap for testing
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -632,17 +638,17 @@ error:
     return(-1);
 } /* end reopen_file() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	open_heap
+ * Function:    open_heap
  *
- * Purpose:	Perform common "open" operations on file & heap for testing
+ * Purpose:    Perform common "open" operations on file & heap for testing
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
  *
  *-------------------------------------------------------------------------
@@ -744,17 +750,17 @@ error:
     return(-1);
 } /* end open_heap() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	reopen_heap
+ * Function:    reopen_heap
  *
- * Purpose:	Perform common "re-open" operations on heap for testing
+ * Purpose:    Perform common "re-open" operations on heap for testing
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
  *
  *-------------------------------------------------------------------------
@@ -782,16 +788,16 @@ error:
     return -1;
 } /* end reopen_heap() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	close_heap
+ * Function:    close_heap
  *
- * Purpose:	Perform common "close" operations on file & heap for testing
+ * Purpose:    Perform common "close" operations on file & heap for testing
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
  *
  *-------------------------------------------------------------------------
@@ -850,17 +856,17 @@ error:
     return(-1);
 } /* end close_heap() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	del_objs_half_refill
+ * Function:    del_objs_half_refill
  *
- * Purpose:	Remove half of objects from heap and refill
+ * Purpose:    Remove half of objects from heap and refill
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, June  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -944,17 +950,17 @@ error:
     return(1);
 } /* del_objs_half_refill() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	del_objs
+ * Function:    del_objs
  *
- * Purpose:	Remove objects from heap
+ * Purpose:    Remove objects from heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, June  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -1026,11 +1032,11 @@ error:
     return(1);
 } /* del_objs() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_heap
+ * Function:    fill_heap
  *
- * Purpose:	Insert (small) objects to fill up the free space in a heap block
+ * Purpose:    Insert (small) objects to fill up the free space in a heap block
  *
  * Note:        The following fields in the 'state' structure are set to
  *              the values expected _after_ the block has been created:
@@ -1042,11 +1048,11 @@ error:
  *              the current state, before the block has been created:
  *                      nobjs
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  7, 2006
  *
  *-------------------------------------------------------------------------
@@ -1228,17 +1234,17 @@ error:
     return(1);
 } /* fill_heap() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_root_row
+ * Function:    fill_root_row
  *
- * Purpose:	Fill up a row of direct blocks in the root indirect block
+ * Purpose:    Fill up a row of direct blocks in the root indirect block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1325,17 +1331,17 @@ error:
     return(1);
 } /* fill_root_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_partial row
+ * Function:    fill_partial row
  *
- * Purpose:	Fill up part of a row of direct blocks in an non-root indirect block
+ * Purpose:    Fill up part of a row of direct blocks in an non-root indirect block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -1371,17 +1377,17 @@ error:
     return(1);
 } /* fill_partial_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_row
+ * Function:    fill_row
  *
- * Purpose:	Fill up entire row of direct blocks in an non-root indirect block
+ * Purpose:    Fill up entire row of direct blocks in an non-root indirect block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1405,20 +1411,20 @@ error:
     return(1);
 } /* fill_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_root_direct
+ * Function:    fill_root_direct
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in the root indirect block
  *              (Generally used to create & fill up direct blocks in a new
  *              indirect block)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
  *
  *-------------------------------------------------------------------------
@@ -1446,19 +1452,19 @@ error:
     return(1);
 } /* fill_root_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_2nd_indirect
+ * Function:    fill_2nd_indirect
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in a second-level indirect block (which only has
  *              direct blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1486,18 +1492,18 @@ error:
     return(1);
 } /* fill_2nd_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_all_direct
+ * Function:    fill_all_direct
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks up to the maximum direct block size
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1525,19 +1531,19 @@ error:
     return(1);
 } /* fill_all_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_2nd_indirect_row
+ * Function:    fill_2nd_indirect_row
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in a row of second-level indirect block (which only
  *              have direct blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1564,19 +1570,19 @@ error:
     return(1);
 } /* fill_2nd_direct_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_all_2nd_indirect_rows
+ * Function:    fill_all_2nd_indirect_rows
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in all rows of second-level indirect blocks (which only
  *              have direct blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1603,19 +1609,19 @@ error:
     return(1);
 } /* fill_2nd_direct_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_3rd_indirect
+ * Function:    fill_3rd_indirect
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in a third-level indirect block (which
  *              has one more level of indirect blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -1642,19 +1648,19 @@ error:
     return(1);
 } /* fill_3rd_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_3rd_indirect_row
+ * Function:    fill_3rd_indirect_row
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in a row of third-level indirect block (which
  *              have one more level of indirect blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1682,19 +1688,19 @@ error:
     return(1);
 } /* fill_3rd_direct_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_all_3rd_indirect_rows
+ * Function:    fill_all_3rd_indirect_rows
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in all rows of third-level indirect blocks (which
  *              have one more level of indirect blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1722,19 +1728,19 @@ error:
     return(1);
 } /* fill_all_3rd_direct_rows() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_4th_indirect_row
+ * Function:    fill_4th_indirect_row
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in a row of fourth-level indirect blocks (which
  *              have two more levels of indirect blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1772,19 +1778,19 @@ error:
     return(1);
 } /* fill_4th_direct_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	fill_all_4th_indirect_rows
+ * Function:    fill_all_4th_indirect_rows
  *
- * Purpose:	Insert (small) objects to fill up the free space in all direct
+ * Purpose:    Insert (small) objects to fill up the free space in all direct
  *              heap blocks in all rows of fourth-level indirect blocks (which
  *              have two more levels of indirect blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -1830,16 +1836,16 @@ error:
     return(1);
 } /* fill_all_4th_direct_rows() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_create
+ * Function:    test_create
  *
- * Purpose:	Create fractal heap
+ * Purpose:    Create fractal heap
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 24, 2006
  *
  *-------------------------------------------------------------------------
@@ -1847,9 +1853,9 @@ error:
 static unsigned
 test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_create_t test_cparam;          /* Creation parameters for heap */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Heap address in file */
@@ -1948,16 +1954,16 @@ error:
     return 1;
 } /* test_create() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_reopen
+ * Function:    test_reopen
  *
- * Purpose:	Create & reopen a fractal heap
+ * Purpose:    Create & reopen a fractal heap
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -1965,9 +1971,9 @@ error:
 static unsigned
 test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_create_t test_cparam;          /* Creation parameters for heap */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
@@ -2100,16 +2106,16 @@ error:
     return(1);
 } /* test_reopen() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_open_twice
+ * Function:    test_open_twice
  *
- * Purpose:	Open a fractal heap twice
+ * Purpose:    Open a fractal heap twice
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -2117,11 +2123,11 @@ error:
 static unsigned
 test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    hid_t	file2 = -1;             /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
-    H5F_t	*f2 = NULL;             /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    hid_t    file2 = -1;             /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
+    H5F_t    *f2 = NULL;             /* Internal file object pointer */
     H5HF_create_t test_cparam;          /* Creation parameters for heap */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     H5HF_t      *fh2 = NULL;            /* 2nd fractal heap wrapper */
@@ -2277,16 +2283,16 @@ error:
     return 1;
 } /* test_open_twice() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_delete_open
+ * Function:    test_delete_open
  *
- * Purpose:	Delete opened fractal heap (& open deleted heap)
+ * Purpose:    Delete opened fractal heap (& open deleted heap)
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, January  5, 2007
  *
  *-------------------------------------------------------------------------
@@ -2294,9 +2300,9 @@ error:
 static unsigned
 test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_create_t test_cparam;          /* Creation parameters for heap */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     H5HF_t      *fh2 = NULL;            /* 2nd fractal heap wrapper */
@@ -2450,16 +2456,16 @@ error:
     return 1;
 } /* test_delete_open() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_id_limits
+ * Function:    test_id_limits
  *
- * Purpose:	Test limits for heap ID lengths
+ * Purpose:    Test limits for heap ID lengths
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -2467,9 +2473,9 @@ error:
 static unsigned
 test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
     unsigned    deflate_level;          /* Deflation level */
@@ -2794,16 +2800,16 @@ error:
     return 1;
 } /* test_id_limits() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_filtered_create
+ * Function:    test_filtered_create
  *
- * Purpose:	Test creating a heap with I/O filters
+ * Purpose:    Test creating a heap with I/O filters
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -2811,9 +2817,9 @@ error:
 static unsigned
 test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -2917,16 +2923,16 @@ error:
     return 1;
 } /* test_filtered_create() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_size
+ * Function:    test_size
  *
- * Purpose:	Test querying heap size
+ * Purpose:    Test querying heap size
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, August 14, 2007
  *
  *-------------------------------------------------------------------------
@@ -2934,9 +2940,9 @@ error:
 static unsigned
 test_size(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     hsize_t     empty_heap_size;        /* Total size of empty heap on disk */
@@ -3057,7 +3063,7 @@ error:
     return 1;
 } /* test_size() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    test_reopen_hdr
  *
@@ -3195,16 +3201,16 @@ error:
     return(1);
 } /* test_reopen_hdr() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_weird
+ * Function:    test_man_insert_weird
  *
- * Purpose:	Test inserting "weird" sized objects into absolute heap
+ * Purpose:    Test inserting "weird" sized objects into absolute heap
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -3212,9 +3218,9 @@ error:
 static unsigned
 test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
@@ -3299,23 +3305,23 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_weird() */
 
 #ifdef ALL_INSERT_TESTS
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_first
+ * Function:    test_man_insert_first
  *
- * Purpose:	Test inserting first object into absolute heap
+ * Purpose:    Test inserting first object into absolute heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 24, 2006
  *
  *-------------------------------------------------------------------------
@@ -3323,9 +3329,9 @@ error:
 static unsigned
 test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -3400,22 +3406,22 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_first() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_second
+ * Function:    test_man_insert_second
  *
- * Purpose:	Test inserting two objects into absolute heap
+ * Purpose:    Test inserting two objects into absolute heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -3423,9 +3429,9 @@ error:
 static unsigned
 test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -3494,23 +3500,23 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_second() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_root_mult
+ * Function:    test_man_insert_root_mult
  *
- * Purpose:	Test inserting mult. objects into absolute heap, up to the
+ * Purpose:    Test inserting mult. objects into absolute heap, up to the
  *              limit of a root direct block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -3518,9 +3524,9 @@ error:
 static unsigned
 test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -3591,24 +3597,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_root_mult() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_force_indirect
+ * Function:    test_man_insert_force_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, filling the
+ * Purpose:    Test inserting mult. objects into absolute heap, filling the
  *              root direct block and forcing the root block to be converted
  *              into an indirect block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -3616,9 +3622,9 @@ error:
 static unsigned
 test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -3696,24 +3702,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_force_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_fill_second
+ * Function:    test_man_insert_fill_second
  *
- * Purpose:	Test inserting mult. objects into absolute heap, filling the
+ * Purpose:    Test inserting mult. objects into absolute heap, filling the
  *              root direct block, forcing the root block to be converted
  *              into an indirect block and filling the secnod indirect block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  7, 2006
  *
  *-------------------------------------------------------------------------
@@ -3721,9 +3727,9 @@ error:
 static unsigned
 test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -3801,25 +3807,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_fill_second() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_insert_third_direct
+ * Function:    test_man_insert_third_direct
  *
- * Purpose:	Test inserting mult. objects into absolute heap, filling the
+ * Purpose:    Test inserting mult. objects into absolute heap, filling the
  *              root direct block, forcing the root block to be converted
  *              into an indirect block, filling the secnod indirect block and
  *              creating a third direct block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March  7, 2006
  *
  *-------------------------------------------------------------------------
@@ -3827,9 +3833,9 @@ error:
 static unsigned
 test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -3912,24 +3918,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_insert_third_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_first_row
+ * Function:    test_man_fill_first_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill first row of root indirect
  *              block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 13, 2006
  *
  *-------------------------------------------------------------------------
@@ -3937,9 +3943,9 @@ error:
 static unsigned
 test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4007,24 +4013,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_first_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_start_second_row
+ * Function:    test_man_start_second_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill first row of root indirect
  *              block, then add another object to start second row.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -4032,9 +4038,9 @@ error:
 static unsigned
 test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4109,24 +4115,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_start_second_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_second_row
+ * Function:    test_man_fill_second_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill first row of root indirect
  *              block, then fill the second row also.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -4134,9 +4140,9 @@ error:
 static unsigned
 test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4208,25 +4214,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_second_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_start_third_row
+ * Function:    test_man_start_third_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill first row of root indirect
  *              block, fill the second row also, then add another object to
  *              start the third row.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
  *
  *-------------------------------------------------------------------------
@@ -4234,9 +4240,9 @@ error:
 static unsigned
 test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4318,24 +4324,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_start_third_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_fourth_row
+ * Function:    test_man_fill_fourth_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill first four rows of root indirect
  *              block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
  *
  *-------------------------------------------------------------------------
@@ -4343,9 +4349,9 @@ error:
 static unsigned
 test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4415,24 +4421,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_fourth_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_all_root_direct
+ * Function:    test_man_fill_all_root_direct
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
  *
  *-------------------------------------------------------------------------
@@ -4440,9 +4446,9 @@ error:
 static unsigned
 test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4510,24 +4516,24 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_all_root_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_first_recursive_indirect
+ * Function:    test_man_first_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block and create first recursive indirect block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
  *
  *-------------------------------------------------------------------------
@@ -4535,9 +4541,9 @@ error:
 static unsigned
 test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4610,25 +4616,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_first_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_second_direct_recursive_indirect
+ * Function:    test_man_second_direct_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, create first recursive indirect block and start second
  *              direct block in that indirect block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -4636,9 +4642,9 @@ error:
 static unsigned
 test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4719,25 +4725,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_second_direct_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_first_recursive_indirect
+ * Function:    test_man_fill_first_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, create first recursive indirect block and filling all
  *              direct blocks in that indirect block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -4745,9 +4751,9 @@ error:
 static unsigned
 test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4820,26 +4826,26 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_first_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_second_recursive_indirect
+ * Function:    test_man_second_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, create first recursive indirect block, filling all
  *              direct blocks in that indirect block and adding another
  *              object to force creation of second recursive indirect block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -4847,9 +4853,9 @@ error:
 static unsigned
 test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -4929,27 +4935,27 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_second_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_second_recursive_indirect
+ * Function:    test_man_fill_second_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, create first recursive indirect block, filling all
  *              direct blocks in that indirect block and then create second
  *              recursive indirect block and fill all direct blocks in that
  *              indirect block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -4957,9 +4963,9 @@ error:
 static unsigned
 test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5036,27 +5042,27 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_second_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_recursive_indirect_row
+ * Function:    test_man_fill_recursive_indirect_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, create first recursive indirect block, filling all
  *              direct blocks in that indirect block and then create second
  *              recursive indirect block and fill all direct blocks in that
  *              indirect block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
  *
  *-------------------------------------------------------------------------
@@ -5064,9 +5070,9 @@ error:
 static unsigned
 test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5135,25 +5141,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_recursive_indirect_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_start_2nd_recursive_indirect
+ * Function:    test_man_start_2nd_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the first row of indirect
  *              blocks and start on first block in second row of indirect blocks
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5161,9 +5167,9 @@ error:
 static unsigned
 test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5243,25 +5249,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_start_2nd_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_recursive_indirect_two_deep
+ * Function:    test_man_recursive_indirect_two_deep
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5269,9 +5275,9 @@ error:
 static unsigned
 test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5344,26 +5350,26 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_recursive_indirect_two_deep() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_start_3rd_recursive_indirect
+ * Function:    test_man_start_3rd_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep and start first direct block
  *              in 3rd level of indirect blocks
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5371,9 +5377,9 @@ error:
 static unsigned
 test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5453,26 +5459,26 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_start_3rd_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_first_3rd_recursive_indirect
+ * Function:    test_man_fill_first_3rd_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep and fill first indirect block
  *              in 3rd level of indirect blocks
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5480,9 +5486,9 @@ error:
 static unsigned
 test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5563,26 +5569,26 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_first_3rd_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_3rd_recursive_indirect_row
+ * Function:    test_man_fill_3rd_recursive_indirect_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep and fill all indirect blocks
  *              first row of 3rd level of indirect blocks
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5590,9 +5596,9 @@ error:
 static unsigned
 test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5669,26 +5675,26 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_3rd_recursive_indirect_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_all_3rd_recursive_indirect
+ * Function:    test_man_fill_all_3rd_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep and fill all indirect blocks
  *              that are three levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5696,9 +5702,9 @@ error:
 static unsigned
 test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5775,27 +5781,27 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_all_3rd_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_start_4th_recursive_indirect
+ * Function:    test_man_start_4th_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep, fill all indirect blocks
  *              that are three levels deep and start first direct block that
  *              is four levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5803,9 +5809,9 @@ error:
 static unsigned
 test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -5889,27 +5895,27 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_start_4th_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_first_4th_recursive_indirect
+ * Function:    test_man_fill_first_4th_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep, fill all indirect blocks
  *              that are three levels deep and fill the first (3rd level)
  *              indirect block that is four levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -5917,9 +5923,9 @@ error:
 static unsigned
 test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -6008,27 +6014,27 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_first_4th_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_4th_recursive_indirect_row
+ * Function:    test_man_fill_4th_recursive_indirect_row
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep, fill all indirect blocks
  *              that are three levels deep and fill the first row of
  *              indirect block that is four levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -6036,9 +6042,9 @@ error:
 static unsigned
 test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -6119,27 +6125,27 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_4th_recursive_indirect_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_all_4th_recursive_indirect
+ * Function:    test_man_fill_all_4th_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep, fill all indirect blocks
  *              that are three levels deep and fill all rows of
  *              indirect blocks that are four levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -6147,9 +6153,9 @@ error:
 static unsigned
 test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -6230,17 +6236,17 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_all_4th_recursive_indirect() */
 #endif /* ALL_INSERT_TESTS */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_start_5th_recursive_indirect
+ * Function:    test_man_start_5th_recursive_indirect
  *
- * Purpose:	Test inserting mult. objects into absolute heap, creating
+ * Purpose:    Test inserting mult. objects into absolute heap, creating
  *              enough direct blocks to fill all direct rows of root indirect
  *              block, fill all direct blocks in the row of indirect
  *              blocks that are 2 levels deep, fill all indirect blocks
@@ -6248,11 +6254,11 @@ error:
  *              that are four levels deep and start first direct block in
  *              indirect blocks five levels deep
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -6260,9 +6266,9 @@ error:
 static unsigned
 test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -6363,22 +6369,22 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_start_5th_recursive_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_bogus
+ * Function:    test_man_remove_bogus
  *
- * Purpose:	Test removing bogus heap IDs
+ * Purpose:    Test removing bogus heap IDs
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -6386,9 +6392,9 @@ error:
 static unsigned
 test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
@@ -6516,22 +6522,22 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_bogus() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_one
+ * Function:    test_man_remove_one
  *
- * Purpose:	Test removing single object from heap
+ * Purpose:    Test removing single object from heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -6539,9 +6545,9 @@ error:
 static unsigned
 test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
@@ -6679,22 +6685,22 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_one() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_two
+ * Function:    test_man_remove_two
  *
- * Purpose:	Test removing two objects from heap
+ * Purpose:    Test removing two objects from heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 22, 2006
  *
  *-------------------------------------------------------------------------
@@ -6702,9 +6708,9 @@ error:
 static unsigned
 test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */
@@ -6871,23 +6877,23 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_two() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_one_larger
+ * Function:    test_man_remove_one_larger
  *
- * Purpose:	Test removing single larger (but < standalone size) object
+ * Purpose:    Test removing single larger (but < standalone size) object
  *              from heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, June  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -6895,9 +6901,9 @@ error:
 static unsigned
 test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
@@ -7039,23 +7045,23 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_one_larger() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_two_larger
+ * Function:    test_man_remove_two_larger
  *
- * Purpose:	Test removing two larger (but < standalone size) objects
+ * Purpose:    Test removing two larger (but < standalone size) objects
  *              from heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, June 10, 2006
  *
  *-------------------------------------------------------------------------
@@ -7063,9 +7069,9 @@ error:
 static unsigned
 test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */
@@ -7278,23 +7284,23 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_two_larger() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_three_larger
+ * Function:    test_man_remove_three_larger
  *
- * Purpose:	Test removing three larger (but < standalone size) objects
+ * Purpose:    Test removing three larger (but < standalone size) objects
  *              from heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, June 12, 2006
  *
  *-------------------------------------------------------------------------
@@ -7302,9 +7308,9 @@ error:
 static unsigned
 test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for first object */
@@ -7577,21 +7583,21 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_three_larger() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_incr_insert_remove
+ * Function:    test_man_incr_insert_remove
  *
- * Purpose:	Test incremental insert & removal of objects in heap
+ * Purpose:    Test incremental insert & removal of objects in heap
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Sunday, April 1, 2012
  *
  *-------------------------------------------------------------------------
@@ -7599,9 +7605,9 @@ error:
 static unsigned
 test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     unsigned char **heap_id = NULL;
@@ -7700,7 +7706,7 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
 
     HDfree(heap_id);
@@ -7709,18 +7715,18 @@ error:
     return 1;
 } /* test_man_incr_insert_remove() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_root_direct
+ * Function:    test_man_remove_root_direct
  *
- * Purpose:	Test filling and removing all objects from root direct block in
+ * Purpose:    Test filling and removing all objects from root direct block in
  *              heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 22, 2006
  *
  *-------------------------------------------------------------------------
@@ -7728,16 +7734,17 @@ error:
 static unsigned
 test_man_remove_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from root direct block of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from root direct block of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -7777,23 +7784,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_root_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_two_direct
+ * Function:    test_man_remove_two_direct
  *
- * Purpose:	Test filling and removing all objects from (first) two direct
+ * Purpose:    Test filling and removing all objects from (first) two direct
  *              blocks in heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 22, 2006
  *
  *-------------------------------------------------------------------------
@@ -7801,16 +7808,17 @@ error:
 static unsigned
 test_man_remove_two_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from two direct blocks of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from two direct blocks of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -7865,23 +7873,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_two_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_first_row
+ * Function:    test_man_remove_first_row
  *
- * Purpose:	Test filling and removing all objects from first row of direct
+ * Purpose:    Test filling and removing all objects from first row of direct
  *              blocks in heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, June  5, 2006
  *
  *-------------------------------------------------------------------------
@@ -7889,16 +7897,17 @@ error:
 static unsigned
 test_man_remove_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from first row of direct blocks of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from first row of direct blocks of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -7935,23 +7944,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_first_row() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_first_two_rows
+ * Function:    test_man_remove_first_two_rows
  *
- * Purpose:	Test filling and removing all objects from first two rows of
+ * Purpose:    Test filling and removing all objects from first two rows of
  *              direct blocks in heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, June 12, 2006
  *
  *-------------------------------------------------------------------------
@@ -7959,16 +7968,17 @@ error:
 static unsigned
 test_man_remove_first_two_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from first two rows of direct blocks of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from first two rows of direct blocks of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8007,23 +8017,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_first_two_rows() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_first_four_rows
+ * Function:    test_man_remove_first_four_rows
  *
- * Purpose:	Test filling and removing all objects from first four rows of
+ * Purpose:    Test filling and removing all objects from first four rows of
  *              direct blocks in heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, June 13, 2006
  *
  *-------------------------------------------------------------------------
@@ -8031,16 +8041,17 @@ error:
 static unsigned
 test_man_remove_first_four_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from first four rows of direct blocks of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from first four rows of direct blocks of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8083,23 +8094,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_first_four_rows() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_all_root_direct
+ * Function:    test_man_remove_all_root_direct
  *
- * Purpose:	Test filling and removing all objects from all direct blocks
+ * Purpose:    Test filling and removing all objects from all direct blocks
  *              in root indirect block of heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, June 13, 2006
  *
  *-------------------------------------------------------------------------
@@ -8107,16 +8118,17 @@ error:
 static unsigned
 test_man_remove_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from all direct blocks of root group in absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from all direct blocks of root group in absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8153,23 +8165,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_all_root_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_2nd_indirect
+ * Function:    test_man_remove_2nd_indirect
  *
- * Purpose:	Test filling and removing all objects up to 2nd level indirect
+ * Purpose:    Test filling and removing all objects up to 2nd level indirect
  *              blocks of heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, June 13, 2006
  *
  *-------------------------------------------------------------------------
@@ -8177,16 +8189,17 @@ error:
 static unsigned
 test_man_remove_2nd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from 2nd level indirect blocks of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from 2nd level indirect blocks of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8227,23 +8240,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_2nd_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_remove_3rd_indirect
+ * Function:    test_man_remove_3rd_indirect
  *
- * Purpose:	Test filling and removing all objects up to 3rd level indirect
+ * Purpose:    Test filling and removing all objects up to 3rd level indirect
  *              blocks of heap
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, July 24, 2006
  *
  *-------------------------------------------------------------------------
@@ -8251,16 +8264,17 @@ error:
 static unsigned
 test_man_remove_3rd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "removing all objects from 3rd level indirect blocks of absolute heap %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "removing all objects from 3rd level indirect blocks of absolute heap %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8305,26 +8319,26 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_remove_3rd_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_skip_start_block
+ * Function:    test_man_skip_start_block
  *
- * Purpose:	Test inserting object into absolute heap which is too large
+ * Purpose:    Test inserting object into absolute heap which is too large
  *              for starting block size, which forces root indirect block
  *              creation
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
  *
  *-------------------------------------------------------------------------
@@ -8332,16 +8346,17 @@ error:
 static unsigned
 test_man_skip_start_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "inserting object that is too large for starting block, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "inserting object that is too large for starting block, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -8384,24 +8399,24 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_skip_start_block() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_skip_start_block_add_back
+ * Function:    test_man_skip_start_block_add_back
  *
- * Purpose:	Test inserting object into absolute heap which is too large
+ * Purpose:    Test inserting object into absolute heap which is too large
  *              for starting block size, which forces root indirect block
  *              creation, then add object which fits in skipped direct block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 28, 2006
  *
  *-------------------------------------------------------------------------
@@ -8409,16 +8424,17 @@ error:
 static unsigned
 test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "skipping starting block, then adding object back to first block, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "skipping starting block, then adding object back to first block, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -8481,25 +8497,25 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_skip_start_block_add_back() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_skip_start_block_add_skipped
+ * Function:    test_man_skip_start_block_add_skipped
  *
- * Purpose:	Test inserting object into absolute heap which is too large
+ * Purpose:    Test inserting object into absolute heap which is too large
  *              for starting block size, which forces root indirect block
  *              creation, then add objects to fill skipped direct blocks
  *              and add another object to start on next "normal" block
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, March 28, 2006
  *
  *-------------------------------------------------------------------------
@@ -8507,9 +8523,9 @@ error:
 static unsigned
 test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -8517,7 +8533,8 @@ test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_t
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "skipping starting block, then adding objects to backfill and extend, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "skipping starting block, then adding objects to backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8590,25 +8607,25 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_skip_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_skip_2nd_block
+ * Function:    test_man_skip_2nd_block
  *
- * Purpose:	Test inserting object into absolute heap which is small
+ * Purpose:    Test inserting object into absolute heap which is small
  *              enough for starting block size, then add object too large
  *              for any blocks in first row of direct blocks, to force
  *              early creation of indirect block (and range of skipped blocks)
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, April  1, 2006
  *
  *-------------------------------------------------------------------------
@@ -8616,16 +8633,17 @@ error:
 static unsigned
 test_man_skip_2nd_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert object to initial block, then add object too large for starting direct blocks, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert object to initial block, then add object too large for starting direct blocks, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -8683,16 +8701,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_skip_2nd_block() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_skip_2nd_block_add_skipped
+ * Function:    test_man_skip_2nd_block_add_skipped
  *
- * Purpose:	Test inserting object into absolute heap which is small
+ * Purpose:    Test inserting object into absolute heap which is small
  *              enough for starting block size, then add object too large
  *              for any blocks in first row of direct blocks, to force
  *              early creation of indirect block (and range of skipped blocks).
@@ -8700,11 +8718,11 @@ error:
  *              block and all the skipped blocks, and one more object (to
  *              start next "normal" block).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, April  1, 2006
  *
  *-------------------------------------------------------------------------
@@ -8712,9 +8730,9 @@ error:
 static unsigned
 test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -8722,8 +8740,9 @@ test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_tes
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert object to initial block, then add object too large for starting direct blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    v;                      /* Local index variables */
+    /* Test description */
+    const char *base_desc = "insert object to initial block, then add object too large for starting direct blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8825,16 +8844,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_skip_2nd_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_one_partial_skip_2nd_block_add_skipped
+ * Function:    test_man_fill_one_partial_skip_2nd_block_add_skipped
  *
- * Purpose:	Test filling initial direct block, then add object small enough
+ * Purpose:    Test filling initial direct block, then add object small enough
  *              for initial block size (to create root indirect block), then
  *              add object too large for any blocks in first three rows of
  *              direct blocks, to force extension of indirect block (and range
@@ -8844,11 +8863,11 @@ error:
  *              block and all the skipped blocks, and one more object (to
  *              start next "normal" block).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
  *
  *-------------------------------------------------------------------------
@@ -8856,9 +8875,9 @@ error:
 static unsigned
 test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -8866,8 +8885,9 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "skipping blocks with indirect root, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u;                      /* Local index variable */
+    /* Test description */
+    const char *base_desc = "skipping blocks with indirect root, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -8991,16 +9011,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_one_partial_skip_2nd_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_row_skip_add_skipped
+ * Function:    test_man_fill_row_skip_add_skipped
  *
- * Purpose:	Test filling first row of direct blocks, then
+ * Purpose:    Test filling first row of direct blocks, then
  *              add object too large for any blocks in first three rows of
  *              direct blocks, to force extension of indirect block (and range
  *              of skipped blocks).
@@ -9009,11 +9029,11 @@ error:
  *              block and all the skipped blocks, and one more object (to
  *              start next "normal" block).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -9021,9 +9041,9 @@ error:
 static unsigned
 test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9031,7 +9051,8 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling first row, then skipping rows, then backfill and extend, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "filling first row, then skipping rows, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -9120,26 +9141,26 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_row_skip_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_skip_direct_skip_indirect_two_rows_add_skipped
+ * Function:    test_man_skip_direct_skip_indirect_two_rows_add_skipped
  *
- * Purpose:	Test adding object too large for all but the last row in the
+ * Purpose:    Test adding object too large for all but the last row in the
  *              direct blocks in root indirect block, then
  *              add object too large for initial block in first two rows of
  *              indirect blocks, to force extension of non-root
  *              indirect block (and range of skipped blocks).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, April 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -9147,9 +9168,9 @@ error:
 static unsigned
 test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9158,8 +9179,9 @@ test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "skipping direct blocks to last row and skipping two rows of root indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    v;                      /* Local index variables */
+    /* Test description */
+    const char *base_desc = "skipping direct blocks to last row and skipping two rows of root indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -9247,25 +9269,25 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_skip_direct_skip_indirect_two_rows_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_direct_skip_indirect_start_block_add_skipped
+ * Function:    test_man_fill_direct_skip_indirect_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block, then
+ * Purpose:    Test filling all direct blocks in root indirect block, then
  *              add object too large for initial block in first row of direct
  *              blocks in indirect block, to force extension of non-root
  *              indirect block (and range of skipped blocks).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
  *
  *-------------------------------------------------------------------------
@@ -9273,9 +9295,9 @@ error:
 static unsigned
 test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9283,7 +9305,8 @@ test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_crea
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks and skipping blocks in non-root indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "filling direct blocks and skipping blocks in non-root indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -9369,26 +9392,26 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_direct_skip_indirect_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped
+ * Function:    test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block, then
+ * Purpose:    Test filling all direct blocks in root indirect block, then
  *              add object too large for all direct blocks in first row of
  *              indirect blocks, to force skipping a row of indirect blocks
  *              (and range of skipped blocks), then backfill all direct blocks
  *              skipped and extend to next "normal" direct block.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
  *
  *-------------------------------------------------------------------------
@@ -9396,9 +9419,9 @@ error:
 static unsigned
 test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9408,8 +9431,9 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks and skipping row of non-root indirect blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u;                      /* Local index variable */
+    /* Test description */
+    const char *base_desc = "filling direct blocks and skipping row of non-root indirect blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -9496,27 +9520,27 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped
+ * Function:    test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, except the last
  *              one, then insert object insert object that is too large to
  *              hold in row of 2nd level indirect blocks (forcing the use of
  *              the next row of 2nd level blocks), then backfill all skipped
  *              direct blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -9524,9 +9548,9 @@ error:
 static unsigned
 test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9535,8 +9559,9 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, except last one, and insert object too large for 2nd level indirect blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u;                      /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, except last one, and insert object too large for 2nd level indirect blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -9635,16 +9660,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped
+ * Function:    test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block, then
+ * Purpose:    Test filling all direct blocks in root indirect block, then
  *              add object too large for all direct blocks in first row of
  *              indirect blocks, to force skipping a row of indirect blocks
  *              (and range of skipped blocks), then add object that is too
@@ -9654,11 +9679,11 @@ error:
  *              too large for initial block size in skipped indirect block
  *              row's direct blocks).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -9666,9 +9691,9 @@ error:
 static unsigned
 test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9678,8 +9703,9 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks and skipping row of non-root indirect blocks, then skip row of direct blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u;                      /* Local index variable */
+    /* Test description */
+    const char *base_desc = "filling direct blocks and skipping row of non-root indirect blocks, then skip row of direct blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -9800,25 +9826,25 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_direct_skip_indirect_two_rows_add_skipped
+ * Function:    test_man_fill_direct_skip_indirect_two_rows_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block, then
+ * Purpose:    Test filling all direct blocks in root indirect block, then
  *              add object too large for initial block in first two rows of
  *              indirect blocks, to force extension of non-root
  *              indirect block (and range of skipped blocks).
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, April 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -9826,9 +9852,9 @@ error:
 static unsigned
 test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9838,8 +9864,9 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks and skipping two rows of root indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks and skipping two rows of root indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -9951,27 +9978,27 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_direct_skip_indirect_two_rows_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped
+ * Function:    test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block, then
+ * Purpose:    Test filling all direct blocks in root indirect block, then
  *              add object too large for initial block in first two rows of
  *              indirect blocks, to force extension of non-root
  *              indirect block, then add object too large for first row of
  *              indirect blocks, (and ranges of skipped blocks), then backfill
  *              and extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -9979,9 +10006,9 @@ error:
 static unsigned
 test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -9991,8 +10018,9 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks and skipping two rows of root indirect block, skip one row of root indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks and skipping two rows of root indirect block, skip one row of root indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -10131,26 +10159,26 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_2nd_direct_skip_start_block_add_skipped
+ * Function:    test_man_fill_2nd_direct_skip_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, the insert object
  *              that is too large to hold in first row of direct blocks of
  *              3rd level indirect block, then backfill & extend all skipped
  *              3rd level indirect block's direct blocks.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -10158,9 +10186,9 @@ error:
 static unsigned
 test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -10168,7 +10196,8 @@ test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, and skip first rows of direct blocks of 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, and skip first rows of direct blocks of 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -10257,16 +10286,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_2nd_direct_skip_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped
+ * Function:    test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks in 3rd level indirect block, then insert object
  *              that is too large to hold in first row of direct blocks of
@@ -10274,11 +10303,11 @@ error:
  *              backfill & extend all skipped 2nd level indirect block's direct
  *              blocks.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -10286,9 +10315,9 @@ error:
 static unsigned
 test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -10296,7 +10325,8 @@ test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect block's direct blocks, and skip first rows of direct blocks of 3rd level indirect block's 2nd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
+     /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect block's direct blocks, and skip first rows of direct blocks of 3rd level indirect block's 2nd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -10395,27 +10425,27 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped
+ * Function:    test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks in 3rd level indirect block, then insert object
  *              that is too large to hold in first row of 2nd level indirect
  *              blocks of 3rd level indirect block, then backfill & extend all
  *              skipped direct blocks.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -10423,9 +10453,9 @@ error:
 static unsigned
 test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -10434,8 +10464,9 @@ test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(h
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect block's direct blocks, and skip first row of indirect blocks of 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect block's direct blocks, and skip first row of indirect blocks of 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -10542,16 +10573,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped
+ * Function:    test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks in 3rd level indirect block, then insert object
  *              that is too large to hold in first & second rows of 2nd level
@@ -10559,11 +10590,11 @@ error:
  *              has one row of 2nd level indirect blocks) of 3rd level indirect
  *             block, then backfill & extend all skipped direct blocks.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -10571,9 +10602,9 @@ error:
 static unsigned
 test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -10582,8 +10613,9 @@ test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect block's direct blocks, and skip first two rows of indirect blocks of 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect block's direct blocks, and skip first two rows of indirect blocks of 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -10694,16 +10726,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped
+ * Function:    test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, all 3rd level
  *              indirect blocks in first row except the last one, fill direct
  *              blocks in last 3rd level indirect block, then insert object
@@ -10712,11 +10744,11 @@ error:
  *              use of the next row of 3rd level blocks), then backfill all
  *              skipped direct blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tues, April 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -10724,9 +10756,9 @@ error:
 static unsigned
 test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -10735,8 +10767,9 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd level indirect blocks, except last one, fill all direct blocks in last 3rd level indirect block, and insert object too large for it's 2nd level indirect blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd level indirect blocks, except last one, fill all direct blocks in last 3rd level indirect block, and insert object too large for it's 2nd level indirect blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -10852,16 +10885,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped
+ * Function:    test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, all 3rd level
  *              indirect blocks in first row, fill direct blocks in 2nd row 3rd
  *              level indirect block, fill all direct blocks in 1st row of
@@ -10871,11 +10904,11 @@ error:
  *              next row of 2nd level blocks), then backfill all skipped direct
  *              blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tues, April 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -10883,9 +10916,9 @@ error:
 static unsigned
 test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -10894,8 +10927,8 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd level indirect blocks, fill all direct blocks in next 3rd level indirect block, fill all 1st row of 2nd level indirect blocks, except last one, and insert object too large for 2nd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
-    unsigned    u;                      /* Local index variables */
+    unsigned    u;                      /* Local index variables *//* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling first row of 3rd level indirect blocks, fill all direct blocks in next 3rd level indirect block, fill all 1st row of 2nd level indirect blocks, except last one, and insert object too large for 2nd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -11017,16 +11050,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped
+ * Function:    test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks and indirect blocks in 3rd level indirect block, then
  *              fill all direct blocks in 4th level indirect block, then
@@ -11034,11 +11067,11 @@ error:
  *              level indirect blocks of 4th level indirect block, then
  *              backfill all skipped direct blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Saturday, April 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -11046,9 +11079,9 @@ error:
 static unsigned
 test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -11057,8 +11090,9 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill 4th level indirect block's direct blocks, and skip first row of 2nd indirect blocks of 4th level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill 4th level indirect block's direct blocks, and skip first row of 2nd indirect blocks of 4th level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -11173,16 +11207,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped
+ * Function:    test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks and indirect blocks in 3rd level indirect block, then
  *              fill all direct blocks and 2nd level indirect blocks in 4th
@@ -11192,11 +11226,11 @@ error:
  *              3rd level indirect block, then
  *              backfill all skipped direct blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
  *
  *-------------------------------------------------------------------------
@@ -11204,9 +11238,9 @@ error:
 static unsigned
 test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -11215,8 +11249,9 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill 4th level indirect block's direct, 2nd level indirect blocks and 3rd level direct block, and skip first row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill 4th level indirect block's direct, 2nd level indirect blocks and 3rd level direct block, and skip first row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -11347,16 +11382,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped
+ * Function:    test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks and indirect blocks in 3rd level indirect block, fill all
  *              direct & indirect blocks in first row of 4th level indirect
@@ -11368,11 +11403,11 @@ error:
  *              3rd level indirect block (in 4th level indirect block), then
  *              backfill all skipped direct blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
  *
  *-------------------------------------------------------------------------
@@ -11380,9 +11415,9 @@ error:
 static unsigned
 test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -11391,8 +11426,9 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill first row of 4th level indirect blocks, fill 2nd row 4th level indirect block's direct, 2nd level indirect blocks, first row of 3rd level indirect blocks, 3rd level direct block in 2nd row, and skip first row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill first row of 4th level indirect blocks, fill 2nd row 4th level indirect block's direct, 2nd level indirect blocks, first row of 3rd level indirect blocks, 3rd level direct block in 2nd row, and skip first row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -11556,16 +11592,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped
+ * Function:    test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks and indirect blocks in 3rd level indirect block, fill all
  *              direct & indirect blocks in 4th level indirect
@@ -11579,11 +11615,11 @@ error:
  *              4th level block), then backfill all skipped direct blocks &
  *              extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
  *
  *-------------------------------------------------------------------------
@@ -11591,9 +11627,9 @@ error:
 static unsigned
 test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -11602,8 +11638,9 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill first row of 3rd level indirect blocks in 4th level indirect block except last 3rd level block, fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill first row of 3rd level indirect blocks in 4th level indirect block except last 3rd level block, fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -11749,16 +11786,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped
+ * Function:    test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped
  *
- * Purpose:	Test filling all direct blocks in root indirect block and all
+ * Purpose:    Test filling all direct blocks in root indirect block and all
  *              direct blocks in 2nd level indirect blocks, fill all direct
  *              blocks and indirect blocks in 3rd level indirect block, fill all
  *              direct & indirect blocks in first row of 4th level indirect
@@ -11772,11 +11809,11 @@ error:
  *              next row of 4th level blocks), then backfill all skipped direct
  *              blocks & extend.
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
  *
  *-------------------------------------------------------------------------
@@ -11784,9 +11821,9 @@ error:
 static unsigned
 test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -11795,8 +11832,9 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill first row of 4th level indirect blocks, except last one, fill first row of 3rd level indirect blocks in last 4th level indirect block except last 3rd level block, fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "filling direct blocks, filling 2nd level indirect blocks, filling 3rd level indirect blocks, fill first row of 4th level indirect blocks, except last one, fill first row of 3rd level indirect blocks in last 4th level indirect block except last 3rd level block, fill direct blocks in 3rd level block, and skip row of 2nd indirect blocks of 4th level indirect block's 3rd level indirect block, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -11978,27 +12016,27 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_frag_simple
+ * Function:    test_man_frag_simple
  *
- * Purpose:	Test inserting objects small enough to fit into first row of
+ * Purpose:    Test inserting objects small enough to fit into first row of
  *              direct blocks, but not to share a block with another object,
  *              until start-block-size * 2 blocks are reached.  Then, go back
  *              and fill in the space in the blocks skipped.
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, July 24, 2006
  *
  *-------------------------------------------------------------------------
@@ -12006,17 +12044,18 @@ error:
 static unsigned
 test_man_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "fragmenting small blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u;                      /* Local index variables */
+    /* Test description */
+    const char *base_desc = "fragmenting small blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -12110,26 +12149,26 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_frag_simple() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_frag_direct
+ * Function:    test_man_frag_direct
  *
- * Purpose:	Test inserting small object to fit into each direct block
+ * Purpose:    Test inserting small object to fit into each direct block
  *              in root block, but not to share a block with another object,
  *              Then, go back and fill in the space in the blocks skipped.
  *
  *              Then, go back and remove all objects
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July 25, 2006
  *
  *-------------------------------------------------------------------------
@@ -12137,9 +12176,9 @@ error:
 static unsigned
 test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -12147,8 +12186,9 @@ test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "fragmenting direct blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "fragmenting direct blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -12279,16 +12319,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_frag_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_frag_2nd_direct
+ * Function:    test_man_frag_2nd_direct
  *
- * Purpose:	Test filling all direct blocks in root indirect block, then
+ * Purpose:    Test filling all direct blocks in root indirect block, then
  *              inserting small object to fit into each direct block
  *              in 2nd level indirect block, but not to share a block with
  *              another object.
@@ -12296,11 +12336,11 @@ error:
  *
  *              Then, go back and remove all the objects
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July 25, 2006
  *
  *-------------------------------------------------------------------------
@@ -12308,9 +12348,9 @@ error:
 static unsigned
 test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -12319,8 +12359,9 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "fill root direct blocks, then fragment 2nd level indirect block's direct blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "fill root direct blocks, then fragment 2nd level indirect block's direct blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -12388,16 +12429,16 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_frag_2nd_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_man_frag_3rd_direct
+ * Function:    test_man_frag_3rd_direct
  *
- * Purpose:	Test filling all direct blocks in root indirect block and
+ * Purpose:    Test filling all direct blocks in root indirect block and
  *              all 2nd level indirect blocks, then
  *              inserting small object to fit into each direct block
  *              in 3rd level indirect block, but not to share a block with
@@ -12406,11 +12447,11 @@ error:
  *
  *              Then, go back and remove all objects
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, July 25, 2006
  *
  *-------------------------------------------------------------------------
@@ -12418,9 +12459,9 @@ error:
 static unsigned
 test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -12429,8 +12470,9 @@ test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "fill root direct blocks and 2nd level indirect blocks, then fragment 3rd level indirect block's direct blocks, then backfill and extend, then remove all objects %s";       /* Test description */
     unsigned    u, v;                   /* Local index variables */
+    /* Test description */
+    const char *base_desc = "fill root direct blocks and 2nd level indirect blocks, then fragment 3rd level indirect block's direct blocks, then backfill and extend, then remove all objects %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, &fill_size) < 0)
@@ -12506,23 +12548,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_man_frag_3rd_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_huge_insert_one
+ * Function:    test_huge_insert_one
  *
- * Purpose:	Test inserting one huge object in the heap
+ * Purpose:    Test inserting one huge object in the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August  7, 2006
  *
  *-------------------------------------------------------------------------
@@ -12530,9 +12572,9 @@ error:
 static unsigned
 test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -12544,7 +12586,8 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert one huge object, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert one huge object, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -12655,23 +12698,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_huge_insert_one() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_huge_insert_two
+ * Function:    test_huge_insert_two
  *
- * Purpose:	Test inserting two huge objects in the heap
+ * Purpose:    Test inserting two huge objects in the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -12679,9 +12722,9 @@ error:
 static unsigned
 test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -12694,7 +12737,8 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert two huge objects, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert two huge objects, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -12884,23 +12928,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_huge_insert_two() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_huge_insert_three
+ * Function:    test_huge_insert_three
  *
- * Purpose:	Test inserting three huge objects in the heap
+ * Purpose:    Test inserting three huge objects in the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -12908,9 +12952,9 @@ error:
 static unsigned
 test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -12924,7 +12968,8 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert three huge objects, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert three huge objects, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -13188,23 +13233,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_huge_insert_three() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_huge_insert_mix
+ * Function:    test_huge_insert_mix
  *
- * Purpose:	Test inserting a mix of 'normal' & 'huge' objects in the heap
+ * Purpose:    Test inserting a mix of 'normal' & 'huge' objects in the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, August 11, 2006
  *
  *-------------------------------------------------------------------------
@@ -13212,9 +13257,9 @@ error:
 static unsigned
 test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -13230,7 +13275,8 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert mix of normal & huge objects, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert mix of normal & huge objects, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -13612,21 +13658,21 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_huge_insert_mix() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_filtered_huge
+ * Function:    test_filtered_huge
  *
- * Purpose:	Test storing 'huge' object in a heap with I/O filters
+ * Purpose:    Test storing 'huge' object in a heap with I/O filters
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, August 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -13634,9 +13680,9 @@ error:
 static unsigned
 test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -13653,7 +13699,8 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
     size_t      old_actual_id_len = 0;  /* Old actual ID length */
     hbool_t     huge_ids_direct;        /* Are 'huge' objects directly acccessed? */
     hbool_t     pline_init = FALSE;     /* Whether the I/O pipeline has been initialized */
-    const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove %s";
 
     /* Copy heap creation properties */
     HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t));
@@ -13829,18 +13876,18 @@ error:
     return(1);
 } /* test_filtered_huge() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_tiny_insert_one
+ * Function:    test_tiny_insert_one
  *
- * Purpose:	Test inserting one tiny object in the heap
+ * Purpose:    Test inserting one tiny object in the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -13848,9 +13895,9 @@ error:
 static unsigned
 test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -13862,7 +13909,8 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert one tiny object, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert one tiny object, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -13973,23 +14021,23 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_tiny_insert_one() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_tiny_insert_two
+ * Function:    test_tiny_insert_two
  *
- * Purpose:	Test inserting two tiny objects in the heap
+ * Purpose:    Test inserting two tiny objects in the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -13997,9 +14045,9 @@ error:
 static unsigned
 test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -14012,7 +14060,8 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert two tiny objects, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert two tiny objects, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -14202,24 +14251,24 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_tiny_insert_two() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_tiny_insert_mix
+ * Function:    test_tiny_insert_mix
  *
- * Purpose:	Test inserting a mix of 'normal', 'huge' & 'tiny' objects in
+ * Purpose:    Test inserting a mix of 'normal', 'huge' & 'tiny' objects in
  *              the heap
  *
  *              Then, remove all the objects, in various ways
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -14227,9 +14276,9 @@ error:
 static unsigned
 test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
@@ -14247,7 +14296,8 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     size_t      robj_size;              /* Size of object read */
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
-    const char *base_desc = "insert mix of normal, huge & tiny objects, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert mix of normal, huge & tiny objects, then remove %s";
 
     /* Perform common test initialization operations */
     if(begin_test(tparam, base_desc, &keep_ids, NULL) < 0)
@@ -14809,21 +14859,21 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_tiny_insert_mix() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_filtered_man_root_direct
+ * Function:    test_filtered_man_root_direct
  *
- * Purpose:	Test storing one 'managed' object in a heap with I/O filters
+ * Purpose:    Test storing one 'managed' object in a heap with I/O filters
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
  *
  *-------------------------------------------------------------------------
@@ -14831,9 +14881,9 @@ error:
 static unsigned
 test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -14848,7 +14898,8 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    deflate_level;          /* Deflation level */
-    const char *base_desc = "insert one 'managed' object into heap with I/O filters, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert one 'managed' object into heap with I/O filters, then remove %s";
 
     /* Copy heap creation properties */
     HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t));
@@ -14981,21 +15032,21 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_filtered_man_root_direct() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_filtered_man_root_indirect
+ * Function:    test_filtered_man_root_indirect
  *
- * Purpose:	Test storing several objects in a 'managed heap with I/O filters
+ * Purpose:    Test storing several objects in a 'managed heap with I/O filters
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, October 24, 2006
  *
  *-------------------------------------------------------------------------
@@ -15003,9 +15054,9 @@ error:
 static unsigned
 test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -15021,7 +15072,8 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     unsigned char obj_type;             /* Type of storage for object */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    deflate_level;          /* Deflation level */
-    const char *base_desc = "insert two 'managed' objects into heap with I/O filters, then remove %s";       /* Test description */
+    /* Test description */
+    const char *base_desc = "insert two 'managed' objects into heap with I/O filters, then remove %s";
 
     /* Copy heap creation properties */
     HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t));
@@ -15306,25 +15358,25 @@ error:
     H5E_BEGIN_TRY {
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_filtered_man_root_indirect() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_random
+ * Function:    test_random
  *
- * Purpose:	Test inserting random sized objects into a heap, and read
+ * Purpose:    Test inserting random sized objects into a heap, and read
  *              them back.
  *
  *              Then, go back and remove all objects
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, May  9, 2006
  *
  *-------------------------------------------------------------------------
@@ -15332,9 +15384,9 @@ error:
 static unsigned
 test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -15510,21 +15562,21 @@ error:
     return(1);
 } /* test_random() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_random_pow2
+ * Function:    test_random_pow2
  *
- * Purpose:	Test inserting random sized objects with a "power of 2
+ * Purpose:    Test inserting random sized objects with a "power of 2
  *              distribution" (which favors small objects) into a heap,
  *              and read them back.
  *
  *              Then, go back and remove all objects
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	1
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
  *
  *-------------------------------------------------------------------------
@@ -15532,9 +15584,9 @@ error:
 static unsigned
 test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -15721,16 +15773,16 @@ error:
     return(1);
 } /* test_random_pow2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_write
+ * Function:    test_write
  *
- * Purpose:	Test inserting objects, then changing the value for them.
+ * Purpose:    Test inserting objects, then changing the value for them.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, December 18, 2006
  *
  *-------------------------------------------------------------------------
@@ -15750,9 +15802,9 @@ static size_t test_write_filter(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATT
 static unsigned
 test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
@@ -16000,23 +16052,23 @@ error:
         H5MM_xfree(rewrite_obj);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_write() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_bug1
+ * Function:    test_bug1
  *
- * Purpose:	Test inserting several objects, then deleting one and
+ * Purpose:    Test inserting several objects, then deleting one and
  *              re-inserting an object, along with opening and closing
  *              the file.
  *
- * Return:	Success:	0
- *		Failure:	1
+ * Return:    Success:    0
+ *        Failure:    1
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Tuesday, November 28, 2006
  *
  *-------------------------------------------------------------------------
@@ -16024,9 +16076,9 @@ error:
 static unsigned
 test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
 {
-    hid_t	file = -1;              /* File ID */
-    char	filename[FHEAP_FILENAME_LEN];         /* Filename to use */
-    H5F_t	*f = NULL;              /* Internal file object pointer */
+    hid_t    file = -1;              /* File ID */
+    char    filename[FHEAP_FILENAME_LEN];         /* Filename to use */
+    H5F_t    *f = NULL;              /* Internal file object pointer */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
@@ -16175,22 +16227,22 @@ error:
         H5MM_xfree(keep_ids.offs);
         if(fh)
             H5HF_close(fh);
-	H5Fclose(file);
+    H5Fclose(file);
     } H5E_END_TRY;
     return(1);
 } /* test_bug1() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test the fractal heap code
+ * Purpose:    Test the fractal heap code
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Friday, February 24, 2006
  *
  *-------------------------------------------------------------------------
@@ -16201,14 +16253,14 @@ main(void)
     fheap_test_param_t tparam;          /* Testing parameters */
     H5HF_create_t small_cparam;         /* Creation parameters for "small" heap */
     H5HF_create_t large_cparam;         /* Creation parameters for "large" heap */
-    hid_t	fapl = -1, def_fapl = -1;   /* File access property list for data files */
-    hid_t	pb_fapl = -1;               /* File access property list for data files */
-    hid_t	fcpl = -1, def_fcpl = -1;   /* File creation property list for data files */
+    hid_t    fapl = -1, def_fapl = -1;   /* File access property list for data files */
+    hid_t    pb_fapl = -1;               /* File access property list for data files */
+    hid_t    fcpl = -1, def_fcpl = -1;   /* File creation property list for data files */
     fheap_test_type_t curr_test;        /* Current test being worked on */
     unsigned    u, v;                   /* Local index variable */
-    unsigned	nerrors = 0;            /* Cumulative error count */
+    unsigned    nerrors = 0;            /* Cumulative error count */
     unsigned num_pb_fs = 1;             /* The number of settings to test for page buffering and file space handling */
-    int	ExpressMode;                    /* Express testing level */
+    int    ExpressMode;                    /* Express testing level */
     const char *envval;                 /* Environment variable */
     hbool_t contig_addr_vfd;            /* Whether VFD used has a contigous address space */
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
diff --git a/test/file_image.c b/test/file_image.c
index 0d4873a..d784df2 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -67,7 +67,7 @@ typedef struct {
     H5FD_file_image_op_t free_src;
 } udata_t;
 
-
+
 /******************************************************************************
  * Function:    test_properties
  *
@@ -162,7 +162,7 @@ error:
     return retval;
 } /* end test_properties() */
 
-
+
 /******************************************************************************
  * Function:    malloc_cb
  *
@@ -185,7 +185,7 @@ malloc_cb(size_t size, H5FD_file_image_op_t op, void *udata)
     return HDmalloc(size);
 }
 
-
+
 /******************************************************************************
  * Function:    memcpy_cb
  *
@@ -208,7 +208,7 @@ memcpy_cb(void *dest, const void *src, size_t size, H5FD_file_image_op_t op, voi
     return HDmemcpy(dest, src, size);
 }
 
-
+
 /******************************************************************************
  * Function:    realloc_cb
  *
@@ -231,7 +231,7 @@ realloc_cb(void *ptr, size_t size, H5FD_file_image_op_t op, void *udata)
     return HDrealloc(ptr,size);
 }
 
-
+
 /******************************************************************************
  * Function:    free_cb
  *
@@ -253,7 +253,7 @@ free_cb(void *ptr, H5FD_file_image_op_t op, void *udata)
     return(SUCCEED);
 }
 
-
+
 /******************************************************************************
  * Function:    udata_copy_cb
  *
@@ -277,7 +277,7 @@ udata_copy_cb(void *udata)
     return udata;
 }
 
-
+
 /******************************************************************************
  * Function:    udata_free_cb
  *
@@ -301,7 +301,7 @@ udata_free_cb(void *udata)
     return(SUCCEED);
 }
 
-
+
 /******************************************************************************
  * Function:    reset_udata
  *
@@ -320,7 +320,7 @@ reset_udata(udata_t *u)
     u->malloc_src = u->memcpy_src = u->realloc_src = u->free_src = H5FD_FILE_IMAGE_OP_NO_OP;
 }
 
-
+
 /******************************************************************************
  * Function:    test_callbacks
  *
@@ -509,7 +509,7 @@ error:
     return 1;
 } /* test_callbacks() */
 
-
+
 /******************************************************************************
  * Function:    test_core
  *
@@ -657,7 +657,7 @@ error:
     return 1;
 } /* end test_core() */
 
-
+
 /******************************************************************************
  * Function:    test_get_file_image
  *
@@ -678,11 +678,11 @@ error:
  *      'member_file_name' in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static int
 test_get_file_image(const char * test_banner,
                     const int file_name_num,
-		    hid_t fapl,
+            hid_t fapl,
                     hbool_t user)
 {
     char file_name[1024] = "\0";
@@ -783,7 +783,7 @@ test_get_file_image(const char * test_banner,
         ssize_t member_size;
         ssize_t size_remaining;
 
-	/*
+    /*
          * Modifications need to be made to accommodate userblock when
          * H5Fget_file_image() works for family driver
          */
@@ -855,7 +855,7 @@ test_get_file_image(const char * test_banner,
          * the remainder of the file is all '\0's.
          */
         file_size = (ssize_t)stat_buf.st_size;
-	if(user) {
+    if(user) {
             VERIFY(file_size > USERBLOCK_SIZE, "file size !> userblock size.");
             file_size -= USERBLOCK_SIZE;
         }
@@ -873,7 +873,7 @@ test_get_file_image(const char * test_banner,
         fd = HDopen(file_name, O_RDONLY);
         VERIFY(fd >= 0, "HDopen() failed.");
 
-	if(user) {
+    if(user) {
             HDoff_t off;
 
             /* Position at userblock */
@@ -945,9 +945,9 @@ test_get_file_image(const char * test_banner,
 error:
     return 1;
 } /* end test_get_file_image() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
+
 
-
 /******************************************************************************
  * Function:    test_get_file_image_error_rejection
  *
@@ -1335,28 +1335,28 @@ main(void)
     /* Perform tests with/without user block */
     for(user = FALSE; user <= TRUE; user++) {
 
-	/* test H5Fget_file_image() with sec2 driver */
-	fapl = H5Pcreate(H5P_FILE_ACCESS);
-	if(H5Pset_fapl_sec2(fapl) < 0)
-	    errors++;
-	else
-	    errors += test_get_file_image("H5Fget_file_image() with sec2 driver",
+    /* test H5Fget_file_image() with sec2 driver */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    if(H5Pset_fapl_sec2(fapl) < 0)
+        errors++;
+    else
+        errors += test_get_file_image("H5Fget_file_image() with sec2 driver",
                                       0, fapl, user);
 
-	/* test H5Fget_file_image() with stdio driver */
-	fapl = H5Pcreate(H5P_FILE_ACCESS);
-	if(H5Pset_fapl_stdio(fapl) < 0)
-	    errors++;
-	else
-	    errors += test_get_file_image("H5Fget_file_image() with stdio driver",
+    /* test H5Fget_file_image() with stdio driver */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    if(H5Pset_fapl_stdio(fapl) < 0)
+        errors++;
+    else
+        errors += test_get_file_image("H5Fget_file_image() with stdio driver",
                                       1, fapl, user);
 
-	/* test H5Fget_file_image() with core driver */
-	fapl = H5Pcreate(H5P_FILE_ACCESS);
-	if(H5Pset_fapl_core(fapl, (size_t)(64 *1024), TRUE) < 0)
-	    errors++;
-	else
-	    errors += test_get_file_image("H5Fget_file_image() with core driver",
+    /* test H5Fget_file_image() with core driver */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    if(H5Pset_fapl_core(fapl, (size_t)(64 *1024), TRUE) < 0)
+        errors++;
+    else
+        errors += test_get_file_image("H5Fget_file_image() with core driver",
                                       2, fapl, user);
 
      } /* end for */
diff --git a/test/h5test.c b/test/h5test.c
index 022bfde..277e77b 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -203,7 +203,7 @@ h5_clean_files(const char *base_name[], hid_t fapl)
  *      sub_filename in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 void
 h5_delete_test_file(const char *base_name, hid_t fapl)
 {
@@ -253,7 +253,7 @@ h5_delete_test_file(const char *base_name, hid_t fapl)
 
     return;
 } /* end h5_delete_test_file() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
 
 
 /*-------------------------------------------------------------------------
@@ -1362,7 +1362,7 @@ h5_dump_info_object(MPI_Info info)
  *      temp in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 h5_stat_size_t
 h5_get_file_size(const char *filename, hid_t fapl)
 {
@@ -1464,7 +1464,7 @@ h5_get_file_size(const char *filename, hid_t fapl)
 
     return(-1);
 } /* end get_file_size() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
 
 /*
  * This routine is designed to provide equivalent functionality to 'printf'
diff --git a/test/ntypes.c b/test/ntypes.c
index e371b93..34425c4 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -12,10 +12,10 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Raymond Lu
+ * Programmer:    Raymond Lu
  *              October 14, 2001
  *
- * Purpose:	Tests the H5Tget_native_type function.
+ * Purpose:    Tests the H5Tget_native_type function.
  */
 
 #include "h5test.h"
@@ -30,23 +30,23 @@ const char *FILENAME[] = {
 #define DIM3    20
 
 
-int	ipoints2[DIM0][DIM1], icheck2[DIM0][DIM1];
-short	spoints2[DIM0][DIM1], scheck2[DIM0][DIM1];
-int	ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5];
+int    ipoints2[DIM0][DIM1], icheck2[DIM0][DIM1];
+short    spoints2[DIM0][DIM1], scheck2[DIM0][DIM1];
+int    ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5];
 
-#define DSET_ATOMIC_NAME_1	"atomic_type_1"
-#define DSET_ATOMIC_NAME_2	"atomic_type_2"
-#define DSET_ATOMIC_NAME_3	"atomic_type_3"
-#define DSET_ATOMIC_NAME_4	"atomic_type_4"
-#define DSET_ATOMIC_NAME_5	"atomic_type_5"
+#define DSET_ATOMIC_NAME_1    "atomic_type_1"
+#define DSET_ATOMIC_NAME_2    "atomic_type_2"
+#define DSET_ATOMIC_NAME_3    "atomic_type_3"
+#define DSET_ATOMIC_NAME_4    "atomic_type_4"
+#define DSET_ATOMIC_NAME_5    "atomic_type_5"
 #define DSET_COMPOUND_NAME      "compound_type"
 #define DSET_COMPOUND_NAME_2    "compound_type_2"
 #define DSET_COMPOUND_NAME_3    "compound_type_3"
 #define DSET_COMPOUND_NAME_4    "compound_type_4"
-#define DSET_ENUM_NAME	        "enum_type"
-#define DSET_ARRAY_NAME	        "array_type"
-#define DSET_ARRAY2_NAME	"array_type_2"
-#define DSET_VL_NAME	        "vl_type"
+#define DSET_ENUM_NAME            "enum_type"
+#define DSET_ARRAY_NAME            "array_type"
+#define DSET_ARRAY2_NAME    "array_type_2"
+#define DSET_VL_NAME            "vl_type"
 #define DSET_VLSTR_NAME         "vlstr_type"
 #define DSET_STR_NAME           "str_type"
 #define DSET_OPAQUE_NAME        "opaque_type"
@@ -55,23 +55,23 @@ int	ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5];
 
 #define SPACE1_DIM1             4
 #define SPACE1_RANK             1
-#define SPACE2_RANK	        2
-#define SPACE2_DIM1	        10
-#define SPACE2_DIM2	        10
+#define SPACE2_RANK            2
+#define SPACE2_DIM1            10
+#define SPACE2_DIM2            10
 #define BITFIELD_ENUMB          8
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_atomic_dtype
+ * Function:    test_atomic_dtype
  *
- * Purpose:	Test H5Tget_native_type for atomic datatype
+ * Purpose:    Test H5Tget_native_type for atomic datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -80,10 +80,10 @@ int	ipoints3[DIM0][DIM1][5], icheck3[DIM0][DIM1][5];
 static herr_t
 test_atomic_dtype(hid_t file)
 {
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1;
-    int		i, j, n;
-    hsize_t	dims[2];
+    int        i, j, n;
+    hsize_t    dims[2];
     void       *tmp = NULL;
 
     TESTING("atomic datatype");
@@ -273,18 +273,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_dtype2
+ * Function:    test_compound_dtype2
  *
- * Purpose:	Test H5Tget_native_type for compound datatype
+ * Purpose:    Test H5Tget_native_type for compound datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -304,13 +304,13 @@ test_compound_dtype2(hid_t file)
         s2              st;
         unsigned long long       l;
     } s1;
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1,
                 tid_m2 = -1, mem_id = -1, nest_mem_id = -1;
-    int		i, j, n;
-    hsize_t	dims[2];
+    int        i, j, n;
+    hsize_t    dims[2];
     s1         *temp_point = NULL, *temp_check = NULL;
-    s1 	       *points = NULL, *check = NULL;
+    s1            *points = NULL, *check = NULL;
     void       *tmp = NULL, *bkg = NULL;
 
     TESTING("nested compound datatype");
@@ -572,18 +572,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_dtype
+ * Function:    test_compound_dtype
  *
- * Purpose:	Test H5Tget_native_type for compound datatype
+ * Purpose:    Test H5Tget_native_type for compound datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -597,10 +597,10 @@ test_compound_dtype(hid_t file)
         unsigned int    i;
         long long       l;
     } s1;
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, tid = -1, tid2 = -1, mem_id = -1;
-    int		i, j, n;
-    hsize_t	dims[2];
+    int        i, j, n;
+    hsize_t    dims[2];
     s1         *temp_point = NULL;
     s1         *temp_check = NULL;
     s1         *points = NULL;
@@ -772,18 +772,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_dtype3
+ * Function:    test_compound_dtype3
  *
- * Purpose:	Test H5Tget_native_type for compound datatype
+ * Purpose:    Test H5Tget_native_type for compound datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -797,14 +797,14 @@ test_compound_dtype3(hid_t file)
         int             a[5];
         long long       l;
     } s1;
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1,
                 tid_m2 = -1, mem_id = -1, nest_mem_id = -1;
     hsize_t     array_dims[1] = {5};
-    int		i, j, k, n;
-    hsize_t	dims[2];
+    int        i, j, k, n;
+    hsize_t    dims[2];
     s1         *temp_point = NULL, *temp_check = NULL;
-    s1 	       *points = NULL, *check = NULL;
+    s1            *points = NULL, *check = NULL;
     void       *tmp = NULL, *bkg = NULL;
 
     TESTING("compound datatype with array as field");
@@ -997,18 +997,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_compound_opaque
+ * Function:    test_compound_opaque
  *
- * Purpose:	Test H5Tget_native_type for compound datatype with opaque field
+ * Purpose:    Test H5Tget_native_type for compound datatype with opaque field
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Quincey Koziol
- *		January 31, 2004
+ * Programmer:    Quincey Koziol
+ *        January 31, 2004
  *
  * Modifications:
  *
@@ -1022,13 +1022,13 @@ test_compound_opaque(hid_t file)
         unsigned char   o[5];
         long long       l;
     } s1;
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid_m = -1,
                 mem_id = -1;
-    int		i, j, k, n;
-    hsize_t	dims[2];
+    int        i, j, k, n;
+    hsize_t    dims[2];
     s1         *temp_point = NULL, *temp_check = NULL;
-    s1 	       *points = NULL, *check = NULL;
+    s1            *points = NULL, *check = NULL;
     void       *tmp = NULL, *bkg = NULL;
 
     TESTING("compound datatype with opaque field");
@@ -1209,18 +1209,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_enum_dtype
+ * Function:    test_enum_dtype
  *
- * Purpose:	Test H5Tget_native_type for enumerate datatype
+ * Purpose:    Test H5Tget_native_type for enumerate datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -1229,10 +1229,10 @@ error:
 static herr_t
 test_enum_dtype(hid_t file)
 {
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       tid = -1, tid_m = -1, dtype = -1, native_type = -1;
-    int		i, j, n;
-    hsize_t	dims[2];
+    int        i, j, n;
+    hsize_t    dims[2];
     void        *tmp = NULL;
     short        colors[8];
     unsigned char sub_colors[16];
@@ -1351,18 +1351,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_array_dtype
+ * Function:    test_array_dtype
  *
- * Purpose:	Test H5Tget_native_type for array datatype
+ * Purpose:    Test H5Tget_native_type for array datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -1376,12 +1376,12 @@ test_array_dtype(hid_t file)
         int     i;
         long long l;
     } s1;
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, tid = -1, tid2 = -1, tid3 = -1, tid_m = -1;
-    int		i, j, k, n;
-    hsize_t	space_dims[2], array_dims[1]={5};
+    int        i, j, k, n;
+    hsize_t    space_dims[2], array_dims[1]={5};
     s1         *temp_point = NULL, *temp_check = NULL;
-    s1 	       *points = NULL, *check = NULL;
+    s1            *points = NULL, *check = NULL;
     void       *tmp = NULL;
 
     TESTING("array of compound datatype");
@@ -1518,18 +1518,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_array_dtype2
+ * Function:    test_array_dtype2
  *
- * Purpose:	Test H5Tget_native_type for array datatype
+ * Purpose:    Test H5Tget_native_type for array datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -1538,10 +1538,10 @@ error:
 static herr_t
 test_array_dtype2(hid_t file)
 {
-    hid_t	dataset = -1, space = -1;
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, tid = -1, tid_m = -1;
-    int		i, j, k, n;
-    hsize_t	space_dims[2], array_dims[1] = {5};
+    int        i, j, k, n;
+    hsize_t    space_dims[2], array_dims[1] = {5};
     void       *tmp = NULL;
 
     TESTING("array of atomic datatype");
@@ -1641,18 +1641,18 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_vl_dtype
+ * Function:    test_vl_dtype
  *
- * Purpose:	Test H5Tget_native_type for variable length datatype
+ * Purpose:    Test H5Tget_native_type for variable length datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -1664,10 +1664,10 @@ test_vl_dtype(hid_t file)
     hvl_t       wdata[SPACE1_DIM1];   /* Information to write */
     hvl_t       rdata[SPACE1_DIM1];   /* Information read in */
     hvl_t       *t1, *t2;             /* Temporary pointer to VL information */
-    hsize_t	dims1[] = {SPACE1_DIM1};
-    hid_t	dataset = -1, space = -1;
+    hsize_t    dims1[] = {SPACE1_DIM1};
+    hid_t    dataset = -1, space = -1;
     hid_t       dtype = -1, native_type = -1, nat_super_type = -1, tid = -1, tid2 = -1, tid_m = -1, tid_m2 = -1;
-    size_t	i, j, k;
+    size_t    i, j, k;
     void      **tmp = NULL;
 
     TESTING("variable length datatype");
@@ -1825,18 +1825,18 @@ error:
     return -1;
 } /* end test_vl_type() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_vlstr_dtype
+ * Function:    test_vlstr_dtype
  *
- * Purpose:	Test H5Tget_native_type for variable length string datatype
+ * Purpose:    Test H5Tget_native_type for variable length string datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -1845,18 +1845,19 @@ error:
 static herr_t
 test_vlstr_dtype(hid_t file)
 {
+    /* Information to write */
     const char *wdata[SPACE1_DIM1]= {
             "Four score and seven years ago our forefathers brought forth on this continent a new nation,",
             "conceived in liberty and dedicated to the proposition that all men are created equal.",
             "Now we are engaged in a great civil war,",
             "testing whether that nation or any nation so conceived and so dedicated can long endure."
-    };                                  /* Information to write */
+    };
     char       *rdata[SPACE1_DIM1];     /* Information read in */
     hbool_t     rdata_alloc = FALSE;    /* Whether the read data is allocated */
-    hid_t	dataset = -1;	        /* Dataset ID			*/
-    hid_t	sid1 = -1;              /* Dataspace ID			*/
-    hid_t	tid1 = -1, dtype = -1, native_type = -1;     /* Datatype ID			*/
-    hsize_t	dims1[] = {SPACE1_DIM1};
+    hid_t    dataset = -1;            /* Dataset ID            */
+    hid_t    sid1 = -1;              /* Dataspace ID            */
+    hid_t    tid1 = -1, dtype = -1, native_type = -1;     /* Datatype ID            */
+    hsize_t    dims1[] = {SPACE1_DIM1};
     unsigned    i;                          /* counting variable */
 
     /* Output message about test being performed */
@@ -1951,18 +1952,18 @@ error:
     return -1;
 } /* end test_vlstr_dtype() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_str_dtype
+ * Function:    test_str_dtype
  *
- * Purpose:	Test H5Tget_native_type for fixed-length string datatype
+ * Purpose:    Test H5Tget_native_type for fixed-length string datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -1978,10 +1979,10 @@ test_str_dtype(hid_t file)
             "4th"
     };                              /* Information to write */
     char        rdata[SPACE1_DIM1][4];  /* Information read in */
-    hid_t	dataset = -1;	    /* Dataset ID			*/
-    hid_t	sid1 = -1;          /* Dataspace ID			*/
-    hid_t	tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID			*/
-    hsize_t	dims1[] = {SPACE1_DIM1};
+    hid_t    dataset = -1;        /* Dataset ID            */
+    hid_t    sid1 = -1;          /* Dataspace ID            */
+    hid_t    tid1 = -1, dtype = -1, native_type = -1; /* Datatype ID            */
+    hsize_t    dims1[] = {SPACE1_DIM1};
     unsigned    i;                      /* counting variable */
 
     /* Output message about test being performed */
@@ -2063,18 +2064,18 @@ error:
     return -1;
 } /* end test_str_dtype() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_refer_dtype
+ * Function:    test_refer_dtype
  *
- * Purpose:	Test H5Tget_native_type for reference datatype
+ * Purpose:    Test H5Tget_native_type for reference datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -2090,11 +2091,11 @@ test_refer_dtype(hid_t file)
         float c;
     } s1_t;
 
-    hid_t	dataset = -1;   /* Dataset ID			*/
-    hid_t	group = -1;     /* Group ID             */
-    hid_t	sid1 = -1;      /* Dataspace ID			*/
-    hid_t	tid1 = -1, dtype = -1, native_type = -1;       /* Datatype ID	*/
-    hsize_t	dims1[] = {1};
+    hid_t    dataset = -1;   /* Dataset ID            */
+    hid_t    group = -1;     /* Group ID             */
+    hid_t    sid1 = -1;      /* Dataspace ID            */
+    hid_t    tid1 = -1, dtype = -1, native_type = -1;       /* Datatype ID    */
+    hsize_t    dims1[] = {1};
     H5O_type_t  obj_type;       /* Object type */
     hobj_ref_t *wbuf = NULL,    /* buffer to write to disk */
                *rbuf = NULL;    /* buffer read from disk */
@@ -2233,18 +2234,18 @@ error:
     return -1;
 }   /* test_refer_dtype() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_refer_dtype2
+ * Function:    test_refer_dtype2
  *
- * Purpose:	Test H5Tget_native_type for reference
+ * Purpose:    Test H5Tget_native_type for reference
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -2253,10 +2254,10 @@ error:
 static herr_t
 test_refer_dtype2(hid_t file)
 {
-    hid_t           dset1 = -1,      /* Dataset ID			*/
+    hid_t           dset1 = -1,      /* Dataset ID            */
                     dset2 = -1;      /* Dereferenced dataset ID */
-    hid_t           sid1 = -1,       /* Dataspace ID	#1		*/
-                    sid2 = -1;       /* Dataspace ID	#2		*/
+    hid_t           sid1 = -1,       /* Dataspace ID    #1        */
+                    sid2 = -1;       /* Dataspace ID    #2        */
     hid_t           dtype = -1, native_type = -1;
     hsize_t         dims1[] = { 1 }, dims2[] = { SPACE2_DIM1, SPACE2_DIM2 };
     hsize_t         start[SPACE2_RANK];     /* Starting location of hyperslab */
@@ -2447,18 +2448,18 @@ error:
     return -1;
 }   /* test_refer_dtype2() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_opaque_dtype
+ * Function:    test_opaque_dtype
  *
- * Purpose:	Test H5Tget_native_type for opaque datatype
+ * Purpose:    Test H5Tget_native_type for opaque datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -2467,11 +2468,11 @@ error:
 static herr_t
 test_opaque_dtype(hid_t file)
 {
-    hid_t	     type = -1, space = -1, dset = -1;
+    hid_t         type = -1, space = -1, dset = -1;
     hid_t            dataset = -1, dtype = -1, native_type = -1;
     size_t           i;
     unsigned char    wbuf[32], rbuf[32];
-    hsize_t	     nelmts;
+    hsize_t         nelmts;
 
     TESTING("opaque datatype");
 
@@ -2533,18 +2534,18 @@ error:
     return -1;
 } /* test_opaque_dtype */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	test_bitfield_dtype
+ * Function:    test_bitfield_dtype
  *
- * Purpose:	Test H5Tget_native_type for bitfield datatype
+ * Purpose:    Test H5Tget_native_type for bitfield datatype
  *
- * Return:	Success:	0
+ * Return:    Success:    0
  *
- *		Failure:	-1
+ *        Failure:    -1
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *              Raymond Lu
@@ -2556,14 +2557,14 @@ error:
 static herr_t
 test_bitfield_dtype(hid_t file)
 {
-    hid_t		type=-1, space=-1, dset1=-1, dset2=-1;
+    hid_t        type=-1, space=-1, dset1=-1, dset2=-1;
     hid_t               dataset1=-1, dataset2=-1, dtype=-1, native_type=-1;
-    size_t		ntype_size, i;
-    unsigned char  	wbuf[BITFIELD_ENUMB*sizeof(int)];
+    size_t        ntype_size, i;
+    unsigned char      wbuf[BITFIELD_ENUMB*sizeof(int)];
     unsigned char       *p=NULL;
     void                *rbuf = NULL;
     unsigned int        intw[BITFIELD_ENUMB], intr[BITFIELD_ENUMB];
-    hsize_t		nelmts;
+    hsize_t        nelmts;
 
     TESTING("bitfield datatype");
 
@@ -2665,7 +2666,7 @@ error:
     return -1;
 } /* test_bitfield_dtype */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: test_ninteger
  *
@@ -2845,14 +2846,14 @@ error:
     return -1;
 } /* end test_ninteger() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Test H5Tget_native_type for different datatype
+ * Purpose:    Test H5Tget_native_type for different datatype
  *
- * Programmer:	Raymond Lu
- *		October 15, 2002
+ * Programmer:    Raymond Lu
+ *        October 15, 2002
  *
  * Modifications:
  *
@@ -2861,9 +2862,9 @@ error:
 int
 main(void)
 {
-    hid_t	file, fapl;
-    int		nerrors = 0;
-    char	filename[1024];
+    hid_t    file, fapl;
+    int        nerrors = 0;
+    char    filename[1024];
 
     h5_reset();
     fapl = h5_fileaccess();
@@ -2872,21 +2873,21 @@ main(void)
     if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         goto error;
 
-    nerrors += test_atomic_dtype(file) < 0 	? 1 : 0;
-    nerrors += test_compound_dtype(file) < 0 	? 1 : 0;
-    nerrors += test_compound_dtype2(file) < 0 	? 1 : 0;
-    nerrors += test_compound_dtype3(file) < 0 	? 1 : 0;
-    nerrors += test_compound_opaque(file) < 0 	? 1 : 0;
-    nerrors += test_enum_dtype(file) < 0 	? 1 : 0;
-    nerrors += test_array_dtype(file) < 0 	? 1 : 0;
-    nerrors += test_array_dtype2(file) < 0 	? 1 : 0;
-    nerrors += test_vl_dtype(file) < 0 	        ? 1 : 0;
-    nerrors += test_vlstr_dtype(file) < 0 	? 1 : 0;
+    nerrors += test_atomic_dtype(file) < 0     ? 1 : 0;
+    nerrors += test_compound_dtype(file) < 0     ? 1 : 0;
+    nerrors += test_compound_dtype2(file) < 0     ? 1 : 0;
+    nerrors += test_compound_dtype3(file) < 0     ? 1 : 0;
+    nerrors += test_compound_opaque(file) < 0     ? 1 : 0;
+    nerrors += test_enum_dtype(file) < 0     ? 1 : 0;
+    nerrors += test_array_dtype(file) < 0     ? 1 : 0;
+    nerrors += test_array_dtype2(file) < 0     ? 1 : 0;
+    nerrors += test_vl_dtype(file) < 0             ? 1 : 0;
+    nerrors += test_vlstr_dtype(file) < 0     ? 1 : 0;
     nerrors += test_str_dtype(file) < 0         ? 1 : 0;
-    nerrors += test_refer_dtype(file) < 0 	? 1 : 0;
-    nerrors += test_refer_dtype2(file) < 0 	? 1 : 0;
-    nerrors += test_opaque_dtype(file) < 0 	? 1 : 0;
-    nerrors += test_bitfield_dtype(file) < 0 	? 1 : 0;
+    nerrors += test_refer_dtype(file) < 0     ? 1 : 0;
+    nerrors += test_refer_dtype2(file) < 0     ? 1 : 0;
+    nerrors += test_opaque_dtype(file) < 0     ? 1 : 0;
+    nerrors += test_bitfield_dtype(file) < 0     ? 1 : 0;
     nerrors += test_ninteger() < 0              ? 1 : 0;
 
     if(H5Fclose(file) < 0)
diff --git a/test/tvlstr.c b/test/tvlstr.c
index b93d646..bf37ad7 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -108,12 +108,14 @@ void test_vlstr_free_custom(void *_mem, void *info)
 static void
 test_vlstrings_basic(void)
 {
+    /* Information to write */
     const char *wdata[SPACE1_DIM1]= {
         "Four score and seven years ago our forefathers brought forth on this continent a new nation,",
         "conceived in liberty and dedicated to the proposition that all men are created equal.",
         "Now we are engaged in a great civil war,",
         "testing whether that nation or any nation so conceived and so dedicated can long endure."
-        };   /* Information to write */
+        };
+
     char *rdata[SPACE1_DIM1];   /* Information read in */
     char *wdata2;
     hid_t dataspace, dataset2;
diff --git a/test/vfd.c b/test/vfd.c
index d849d96..5078996 100644
--- a/test/vfd.c
+++ b/test/vfd.c
@@ -822,7 +822,7 @@ error:
  *      'first_name' in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static herr_t
 test_family_opens(char *fname, hid_t fa_pl)
 {
@@ -879,7 +879,7 @@ test_family_opens(char *fname, hid_t fa_pl)
 error:
     return -1;
 } /* end test_family_opens() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
 
 
 /*-------------------------------------------------------------------------
@@ -1103,7 +1103,7 @@ error:
  *      'newname_individual', etc. in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static herr_t
 test_family_compat(void)
 {
@@ -1187,7 +1187,7 @@ error:
 
     return -1;
 } /* end test_family_compat() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
 
 
 /*-------------------------------------------------------------------------
@@ -1326,7 +1326,7 @@ error:
  *      'sf_name' in the code below, but early (4.4.7, at least) gcc only
  *      allows diagnostic pragmas to be toggled outside of functions.
  */
-H5_GCC_DIAG_OFF(format-nonliteral)
+H5_GCC_DIAG_OFF("format-nonliteral")
 static herr_t
 test_multi_opens(char *fname)
 {
@@ -1344,7 +1344,7 @@ test_multi_opens(char *fname)
 
     return(fid >= 0 ? FAIL : SUCCEED);
 } /* end test_multi_opens() */
-H5_GCC_DIAG_ON(format-nonliteral)
+H5_GCC_DIAG_ON("format-nonliteral")
 
 
 /*-------------------------------------------------------------------------