Fix comment formatting due to tabs conversion

13 files changed, 840 insertions, 837 deletions

diff --git a/examples/h5_dtransform.c b/examples/h5_dtransform.c
index 6be4813..99cc48e 100644
--- a/examples/h5_dtransform.c
+++ b/examples/h5_dtransform.c
@@ -57,9 +57,9 @@ const float windchillF[ROWS][COLS] =
 {                        \
     for(i=0; i<ROWS; i++)            \
     {                        \
-    for(j=0; j<COLS; j++)            \
-        printf("%6.2f ", array[i][j]);    \
-    printf("\n");                \
+        for(j=0; j<COLS; j++)            \
+            printf("%6.2f ", array[i][j]);    \
+        printf("\n");                \
     }                        \
 }
 
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 98f1a3c..e65e60f 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -3869,8 +3869,9 @@ DONE:
  *
  * INPUTS
  *  ocpl_id        - Object (dataset or group) creation property list identifier
- *  Outputs      max_compact     - Maximum number of attributes to be stored in compact storage
- *  min_dense       - Minimum number of attributes to be stored in dense storage
+ * OUTPUTS
+ *  max_compact    - Maximum number of attributes to be stored in compact storage
+ *  min_dense      - Minimum number of attributes to be stored in dense storage
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -3909,8 +3910,9 @@ h5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dens
  *  Calls H5Ppset_attr_creation_order
  *
  * INPUTS
- *  ocpl_id        - Object (dataset or group) creation property list identifier
- *  Outputs      crt_order_flags - Flags specifying whether to track and index attribute creation order
+ *  ocpl_id         - Object (dataset or group) creation property list identifier
+ * OUTPUTS
+ *  crt_order_flags - Flags specifying whether to track and index attribute creation order
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -4071,7 +4073,7 @@ h5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags)
  *  Calls H5Pset_link_creation_order
  *
  * INPUTS
- *  gcpl_id        - Group creation property list identifier
+ *  gcpl_id         - Group creation property list identifier
  *  crt_order_flags - Creation order flag(s)
  * OUTPUTS
  *
@@ -4108,8 +4110,9 @@ h5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags )
  *
  * INPUTS
  *  gcpl_id      - Group creation property list identifier
- *  Outputs      max_compact     - Maximum number of attributes to be stored in compact storage
- *  min_dense       - Minimum number of attributes to be stored in dense storage
+ * OUTPUTS
+ *  max_compact  - Maximum number of attributes to be stored in compact storage
+ *  min_dense    - Minimum number of attributes to be stored in dense storage
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -4230,10 +4233,10 @@ h5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
  *
  * INPUTS
  *
- *        lcpl_id - Link creation property list identifier
+ *  lcpl_id - Link creation property list identifier
  *  crt_intermed_group - crt_intermed_group specifying whether
- *  to create intermediate groups upon the
- *  creation of an object
+ *                       to create intermediate groups upon the
+ *                       creation of an object
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -4487,7 +4490,7 @@ h5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
  * RETURNS
  *
  *  Success:  0
- *        Failure: -1
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -4549,7 +4552,7 @@ done:
  * RETURNS
  *
  *  Success:  0
- *        Failure: -1
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -4598,7 +4601,7 @@ done:
  * RETURNS
  *
  *  Success:  0
- *        Failure: -1
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -4640,7 +4643,7 @@ h5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
  * RETURNS
  *
  *  Success:  0
- *        Failure: -1
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -4685,7 +4688,7 @@ h5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name
  * RETURNS
  *
  *  Success:  0
- *        Failure: -1
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -4725,7 +4728,7 @@ h5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
  * RETURNS
  *
  *  Success:  0
- *        Failure: -1
+ *  Failure: -1
  *
  * AUTHOR
  *  M. Scot Breitenfeld
@@ -4795,7 +4798,7 @@ h5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dens
  *
  * INPUTS
  *
- *  fapl_id      - File access property list identifier
+ *  fapl_id    - File access property list identifier
  *  alignment  - Required memory alignment boundary
  *  block_size - File system block size
  *  cbuf_size  - Copy buffer size
@@ -4841,7 +4844,7 @@ h5pset_fapl_direct_c(hid_t_f H5_ATTR_UNUSED *fapl_id, size_t_f H5_ATTR_UNUSED *a
  *
  * INPUTS
  *
- *  fapl_id      - File access property list identifier
+ *  fapl_id    - File access property list identifier
  * OUTPUTS
  *
  *  alignment  - Required memory alignment boundary
@@ -4894,8 +4897,8 @@ h5pget_fapl_direct_c(hid_t_f H5_ATTR_UNUSED *fapl_id, size_t_f H5_ATTR_UNUSED *a
  *
  * INPUTS
  *  ocpl_id        - Object (dataset or group) creation property list identifier
- *  max_compact     - Maximum number of attributes to be stored in compact storage
- *  min_dense       - Minimum number of attributes to be stored in dense storage
+ *  max_compact    - Maximum number of attributes to be stored in compact storage
+ *  min_dense      - Minimum number of attributes to be stored in dense storage
  * OUTPUTS
  *
  * RETURNS
@@ -5075,7 +5078,7 @@ h5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
  *
  * INPUTS
  *
- *        lcpl_id - Link creation property list identifier
+ *  lcpl_id - Link creation property list identifier
  *  crt_intermed_group - Specifying whether to create intermediate groups upon
  *  the creation of an object
  * RETURNS
@@ -5111,7 +5114,8 @@ h5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group)
  *  Name:        h5pset_chunk_cache_c
  *  Purpose:     Calls H5Pset_chunk_cache
  *
- *  Inputs:    dapl_id            - Link creation property list identifier
+ *  Inputs:
+ *  dapl_id            - Link creation property list identifier
  *  rdcc_nslots        -
  *  rdcc_nbytes        -
  *  rdcc_w0            -
@@ -5141,7 +5145,8 @@ h5pset_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nby
  *  Name:        h5pget_chunk_cache_c
  *  Purpose:     Calls H5Pget_chunk_cache
  *
- *  Inputs:    dapl_id            - Link creation property list identifier
+ *  Inputs:
+ *  dapl_id            - Link creation property list identifier
  *  Outputs:
  *  rdcc_nslots        -
  *  rdcc_nbytes        -
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index ac5d641..0003018 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -127,9 +127,9 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
             udata->fapl_image_size = udata->app_image_size;
             return_value = udata->fapl_image_ptr;
             udata->fapl_ref_count++;
-        break;
+            break;
 
-    case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
             if (udata->fapl_image_ptr == NULL)
                 goto out;
             if (udata->fapl_image_size != size)
@@ -139,7 +139,7 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
 
             return_value = udata->fapl_image_ptr;
             udata->fapl_ref_count++;
-        break;
+            break;
 
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
             goto out;
@@ -160,16 +160,16 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
                 goto out;
 
             udata->vfd_image_ptr = udata->fapl_image_ptr;
-        udata->vfd_image_size = size;
+            udata->vfd_image_size = size;
             udata->vfd_ref_count++;
             return_value = udata->vfd_image_ptr;
             break;
 
-    /* added unused labels to shut the compiler up */
-    case H5FD_FILE_IMAGE_OP_NO_OP:
-    case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-    case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-    case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
+        /* added unused labels to shut the compiler up */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
         default:
             goto out;
     } /* end switch */
@@ -251,11 +251,11 @@ image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file
                 goto out;
             break;
 
-    /* added unused labels to shut the compiler up */
-    case H5FD_FILE_IMAGE_OP_NO_OP:
-    case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-    case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-    case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
+        /* added unused labels to shut the compiler up */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        case H5FD_FILE_IMAGE_OP_FILE_CLOSE:
         default:
             goto out;
     } /* end switch */
@@ -351,7 +351,7 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
 
     switch(file_image_op) {
         case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_CLOSE:
-        if (udata->fapl_image_ptr != ptr)
+            if (udata->fapl_image_ptr != ptr)
                 goto out;
             if (udata->fapl_ref_count == 0)
                 goto out;
@@ -386,14 +386,14 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
             } /* end if */
             break;
 
-    /* added unused labels to keep the compiler quite */
-    case H5FD_FILE_IMAGE_OP_NO_OP:
-    case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
-    case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
-    case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
-    case H5FD_FILE_IMAGE_OP_FILE_OPEN:
-    case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
-    default:
+        /* added unused labels to keep the compiler quite */
+        case H5FD_FILE_IMAGE_OP_NO_OP:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_COPY:
+        case H5FD_FILE_IMAGE_OP_PROPERTY_LIST_GET:
+        case H5FD_FILE_IMAGE_OP_FILE_OPEN:
+        case H5FD_FILE_IMAGE_OP_FILE_RESIZE:
+        default:
             goto out;
     } /* end switch */
 
@@ -2297,13 +2297,13 @@ realloc_and_append(hbool_t _no_user_buf, size_t *len, char *buf, const char *str
        * extend past the allocated buffer; if it does then truncate the string
        */
       if(size_str < *len - 1) {
-    if( size_str + size_str_to_add < *len - 1) {
-    HDstrncat(buf, str_to_add, size_str_to_add);
-    } else {
-    HDstrncat(buf, str_to_add, (*len - 1) - size_str);
-    }
+          if( size_str + size_str_to_add < *len - 1) {
+              HDstrncat(buf, str_to_add, size_str_to_add);
+          } else {
+              HDstrncat(buf, str_to_add, (*len - 1) - size_str);
+          }
       } else {
-    buf[*len-1] = '\0'; /* buffer is full, null terminate */
+         buf[*len-1] = '\0'; /* buffer is full, null terminate */
       }
     }
 
@@ -3062,15 +3062,15 @@ next:
             HDsnprintf(dt_str, *slen, "H5T_NO_CLASS");
             break;
         case H5T_REFERENCE:
-        if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
-        HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
-        }
-        else {
-        HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
-        }
-        break;
+            if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
+                HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
+            }
+            else {
+                HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
+            }
+            break;
         case H5T_NCLASSES:
-        break;
+            break;
         default:
             HDsnprintf(dt_str, *slen, "unknown data type");
     }
@@ -3812,11 +3812,11 @@ H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid)
        ret_value = link_exists;
        /* Determine if link resolves to an actual object for check_object_valid TRUE */
        if(check_object_valid == TRUE && link_exists == TRUE) {
-    if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
-    ret_value = FAIL;
-    } else {
-    ret_value = obj_exists;
-    }
+         if((obj_exists = H5Oexists_by_name(loc_id, tmp_path, H5P_DEFAULT)) < 0) {
+           ret_value = FAIL;
+         } else {
+           ret_value = obj_exists;
+         }
        }
      }
 
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index f59afd4..dffb5cb 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -29,11 +29,11 @@
 #include "H5ACpublic.h"        /*public prototypes            */
 
 /* Pivate headers needed by this header */
-#include "H5private.h"        /* Generic Functions            */
+#include "H5private.h"         /* Generic Functions            */
 #include "H5Cprivate.h"        /* Cache                */
 #include "H5Fprivate.h"        /* File access                */
 #include "H5Pprivate.h"        /* Property lists            */
-#include "H5SLprivate.h"        /* Skip lists                 */
+#include "H5SLprivate.h"       /* Skip lists                 */
 
 /* Global metadata tag values */
 #define H5AC__INVALID_TAG      (haddr_t)0
@@ -75,7 +75,7 @@ typedef enum {
     H5AC_DRVRINFO_ID,           /* (26) driver info block (supplements superblock)  */
     H5AC_EPOCH_MARKER_ID,       /* (27) epoch marker - always internal to cache     */
     H5AC_PROXY_ENTRY_ID,        /* (28) cache entry proxy                           */
-    H5AC_PREFETCHED_ENTRY_ID,     /* (29) prefetched entry - always internal to cache */
+    H5AC_PREFETCHED_ENTRY_ID,   /* (29) prefetched entry - always internal to cache */
     H5AC_NTYPES                 /* Number of types, must be last                    */
 } H5AC_type_t;
 
@@ -90,8 +90,8 @@ typedef enum {
  *
  * NOTE: test/cache plays games with the f->shared->cache, and thus
  *       setting H5AC_DUMP_STATS_ON_CLOSE will generate constant,
- *     irrelevant data when run with that test program.  See
- *      comments on setup_cache() / takedown_cache() in test/cache_common.c.
+ *       irrelevant data when run with that test program.  See
+ *       comments on setup_cache() / takedown_cache() in test/cache_common.c.
  *       for details.
  *
  *     If you need to dump stats at file close in test/cache.c,
@@ -132,7 +132,7 @@ typedef enum {
 #endif
 
 /*
- * Class methods pertaining to caching.     Each type of cached object will
+ * Class methods pertaining to caching. Each type of cached object will
  * have a constant variable with permanent life-span that describes how
  * to cache the object.
  */
@@ -256,8 +256,8 @@ typedef struct H5AC_proxy_entry_t {
   /* int         epochs_before_eviction = */ 3,                               \
   /* hbool_t     apply_empty_reserve    = */ TRUE,                            \
   /* double      empty_reserve          = */ 0.1f,                            \
-  /* size_t     dirty_bytes_threshold  = */ (256 * 1024),                    \
-  /* int    metadata_write_strategy = */                                  \
+  /* size_t      dirty_bytes_threshold  = */ (256 * 1024),                    \
+  /* int         metadata_write_strategy = */                                  \
                     H5AC__DEFAULT_METADATA_WRITE_STRATEGY  \
 }
 #else /* H5_HAVE_PARALLEL */
@@ -292,8 +292,8 @@ typedef struct H5AC_proxy_entry_t {
   /* int         epochs_before_eviction = */ 3,                               \
   /* hbool_t     apply_empty_reserve    = */ TRUE,                            \
   /* double      empty_reserve          = */ 0.1f,                            \
-  /* size_t     dirty_bytes_threshold  = */ (256 * 1024),                    \
-  /* int    metadata_write_strategy = */                                  \
+  /* size_t      dirty_bytes_threshold  = */ (256 * 1024),                    \
+  /* int         metadata_write_strategy = */                                  \
                     H5AC__DEFAULT_METADATA_WRITE_STRATEGY  \
 }
 #endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5C.c b/src/H5C.c
index 67bc629..fce8b26 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -79,16 +79,16 @@
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"        /* Generic Functions            */
-#include "H5Cpkg.h"        /* Cache                */
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Eprivate.h"        /* Error handling              */
-#include "H5Fpkg.h"        /* Files                */
-#include "H5FLprivate.h"    /* Free Lists                           */
-#include "H5Iprivate.h"        /* IDs                      */
-#include "H5MFprivate.h"    /* File memory management        */
-#include "H5MMprivate.h"    /* Memory management            */
-#include "H5Pprivate.h"         /* Property lists                       */
+#include "H5private.h"        /* Generic Functions */
+#include "H5Cpkg.h"        /* Cache */
+#include "H5CXprivate.h"        /* API Contexts */
+#include "H5Eprivate.h"        /* Error handling */
+#include "H5Fpkg.h"        /* Files */
+#include "H5FLprivate.h"    /* Free Lists */
+#include "H5Iprivate.h"        /* IDs */
+#include "H5MFprivate.h"    /* File memory management */
+#include "H5MMprivate.h"    /* Memory management */
+#include "H5Pprivate.h"         /* Property lists */
 
 
 /****************/
@@ -1065,8 +1065,7 @@ H5C_evict(H5F_t * f)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL,
                     "unable to evict entries in the cache")
 
-    /* Disable the slist,
-     */
+    /* Disable the slist */
     if ( H5C_set_slist_enabled(f->shared->cache, FALSE, TRUE) < 0)
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "set slist disabled failed")
@@ -1080,8 +1079,8 @@ done:
  * Function:    H5C_expunge_entry
  *
  * Purpose:     Use this function to tell the cache to expunge an entry
- *         from the cache without writing it to disk even if it is
- *         dirty.  The entry may not be either pinned or protected.
+ *              from the cache without writing it to disk even if it is
+ *              dirty.  The entry may not be either pinned or protected.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1863,7 +1862,7 @@ done:
  * Function:    H5C_mark_entry_unserialized
  *
  * Purpose:    Mark a pinned or protected entry as unserialized.  The target
- *        entry MUST be either pinned or protected, and MAY be both.
+ *             entry MUST be either pinned or protected, and MAY be both.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1908,7 +1907,7 @@ done:
  * Function:    H5C_mark_entry_serialized
  *
  * Purpose:    Mark a pinned entry as serialized.  The target entry MUST be
- *        pinned.
+ *             pinned.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2252,7 +2251,7 @@ done:
  * Function:    H5C_pin_protected_entry()
  *
  * Purpose:    Pin a protected cache entry.  The entry must be protected
- *         at the time of call, and must be unpinned.
+ *             at the time of call, and must be unpinned.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -2607,7 +2606,7 @@ H5C_protect(H5F_t *        f,
          *   *******************************************
          *
          * Set the flush_last field
-    * of the newly loaded entry before inserting it into the
+         * of the newly loaded entry before inserting it into the
          * index.  Must do this, as the index tracked the number of
          * entries with the flush_last field set, but assumes that
          * the field will not change after insertion into the index.
@@ -2701,10 +2700,10 @@ H5C_protect(H5F_t *        f,
             /* check to see if the cache is now oversized due to the cache
              * size reduction.  If it is, try to evict enough entries to
              * bring the cache size down to the current maximum cache size.
-        *
-        * Also, if the min_clean_size requirement is not met, we
-        * should also call H5C__make_space_in_cache() to bring us
-        * into complience.
+             *
+             * Also, if the min_clean_size requirement is not met, we
+             * should also call H5C__make_space_in_cache() to bring us
+             * into complience.
              */
 
             if(cache_ptr->index_size >= cache_ptr->max_cache_size)
@@ -3213,7 +3212,7 @@ done:
  * Function:    H5C_unpin_entry()
  *
  * Purpose:    Unpin a cache entry.  The entry can be either protected or
- *         unprotected at the time of call, but must be pinned.
+ *             unprotected at the time of call, but must be pinned.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -3870,7 +3869,7 @@ done:
  * Function:    H5C_validate_resize_config()
  *
  * Purpose:    Run a sanity check on the specified sections of the
- *        provided instance of struct H5C_auto_size_ctl_t.
+ *             provided instance of struct H5C_auto_size_ctl_t.
  *
  *        Do nothing and return SUCCEED if no errors are detected,
  *        and flag an error and return FAIL otherwise.
@@ -4029,11 +4028,11 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C_create_flush_dependency()
  *
- * Purpose:    Initiates a parent<->child entry flush dependency.  The parent
+ * Purpose:     Initiates a parent<->child entry flush dependency.  The parent
  *              entry must be pinned or protected at the time of call, and must
  *              have all dependencies removed before the cache can shut down.
  *
- * Note:    Flush dependencies in the cache indicate that a child entry
+ * Note:        Flush dependencies in the cache indicate that a child entry
  *              must be flushed to the file before its parent.  (This is
  *              currently used to implement Single-Writer/Multiple-Reader (SWMR)
  *              I/O access for data structures in the file).
@@ -4173,7 +4172,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C_destroy_flush_dependency()
  *
- * Purpose:    Terminates a parent<-> child entry flush dependency.  The
+ * Purpose:     Terminates a parent<-> child entry flush dependency.  The
  *              parent entry must be pinned.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -4295,7 +4294,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C__pin_entry_from_client()
  *
- * Purpose:    Internal routine to pin a cache entry from a client action.
+ * Purpose:     Internal routine to pin a cache entry from a client action.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -4344,7 +4343,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C__unpin_entry_real()
  *
- * Purpose:    Internal routine to unpin a cache entry.
+ * Purpose:     Internal routine to unpin a cache entry.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -4390,7 +4389,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5C__unpin_entry_from_client()
  *
- * Purpose:    Internal routine to unpin a cache entry from a client action.
+ * Purpose:     Internal routine to unpin a cache entry from a client action.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -4684,7 +4683,7 @@ H5C__auto_adjust_cache_size(H5F_t *f, hbool_t write_permitted)
          *
          *     ( 0 <= new_min_clean_size ).
          *
-    * by definition.
+         * by definition.
          */
         HDassert( new_min_clean_size <= new_max_cache_size );
         HDassert( (cache_ptr->resize_ctl).min_size <= new_max_cache_size );
@@ -4951,8 +4950,8 @@ done:
  *
  * Purpose:     Evict clean entries in the cache that haven't
  *        been accessed for at least
- *              (cache_ptr->resize_ctl).epochs_before_eviction epochs,
- *          and flush dirty entries that haven't been accessed for
+ *        (cache_ptr->resize_ctl).epochs_before_eviction epochs,
+ *        and flush dirty entries that haven't been accessed for
  *        that amount of time.
  *
  *        Depending on configuration, the function will either
@@ -5087,7 +5086,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *f, hbool_t write_permitte
                           || (prev_ptr->is_protected)
                           || (prev_ptr->is_pinned)) {
                     /* Something has happened to the LRU -- start over
-            * from the tail.
+                     * from the tail.
                      */
                     restart_scan = FALSE;
                     entry_ptr = cache_ptr->LRU_tail_ptr;
@@ -5146,10 +5145,10 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *f, hbool_t write_permitte
 
             /* just skip the entry if it is dirty, as we can't do
              * anything with it now since we can't write.
-        *
-        * Since all entries are clean, serialize() will not be called,
-        * and thus we needn't test to see if the LRU has been changed
-        * out from under us.
+             *
+             * Since all entries are clean, serialize() will not be called,
+             * and thus we needn't test to see if the LRU has been changed
+             * out from under us.
              */
             entry_ptr = prev_ptr;
         } /* end while */
@@ -5239,7 +5238,7 @@ done:
  * Function:    H5C__autoadjust__ageout__remove_all_markers
  *
  * Purpose:     Remove all epoch markers from the LRU list and mark them
- *        as inactive.
+ *              as inactive.
  *
  * Return:      SUCCEED on success/FAIL on failure.
  *
@@ -5504,9 +5503,9 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
         }
 
         /* note that we don't cycle the epoch markers.  We can
-    * argue either way as to whether we should, but for now
-    * we don't.
-    */
+         * argue either way as to whether we should, but for now
+         * we don't.
+         */
 
         if ( (cache_ptr->resize_ctl).rpt_fcn != NULL ) {
 
@@ -7914,7 +7913,7 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t    write_permitt
                     }
 #endif /* H5C_COLLECT_CACHE_STATS */
 
-            /* reset entries_removed_counter and
+                    /* reset entries_removed_counter and
                      * last_entry_removed_ptr prior to the call to
                      * H5C__flush_single_entry() so that we can spot
                      * unexpected removals of entries from the cache,
@@ -7974,12 +7973,12 @@ H5C__make_space_in_cache(H5F_t *f, size_t space_needed, hbool_t    write_permitt
 
         if ( didnt_flush_entry ) {
 
-            /* epoch markers don't get flushed, and we don't touch
+                    /* epoch markers don't get flushed, and we don't touch
                      * entries that are in the process of being flushed.
                      * Hence no need for sanity checks, as we haven't
                      * flushed anything.  Thus just set entry_ptr to prev_ptr
                      * and go on.
-            */
+                     */
                     entry_ptr = prev_ptr;
 
         } else if ( ( restart_scan )
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 8286516..6909a4d 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -143,47 +143,47 @@
  *
  *
  * These flags apply to H5C_insert_entry():
- *     H5C__SET_FLUSH_MARKER_FLAG
- *     H5C__PIN_ENTRY_FLAG
+ *    H5C__SET_FLUSH_MARKER_FLAG
+ *    H5C__PIN_ENTRY_FLAG
  *    H5C__FLUSH_LAST_FLAG        ; super block only
  *    H5C__FLUSH_COLLECTIVELY_FLAG    ; super block only
  *
  * These flags apply to H5C_protect()
- *     H5C__READ_ONLY_FLAG
+ *    H5C__READ_ONLY_FLAG
  *    H5C__FLUSH_LAST_FLAG        ; super block only
  *    H5C__FLUSH_COLLECTIVELY_FLAG    ; super block only
  *
  * These flags apply to H5C_unprotect():
- *     H5C__SET_FLUSH_MARKER_FLAG
- *     H5C__DELETED_FLAG
- *     H5C__DIRTIED_FLAG
- *     H5C__PIN_ENTRY_FLAG
- *     H5C__UNPIN_ENTRY_FLAG
- *     H5C__FREE_FILE_SPACE_FLAG
- *      H5C__TAKE_OWNERSHIP_FLAG
+ *    H5C__SET_FLUSH_MARKER_FLAG
+ *    H5C__DELETED_FLAG
+ *    H5C__DIRTIED_FLAG
+ *    H5C__PIN_ENTRY_FLAG
+ *    H5C__UNPIN_ENTRY_FLAG
+ *    H5C__FREE_FILE_SPACE_FLAG
+ *    H5C__TAKE_OWNERSHIP_FLAG
  *
  * These flags apply to H5C_expunge_entry():
- *     H5C__FREE_FILE_SPACE_FLAG
+ *    H5C__FREE_FILE_SPACE_FLAG
  *
  * These flags apply to H5C_evict():
- *     H5C__EVICT_ALLOW_LAST_PINS_FLAG
+ *    H5C__EVICT_ALLOW_LAST_PINS_FLAG
  *
  * These flags apply to H5C_flush_cache():
- *     H5C__FLUSH_INVALIDATE_FLAG
- *     H5C__FLUSH_CLEAR_ONLY_FLAG
- *     H5C__FLUSH_MARKED_ENTRIES_FLAG
+ *    H5C__FLUSH_INVALIDATE_FLAG
+ *    H5C__FLUSH_CLEAR_ONLY_FLAG
+ *    H5C__FLUSH_MARKED_ENTRIES_FLAG
  *    H5C__FLUSH_IGNORE_PROTECTED_FLAG (can't use this flag in combination
  *                      with H5C__FLUSH_INVALIDATE_FLAG)
- *     H5C__DURING_FLUSH_FLAG
+ *    H5C__DURING_FLUSH_FLAG
  *
  * These flags apply to H5C_flush_single_entry():
- *     H5C__FLUSH_INVALIDATE_FLAG
- *     H5C__FLUSH_CLEAR_ONLY_FLAG
- *     H5C__FLUSH_MARKED_ENTRIES_FLAG
- *      H5C__TAKE_OWNERSHIP_FLAG
- *      H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG
- *      H5C__GENERATE_IMAGE_FLAG
- *      H5C__UPDATE_PAGE_BUFFER_FLAG
+ *    H5C__FLUSH_INVALIDATE_FLAG
+ *    H5C__FLUSH_CLEAR_ONLY_FLAG
+ *    H5C__FLUSH_MARKED_ENTRIES_FLAG
+ *    H5C__TAKE_OWNERSHIP_FLAG
+ *    H5C__DEL_FROM_SLIST_ON_DESTROY_FLAG
+ *    H5C__GENERATE_IMAGE_FLAG
+ *    H5C__UPDATE_PAGE_BUFFER_FLAG
  */
 #define H5C__NO_FLAGS_SET            0x00000
 #define H5C__SET_FLUSH_MARKER_FLAG        0x00001
@@ -333,11 +333,11 @@ typedef struct H5C_t H5C_t;
  *    returned in the parameter "image_len_ptr".
  *
  *     For an entry with H5C__CLASS_NO_FLAGS_SET:
- *      This function returns in "image_len_ptr" the on disk size of the
+ *     This function returns in "image_len_ptr" the on disk size of the
  *              entry.
  *
  *     For an entry with H5C__CLASS_SPECULATIVE_LOAD_FLAG:
- *      This function returns in "image_len_ptr" an initial guess of the
+ *     This function returns in "image_len_ptr" an initial guess of the
  *              entry's on disk size.  This many bytes will be loaded from
  *              the file and then passed to 'get_final_load_size' callback
  *              for the actual (final) image length to be determined.
@@ -372,7 +372,7 @@ typedef struct H5C_t H5C_t;
  *
  * GET_FINAL_LOAD_SIZE: Pointer to the 'get final load size' function.
  *
- *     This function determines the final size of a speculatively loaded
+ *    This function determines the final size of a speculatively loaded
  *      metadata cache entry based on the parameter "image" and the "udata"
  *      parameters.  This callback _must_ be implemented for cache clients
  *      which set the H5C__CLASS_SPECULATIVE_LOAD_FLAG and must return the
@@ -421,7 +421,7 @@ typedef struct H5C_t H5C_t;
  *
  *    It computes the checksum based on the metadata stored in the
  *    parameter "image_ptr" and the actual length of the metadata in the
- *     parameter "len"  which is obtained from the "get_load_size" callback.
+ *    parameter "len"  which is obtained from the "get_load_size" callback.
  *
  *    The typedef for the verify_chksum callback is as follows:
  *
@@ -440,7 +440,7 @@ typedef struct H5C_t H5C_t;
  *
  * DESERIALIZE: Pointer to the deserialize function.
  *
- *     This function must be able to deserialize a buffer containing the
+ *    This function must be able to deserialize a buffer containing the
  *      on-disk image of a metadata cache entry, allocate and initialize the
  *      equivalent in core representation, and return a pointer to that
  *      representation.
@@ -509,7 +509,7 @@ typedef struct H5C_t H5C_t;
  *      typedef herr_t (*H5C_image_len_func_t)(void *thing,
  *                                           size_t *image_len_ptr);
  *
- *     The parameters of the image_len callback are as follows:
+ *    The parameters of the image_len callback are as follows:
  *
  *    thing:  Pointer to the in core representation of the entry.
  *
@@ -533,11 +533,11 @@ typedef struct H5C_t H5C_t;
  *    it needs a current on-disk image of the metadata entry for purposes
  *    either constructing a journal or flushing the entry to disk.
  *
- *      If the client needs to change the address or length of the entry prior
- *      to flush, the pre-serialize callback is responsible for these actions,
- *      so that the actual serialize callback (described below) is only
- *      responsible for serializing the data structure, not moving it on disk
- *      or resizing it.
+ *    If the client needs to change the address or length of the entry prior
+ *    to flush, the pre-serialize callback is responsible for these actions,
+ *    so that the actual serialize callback (described below) is only
+ *    responsible for serializing the data structure, not moving it on disk
+ *    or resizing it.
  *
  *    In addition, the client may use the pre-serialize callback to
  *    ensure that the entry is ready to be flushed -- in particular,
@@ -850,11 +850,11 @@ typedef enum H5C_notify_action_t {
     H5C_NOTIFY_ACTION_AFTER_INSERT,     /* Entry has been added to the cache
                                          * via the insert call
                                          */
-    H5C_NOTIFY_ACTION_AFTER_LOAD,    /* Entry has been loaded into the
+    H5C_NOTIFY_ACTION_AFTER_LOAD,       /* Entry has been loaded into the
                                          * from file via the protect call
                                          */
-    H5C_NOTIFY_ACTION_AFTER_FLUSH,    /* Entry has just been flushed to
-                    * file.
+    H5C_NOTIFY_ACTION_AFTER_FLUSH,      /* Entry has just been flushed to
+                                         * file.
                                          */
     H5C_NOTIFY_ACTION_BEFORE_EVICT,     /* Entry is about to be evicted
                                          * from cache.
@@ -1016,8 +1016,8 @@ typedef int H5C_ring_t;
  *         on disk image of the metadata cache entry is stored.
  *
  *         If the entry is dirty, the pre-serialize and serialize
- *        callbacks must be used to update this image before it is
- *        written to disk
+ *         callbacks must be used to update this image before it is
+ *         written to disk
  *
  * image_up_to_date:  Boolean flag that is set to TRUE when *image_ptr
  *         is up to date, and set to false when the entry is dirtied.
@@ -1039,23 +1039,23 @@ typedef int H5C_ring_t;
  *
  *         This field is set to FALSE in the protect call, and may
  *         be set to TRUE by the H5C_mark_entry_dirty() call at any
- *        time prior to the unprotect call.
+ *         time prior to the unprotect call.
  *
  *         The H5C_mark_entry_dirty() call exists as a convenience
- *        function for the fractal heap code which may not know if
- *        an entry is protected or pinned, but knows that is either
- *        protected or pinned.  The dirtied field was added as in
- *        the parallel case, it is necessary to know whether a
- *        protected entry is dirty prior to the protect call.
+ *         function for the fractal heap code which may not know if
+ *         an entry is protected or pinned, but knows that is either
+ *         protected or pinned.  The dirtied field was added as in
+ *         the parallel case, it is necessary to know whether a
+ *         protected entry is dirty prior to the protect call.
  *
  * is_protected: Boolean flag indicating whether this entry is protected
- *        (or locked, to use more conventional terms).  When it is
- *        protected, the entry cannot be flushed or accessed until
- *        it is unprotected (or unlocked -- again to use more
- *        conventional terms).
+ *         (or locked, to use more conventional terms).  When it is
+ *         protected, the entry cannot be flushed or accessed until
+ *         it is unprotected (or unlocked -- again to use more
+ *         conventional terms).
  *
- *        Note that protected entries are removed from the LRU lists
- *        and inserted on the protected list.
+ *         Note that protected entries are removed from the LRU lists
+ *         and inserted on the protected list.
  *
  * is_read_only: Boolean flag that is only meaningful if is_protected is
  *         TRUE.  In this circumstance, it indicates whether the
@@ -1065,10 +1065,10 @@ typedef int H5C_ring_t;
  *         and is_read_only are both TRUE), we allow the entry to be
  *         protected more than once.
  *
- *        In this case, the number of readers is maintained in the
- *        ro_ref_count field (see below), and unprotect calls simply
- *        decrement that field until it drops to zero, at which point
- *        the entry is actually unprotected.
+ *         In this case, the number of readers is maintained in the
+ *         ro_ref_count field (see below), and unprotect calls simply
+ *         decrement that field until it drops to zero, at which point
+ *         the entry is actually unprotected.
  *
  * ro_ref_count: Integer field used to maintain a count of the number of
  *         outstanding read-only protects on this entry.  This field
@@ -1091,12 +1091,12 @@ typedef int H5C_ring_t;
  *
  *         2) A pinned entry can be accessed or modified at any time.
  *            This places an extra burden on the pre-serialize and
- *           serialize callbacks, which must ensure that a pinned
- *           entry is consistent and ready to write to disk before
- *           generating an image.
+ *            serialize callbacks, which must ensure that a pinned
+ *            entry is consistent and ready to write to disk before
+ *            generating an image.
  *
  *         3) A pinned entry can be marked as dirty (and possibly
- *           change size) while it is unprotected.
+ *            change size) while it is unprotected.
  *
  *        4) The flush-destroy code must allow pinned entries to
  *           be unpinned (and possibly unprotected) during the
@@ -1158,11 +1158,11 @@ typedef int H5C_ring_t;
  *        other times, this field should be set to FALSE.
  *
  * flush_in_progress:  Boolean flag that is set to true iff the entry
- *         is in the process of being flushed.  This allows the cache
- *         to detect when a call is the result of a flush callback.
+ *        is in the process of being flushed.  This allows the cache
+ *        to detect when a call is the result of a flush callback.
  *
  * destroy_in_progress:  Boolean flag that is set to true iff the entry
- *         is in the process of being flushed and destroyed.
+ *        is in the process of being flushed and destroyed.
  *
  *
  * Fields supporting rings for flush ordering:
@@ -1581,17 +1581,17 @@ typedef int H5C_ring_t;
  * and H5C_COLLECT_CACHE_ENTRY_STATS are true.  When present, they allow
  * collection of statistics on individual cache entries.
  *
- * accesses:    int32_t containing the number of times this cache entry has
- *        been referenced in its lifetime.
+ * accesses:  int32_t containing the number of times this cache entry has
+ *            been referenced in its lifetime.
  *
  * clears:    int32_t containing the number of times this cache entry has
- *              been cleared in its life time.
+ *            been cleared in its life time.
  *
- * flushes:    int32_t containing the number of times this cache entry has
- *              been flushed to file in its life time.
+ * flushes:   int32_t containing the number of times this cache entry has
+ *            been flushed to file in its life time.
  *
- * pins:    int32_t containing the number of times this cache entry has
- *         been pinned in cache in its life time.
+ * pins:      int32_t containing the number of times this cache entry has
+ *            been pinned in cache in its life time.
  *
  ****************************************************************************/
 typedef struct H5C_cache_entry_t {
@@ -1708,7 +1708,7 @@ typedef struct H5C_cache_entry_t {
  * ring:    Instance of H5C_ring_t indicating the flush ordering ring
  *        to which this entry is assigned.
  *
- * age:        Number of times this prefetech entry has appeared in
+ * age:     Number of times this prefetech entry has appeared in
  *        the current sequence of cache images.  This field is
  *        initialized to 0 if the instance of H5C_image_entry_t
  *        is constructed from a regular entry.
@@ -1758,17 +1758,17 @@ typedef struct H5C_cache_entry_t {
  *
  *              Note that while this count is initially taken from the
  *              flush dependency fields in the associated instance of
- *        H5C_cache_entry_t, if the entry is in the cache image
- *        (i.e. include_in_image is TRUE), any parents that are
- *        not in the image are removed from this count and
+ *              H5C_cache_entry_t, if the entry is in the cache image
+ *              (i.e. include_in_image is TRUE), any parents that are
+ *              not in the image are removed from this count and
  *              from the fd_parent_addrs array below.
  *
  *              Finally observe that if the entry is dirty and in the
  *              cache image, and its parent is dirty and not in the cache
  *              image, then the entry must be removed from the cache image
  *              to avoid violating the flush dependency flush ordering.
- *        This should have happened before the construction of
- *        the instance of H5C_image_entry_t.
+ *              This should have happened before the construction of
+ *              the instance of H5C_image_entry_t.
  *
  * fd_parent_addrs: If the entry is a child in one or more flush dependency
  *              relationship when H5C_prep_for_file_close() is called, this
@@ -1781,27 +1781,27 @@ typedef struct H5C_cache_entry_t {
  *              Note that while this list of addresses is initially taken
  *              from the flush dependency fields in the associated instance of
  *              H5C_cache_entry_t, if the entry is in the cache image
- *        (i.e. include_in_image is TRUE), any parents that are not
- *        in the image are removed from this list, and from the
- *        fd_parent_count above.
+ *              (i.e. include_in_image is TRUE), any parents that are not
+ *              in the image are removed from this list, and from the
+ *              fd_parent_count above.
  *
  *              Finally observe that if the entry is dirty and in the
  *              cache image, and its parent is dirty and not in the cache
  *              image, then the entry must be removed from the cache image
  *              to avoid violating the flush dependency flush ordering.
- *        This should have happened before the construction of
- *        the instance of H5C_image_entry_t.
+ *              This should have happened before the construction of
+ *              the instance of H5C_image_entry_t.
  *
  * fd_child_count: If the entry is a parent in a flush dependency
- *        relationship, this field contains the number of flush
- *        dependency children.
+ *              relationship, this field contains the number of flush
+ *              dependency children.
  *
- *        In all other cases, the field is set to zero.
+ *              In all other cases, the field is set to zero.
  *
  *              Note that while this count is initially taken from the
  *              flush dependency fields in the associated instance of
  *              H5C_cache_entry_t, if the entry is in the cache image
- *        (i.e. include_in_image is TRUE), any children
+ *              (i.e. include_in_image is TRUE), any children
  *              that are not in the image are removed from this count.
  *
  * fd_dirty_child_count: If the entry is a parent in a flush dependency
@@ -1813,16 +1813,16 @@ typedef struct H5C_cache_entry_t {
  *              Note that while this count is initially taken from the
  *              flush dependency fields in the associated instance of
  *              H5C_cache_entry_t, if the entry is in the cache image
- *        (i.e. include_in_image is TRUE), any dirty children
- *        that are not in the image are removed from this count.
+ *              (i.e. include_in_image is TRUE), any dirty children
+ *              that are not in the image are removed from this count.
  *
  * image_ptr:    Pointer to void.  When not NULL, this field points to a
- *         dynamically allocated block of size bytes in which the
- *         on disk image of the metadata cache entry is stored.
+ *               dynamically allocated block of size bytes in which the
+ *               on disk image of the metadata cache entry is stored.
  *
- *         If the entry is dirty, the pre-serialize and serialize
- *        callbacks must be used to update this image before it is
- *        written to disk
+ *               If the entry is dirty, the pre-serialize and serialize
+ *               callbacks must be used to update this image before it is
+ *               written to disk
  *
  *
  ****************************************************************************/
@@ -1859,7 +1859,7 @@ typedef struct H5C_image_entry_t {
  *    version number, or an error will be flagged.
  *
  * report_fcn:  Pointer to the function that is to be called to report
- *      activities each time the auto cache resize code is executed.  If the
+ *    activities each time the auto cache resize code is executed.  If the
  *    field is NULL, no call is made.
  *
  *    If the field is not NULL, it must contain the address of a function
@@ -1884,16 +1884,16 @@ typedef struct H5C_image_entry_t {
  *    be greater than or equal to min_size.
  *
  * min_size: Minimum size to which the cache can be adjusted.  The
- *      supplied value must fall in the closed interval
- *      [MIN_MAX_CACHE_SIZE, MAX_MAX_CACHE_SIZE].  Also, min_size must
+ *    supplied value must fall in the closed interval
+ *    [MIN_MAX_CACHE_SIZE, MAX_MAX_CACHE_SIZE].  Also, min_size must
  *    be less than or equal to max_size.
  *
  * epoch_length: Number of accesses on the cache over which to collect
  *    hit rate stats before running the automatic cache resize code,
- *      if it is enabled.
+ *    if it is enabled.
  *
  *    At the end of an epoch, we discard prior hit rate data and start
- *     collecting afresh.  The epoch_length must lie in the closed
+ *    collecting afresh.  The epoch_length must lie in the closed
  *    interval [H5C__MIN_AR_EPOCH_LENGTH, H5C__MAX_AR_EPOCH_LENGTH].
  *
  *
@@ -1919,30 +1919,30 @@ typedef struct H5C_image_entry_t {
  *        all available space.
  *
  * lower_hr_threshold: Lower hit rate threshold.  If the increment mode
- *    (incr_mode) is H5C_incr__threshold and the hit rate drops below the
- *    value supplied in this field in an epoch, increment the cache size by
- *    size_increment.  Note that cache size may not be incremented above
- *    max_size, and that the increment may be further restricted by the
- *    max_increment field if it is enabled.
+ *       (incr_mode) is H5C_incr__threshold and the hit rate drops below the
+ *       value supplied in this field in an epoch, increment the cache size by
+ *       size_increment.  Note that cache size may not be incremented above
+ *       max_size, and that the increment may be further restricted by the
+ *       max_increment field if it is enabled.
  *
- *    When enabled, this field must contain a value in the range [0.0, 1.0].
- *    Depending on the incr_mode selected, it may also have to be less than
- *    upper_hr_threshold.
+ *       When enabled, this field must contain a value in the range [0.0, 1.0].
+ *       Depending on the incr_mode selected, it may also have to be less than
+ *       upper_hr_threshold.
  *
  * increment:  Double containing the multiplier used to derive the new
- *    cache size from the old if a cache size increment is triggered.
- *      The increment must be greater than 1.0, and should not exceed 2.0.
+ *       cache size from the old if a cache size increment is triggered.
+ *       The increment must be greater than 1.0, and should not exceed 2.0.
  *
- *    The new cache size is obtained by multiplying the current max cache
- *    size by the increment, and then clamping to max_size and to stay
- *    within the max_increment as necessary.
+ *       The new cache size is obtained by multiplying the current max cache
+ *       size by the increment, and then clamping to max_size and to stay
+ *       within the max_increment as necessary.
  *
  * apply_max_increment:  Boolean flag indicating whether the max_increment
- *    field should be used to limit the maximum cache size increment.
+ *       field should be used to limit the maximum cache size increment.
  *
  * max_increment: If enabled by the apply_max_increment field described
- *    above, this field contains the maximum number of bytes by which the
- *    cache size can be increased in a single re-size.
+ *       above, this field contains the maximum number of bytes by which the
+ *       cache size can be increased in a single re-size.
  *
  * flash_incr_mode:  Instance of the H5C_cache_flash_incr_mode enumerated
  *      type whose value indicates whether and by what algorithm we should
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 01f87a2..811f564 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -237,7 +237,7 @@ H5FD__family_term(void)
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -280,11 +280,11 @@ done:
  * Function:    H5Pget_fapl_family
  *
  * Purpose:    Returns information about the family file access property
- *        list though the function arguments.
+ *             list though the function arguments.
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -324,11 +324,11 @@ done:
  * Function:    H5FD__family_fapl_get
  *
  * Purpose:    Gets a file access property list which could be used to
- *        create an identical file.
+ *             create an identical file.
  *
  * Return:    Success:    Ptr to new file access property list.
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
@@ -372,7 +372,7 @@ done:
  *
  * Return:    Success:    Ptr to a new property list
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -425,7 +425,7 @@ done:
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -457,7 +457,7 @@ done:
  *
  * Return:    Success:    The super block driver data size.
  *
- *        Failure:    never fails
+ *            Failure:    never fails
  *
  * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
@@ -486,7 +486,7 @@ H5FD__family_sb_size(H5FD_t H5_ATTR_UNUSED *_file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
@@ -521,7 +521,7 @@ H5FD__family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out
 /*-------------------------------------------------------------------------
  * Function:    H5FD__family_sb_decode
  *
- * Purpose:    This function has 2 separate purpose.  One is to decodes the
+ * Purpose:     This function has 2 separate purpose.  One is to decodes the
  *              superblock information for this driver. The NAME argument is
  *              the eight-character (plus null termination) name stored in i
  *              the file.  The FILE argument is updated according to the
@@ -529,7 +529,7 @@ H5FD__family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Raymond Lu
  *              Tuesday, May 10, 2005
@@ -582,7 +582,7 @@ done:
  *                public fields will be initialized by the
  *                caller, which is always H5FD_open().
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -756,7 +756,7 @@ H5_GCC_DIAG_ON("format-nonliteral")
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative with as many members closed as
+ *            Failure:    Negative with as many members closed as
  *                possible. The only subsequent operation
  *                permitted on the file is a close operation.
  *
@@ -809,7 +809,7 @@ H5FD__family_close(H5FD_t *_file)
  *
  * Return:    Success:    like strcmp()
  *
- *        Failure:    never fails (arguments were checked by the
+ *            Failure:    never fails (arguments were checked by the
  *                caller).
  *
  * Programmer:    Robb Matzke
@@ -842,7 +842,7 @@ H5FD__family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *              (listed in H5FDpublic.h)
  *
  * Return:    Success:    non-negative
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 25, 2000
@@ -882,7 +882,7 @@ H5FD__family_query(const H5FD_t * _file, unsigned long *flags /* out */)
  *
  * Return:    Success:    The end-of-address-marker
  *
- *        Failure:    HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -907,7 +907,7 @@ H5FD__family_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1000,7 +1000,7 @@ H5_GCC_DIAG_ON("format-nonliteral")
  *                the end of the family of files or the current
  *                EOA, whichever is larger.
  *
- *        Failure:          HADDR_UNDEF
+ *            Failure:          HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1096,7 +1096,7 @@ done:
  * Return:    Success:    Zero. Result is stored in caller-supplied
  *                buffer BUF.
  *
- *        Failure:    -1, contents of buffer BUF are undefined.
+ *            Failure:    -1, contents of buffer BUF are undefined.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1163,7 +1163,7 @@ done:
  *
  * Return:    Success:    Zero
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1227,7 +1227,7 @@ done:
  * Purpose:    Flushes all family members.
  *
  * Return:    Success:    0
- *        Failure:    -1, as many files flushed as possible.
+ *            Failure:    -1, as many files flushed as possible.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1262,7 +1262,7 @@ done:
  *
  * Return:    Success:    0
  *
- *        Failure:    -1, as many files truncated as possible.
+ *            Failure:    -1, as many files truncated as possible.
  *
  * Programmer:    Quincey Koziol
  *              Saturday, February 23, 2008
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index bb26451..d5f8702 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -43,10 +43,10 @@
                                         \
     memset(SEEN, 0, sizeof SEEN);                                \
     for (ITER=H5FD_MEM_SUPER; ITER<H5FD_MEM_NTYPES; ITER=(H5FD_mem_t)(ITER+1)) {  \
-    LOOPVAR = MAP[ITER];                          \
-    if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=ITER;              \
-    assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES);                  \
-    if (SEEN[LOOPVAR]++) continue;                          \
+        LOOPVAR = MAP[ITER];                          \
+        if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=ITER;              \
+        assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES);                  \
+        if (SEEN[LOOPVAR]++) continue;                          \
 
 /* Need two front-ends, since they are nested sometimes */
 #define UNIQUE_MEMBERS(MAP, LOOPVAR)                                          \
@@ -72,7 +72,7 @@ typedef struct H5FD_multi_fapl_t {
     hid_t       memb_fapl[H5FD_MEM_NTYPES];     /*member access properties      */
     char        *memb_name[H5FD_MEM_NTYPES];    /*name generators               */
     haddr_t     memb_addr[H5FD_MEM_NTYPES];     /*starting addr per member      */
-    hbool_t     relax;                          /*less stringent error checking    */
+    hbool_t     relax;                          /*less stringent error checking */
 } H5FD_multi_fapl_t;
 
 /*
@@ -181,7 +181,7 @@ static const H5FD_class_t H5FD_multi_g = {
  *
  * Return:    Success:    Ptr to new copy of string
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
@@ -235,7 +235,7 @@ H5FD_multi_init(void)
 /*---------------------------------------------------------------------------
  * Function:    H5FD_multi_term
  *
- * Purpose:    Shut down the VFD
+ * Purpose:     Shut down the VFD
  *
  * Returns:     Non-negative on success or negative on failure
  *
@@ -263,7 +263,7 @@ H5FD_multi_term(void)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August 11, 1999
@@ -371,7 +371,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
  *        memb_map:    The default member map has the value
  *                H5FD_MEM_DEFAULT for each element.
  *
- *         memb_fapl:    The value H5P_DEFAULT for each element.
+ *        memb_fapl:    The value H5P_DEFAULT for each element.
  *
  *        memb_name:    The string `%s-X.h5' where `X' is one of the
  *                letters `s' (H5FD_MEM_SUPER),
@@ -379,26 +379,26 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
  *                 `g' (H5FD_MEM_GHEAP), 'l' (H5FD_MEM_LHEAP),
  *                 `o' (H5FD_MEM_OHDR).
  *
- *         memb_addr:    The value HADDR_UNDEF for each element.
+ *        memb_addr:    The value HADDR_UNDEF for each element.
  *
  *
  * Example:    To set up a multi file access property list which partitions
  *        data into meta and raw files each being 1/2 of the address
  *        space one would say:
  *
- *             H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
+ *            H5FD_mem_t mt, memb_map[H5FD_MEM_NTYPES];
  *            hid_t memb_fapl[H5FD_MEM_NTYPES];
  *            const char *memb[H5FD_MEM_NTYPES];
  *            haddr_t memb_addr[H5FD_MEM_NTYPES];
  *
- *             // The mapping...
- *             for (mt=0; mt<H5FD_MEM_NTYPES; mt++) {
+ *            // The mapping...
+ *            for (mt=0; mt<H5FD_MEM_NTYPES; mt++) {
  *                memb_map[mt] = H5FD_MEM_SUPER;
  *            }
- *             memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
+ *            memb_map[H5FD_MEM_DRAW] = H5FD_MEM_DRAW;
  *
- *             // Member information
- *             memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
+ *            // Member information
+ *            memb_fapl[H5FD_MEM_SUPER] = H5P_DEFAULT;
  *            memb_name[H5FD_MEM_SUPER] = "%s.meta";
  *            memb_addr[H5FD_MEM_SUPER] = 0;
  *
@@ -406,14 +406,14 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
  *            memb_name[H5FD_MEM_DRAW] = "%s.raw";
  *            memb_addr[H5FD_MEM_DRAW] = HADDR_MAX/2;
  *
- *             hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
+ *            hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
  *            H5Pset_fapl_multi(fapl, memb_map, memb_fapl,
  *                              memb_name, memb_addr, TRUE);
  *
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -516,7 +516,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -576,11 +576,11 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
  * Function:    H5FD_multi_sb_size
  *
  * Purpose:    Returns the size of the private information to be stored in
- *        the superblock.
+ *             the superblock.
  *
  * Return:    Success:    The super block driver data size.
  *
- *        Failure:    never fails
+ *            Failure:    never fails
  *
  * Programmer:    Robb Matzke
  *              Monday, August 16, 1999
@@ -631,7 +631,7 @@ H5FD_multi_sb_size(H5FD_t *_file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 16, 1999
@@ -712,7 +712,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 16, 1999
@@ -850,7 +850,7 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
  * Return:    Success:    Ptr to new file access property list with all
  *                members copied from the file struct.
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Friday, August 13, 1999
@@ -876,7 +876,7 @@ H5FD_multi_fapl_get(H5FD_t *_file)
  *
  * Return:    Success:    Ptr to a new property list
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -935,7 +935,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -973,7 +973,7 @@ H5FD_multi_fapl_free(void *_fa)
  *                public fields will be initialized by the
  *                caller, which is always H5FD_open().
  *
- *        Failure:    NULL
+ *            Failure:    NULL
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1068,7 +1068,7 @@ error:
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative with as many members closed as
+ *            Failure:    Negative with as many members closed as
  *                possible. The only subsequent operation
  *                permitted on the file is a close operation.
  *
@@ -1123,8 +1123,7 @@ H5FD_multi_close(H5FD_t *_file)
  *
  * Return:    Success:    like strcmp()
  *
- *        Failure:    never fails (arguments were checked by the
- *                caller).
+ *            Failure:    never fails (arguments were checked by th caller).
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1169,7 +1168,7 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, September 26, 2000
@@ -1201,7 +1200,7 @@ H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
  * Purpose:    Retrieve the memory type mapping for this file
  *
  * Return:    Success:    non-negative
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, October  9, 2008
@@ -1229,7 +1228,7 @@ H5FD_multi_get_type_map(const H5FD_t *_file, H5FD_mem_t *type_map)
  *
  * Return:    Success:    The end-of-address-marker
  *
- *        Failure:    HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1321,7 +1320,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1383,7 +1382,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
  *                the end of the multi of files or the current
  *                EOA, whichever is larger.
  *
- *        Failure:          HADDR_UNDEF
+ *            Failure:          HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1433,26 +1432,26 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
         if(H5FD_MEM_DEFAULT == mmt)
             mmt = type;
 
-    if(file->memb[mmt]) {
+        if(file->memb[mmt]) {
             /* Retrieve EOF */
             H5E_BEGIN_TRY {
             eof = H5FDget_eof(file->memb[mmt], mmt);
             } H5E_END_TRY;
 
-        if(HADDR_UNDEF == eof)
+            if(HADDR_UNDEF == eof)
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof", HADDR_UNDEF)
-        if(eof > 0)
+            if(eof > 0)
                 eof += file->fa.memb_addr[mmt];
-    } else if(file->fa.relax) {
-        /*
-        * The member is not open yet (maybe it doesn't exist). Make the
-        * best guess about the end-of-file.
-        */
-        eof = file->memb_next[mmt];
-        assert(HADDR_UNDEF != eof);
-    } else {
+        } else if(file->fa.relax) {
+            /*
+             * The member is not open yet (maybe it doesn't exist). Make the
+             * best guess about the end-of-file.
+             */
+            eof = file->memb_next[mmt];
+            assert(HADDR_UNDEF != eof);
+        } else {
             H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF)
-    }
+        }
     }
     return eof;
 }
@@ -1496,7 +1495,7 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
  *
  * Return:    Success:    Address of new memory
  *
- *        Failure:    HADDR_UNDEF
+ *            Failure:    HADDR_UNDEF
  *
  * Programmer:    Robb Matzke
  *              Thursday, August 12, 1999
@@ -1551,7 +1550,7 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Thursday, August 12, 1999
@@ -1586,7 +1585,7 @@ H5FD_multi_free(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsi
  * Return:    Success:    Zero. Result is stored in caller-supplied
  *                buffer BUF.
  *
- *        Failure:    -1, contents of buffer BUF are undefined.
+ *            Failure:    -1, contents of buffer BUF are undefined.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1634,7 +1633,7 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
  *
  * Return:    Success:    Zero
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1680,7 +1679,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
  *
  * Return:    Success:    0
  *
- *        Failure:    -1, as many files flushed as possible.
+ *            Failure:    -1, as many files flushed as possible.
  *
  * Programmer:    Robb Matzke
  *              Wednesday, August  4, 1999
@@ -1751,7 +1750,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
  * Purpose:    Truncates all multi members.
  *
  * Return:    Success:    0
- *        Failure:    -1, as many files truncated as possible.
+ *            Failure:    -1, as many files truncated as possible.
  *
  * Programmer:    Quincey Koziol
  *              Thursday, January 31, 2008
@@ -1794,7 +1793,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
  *        member files that are locked before error is encountered.
  *
  * Return:    Success:    0
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Vailin Choi; March 2015
  *
@@ -1851,7 +1850,7 @@ H5FD_multi_lock(H5FD_t *_file, hbool_t rw)
  *        encountered.
  *
  * Return:    Success:    0
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Vailin Choi; March 2015
  *
@@ -1888,7 +1887,7 @@ H5FD_multi_unlock(H5FD_t *_file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 23, 1999
@@ -1929,7 +1928,7 @@ compute_next(H5FD_multi_t *file)
  *
  * Return:    Success:    0
  *
- *        Failure:    -1
+ *            Failure:    -1
  *
  * Programmer:    Robb Matzke
  *              Monday, August 23, 1999
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index fa2be10..6dae0b4 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -119,19 +119,19 @@
  * The macros take a subset of these arguments in the order listed here:
  *
  * CDATA:    A pointer to the H5T_cdata_t structure that was passed to the
- *        conversion function.
+ *           conversion function.
  *
  * STYPE:    The hid_t value for the source datatype.
  *
  * DTYPE:    The hid_t value for the destination datatype.
  *
- * BUF:        A pointer to the conversion buffer.
+ * BUF:      A pointer to the conversion buffer.
  *
- * NELMTS:    The number of values to be converted.
+ * NELMTS:   The number of values to be converted.
  *
- * ST:        The C name for source datatype (e.g., int)
+ * ST:       The C name for source datatype (e.g., int)
  *
- * DT:        The C name for the destination datatype (e.g., signed char)
+ * DT:       The C name for the destination datatype (e.g., signed char)
  *
  * D_MIN:    The minimum possible destination value.     For unsigned
  *        destination types this should be zero.    For signed
@@ -2585,7 +2585,7 @@ done:
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *              Monday, January  4, 1999
@@ -2727,7 +2727,7 @@ done:
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *              Monday, January  4, 1999
@@ -2919,7 +2919,7 @@ done:
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Raymond Lu
  *              12 October 2012
@@ -3228,11 +3228,11 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                             /* Check if conversion buffer is large enough, resize if
                              * necessary.  If the SEQ_LEN is 0, allocate a minimal size buffer.
                              */
-                if(!seq_len && !conv_buf) {
+                            if(!seq_len && !conv_buf) {
                                 conv_buf_size = H5T_VLEN_MIN_CONF_BUF_SIZE;
                                 if(NULL == (conv_buf = H5FL_BLK_CALLOC(vlen_seq, conv_buf_size)))
                                     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion")
-                } /* end if */
+                            } /* end if */
                             else if(conv_buf_size < MAX(src_size, dst_size)) {
                                 /* Only allocate conversion buffer in H5T_VLEN_MIN_CONF_BUF_SIZE increments */
                                 conv_buf_size = ((MAX(src_size, dst_size) / H5T_VLEN_MIN_CONF_BUF_SIZE) + 1) * H5T_VLEN_MIN_CONF_BUF_SIZE;
@@ -4914,7 +4914,7 @@ done:
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -4937,7 +4937,7 @@ H5T__conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -4960,7 +4960,7 @@ H5T__conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -4983,7 +4983,7 @@ H5T__conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5006,7 +5006,7 @@ H5T__conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5029,7 +5029,7 @@ H5T__conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5052,7 +5052,7 @@ H5T__conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5075,7 +5075,7 @@ H5T__conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5098,7 +5098,7 @@ H5T__conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5121,7 +5121,7 @@ H5T__conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5144,7 +5144,7 @@ H5T__conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5167,7 +5167,7 @@ H5T__conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5190,7 +5190,7 @@ H5T__conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5213,7 +5213,7 @@ H5T__conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5236,7 +5236,7 @@ H5T__conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5259,7 +5259,7 @@ H5T__conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5282,7 +5282,7 @@ H5T__conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5305,7 +5305,7 @@ H5T__conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5328,7 +5328,7 @@ H5T__conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5351,7 +5351,7 @@ H5T__conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5374,7 +5374,7 @@ H5T__conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5397,7 +5397,7 @@ H5T__conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5420,7 +5420,7 @@ H5T__conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -5443,7 +5443,7 @@ H5T__conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -5466,7 +5466,7 @@ H5T__conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5489,7 +5489,7 @@ H5T__conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5512,7 +5512,7 @@ H5T__conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5535,7 +5535,7 @@ H5T__conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5558,7 +5558,7 @@ H5T__conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5581,7 +5581,7 @@ H5T__conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5604,7 +5604,7 @@ H5T__conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5627,7 +5627,7 @@ H5T__conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5650,7 +5650,7 @@ H5T__conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5673,7 +5673,7 @@ H5T__conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5696,7 +5696,7 @@ H5T__conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5719,7 +5719,7 @@ H5T__conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5742,7 +5742,7 @@ H5T__conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5765,7 +5765,7 @@ H5T__conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5788,7 +5788,7 @@ H5T__conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5811,7 +5811,7 @@ H5T__conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5834,7 +5834,7 @@ H5T__conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5857,7 +5857,7 @@ H5T__conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5880,7 +5880,7 @@ H5T__conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5903,7 +5903,7 @@ H5T__conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5926,7 +5926,7 @@ H5T__conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -5949,7 +5949,7 @@ H5T__conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -5972,7 +5972,7 @@ H5T__conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -5995,7 +5995,7 @@ H5T__conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6018,7 +6018,7 @@ H5T__conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6041,7 +6041,7 @@ H5T__conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6064,7 +6064,7 @@ H5T__conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6087,7 +6087,7 @@ H5T__conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6110,7 +6110,7 @@ H5T__conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6133,7 +6133,7 @@ H5T__conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6156,7 +6156,7 @@ H5T__conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6179,7 +6179,7 @@ H5T__conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6202,7 +6202,7 @@ H5T__conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6225,7 +6225,7 @@ H5T__conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6248,7 +6248,7 @@ H5T__conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6271,7 +6271,7 @@ H5T__conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6294,7 +6294,7 @@ H5T__conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6317,7 +6317,7 @@ H5T__conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6340,7 +6340,7 @@ H5T__conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6363,7 +6363,7 @@ H5T__conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6386,7 +6386,7 @@ H5T__conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6409,7 +6409,7 @@ H5T__conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6432,7 +6432,7 @@ H5T__conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -6455,7 +6455,7 @@ H5T__conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -6478,7 +6478,7 @@ H5T__conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6501,7 +6501,7 @@ H5T__conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6524,7 +6524,7 @@ H5T__conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6547,7 +6547,7 @@ H5T__conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6570,7 +6570,7 @@ H5T__conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6593,7 +6593,7 @@ H5T__conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6616,7 +6616,7 @@ H5T__conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6639,7 +6639,7 @@ H5T__conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6662,7 +6662,7 @@ H5T__conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6685,7 +6685,7 @@ H5T__conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6708,7 +6708,7 @@ H5T__conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6731,7 +6731,7 @@ H5T__conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6754,7 +6754,7 @@ H5T__conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6777,7 +6777,7 @@ H5T__conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6800,7 +6800,7 @@ H5T__conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6823,7 +6823,7 @@ H5T__conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6846,7 +6846,7 @@ H5T__conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6869,7 +6869,7 @@ H5T__conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6892,7 +6892,7 @@ H5T__conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6915,7 +6915,7 @@ H5T__conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    Non-negative
  *
- *        Failure:    Negative
+ *            Failure:    Negative
  *
  * Programmer:    Robb Matzke
  *        Friday, November 13, 1998
@@ -6938,7 +6938,7 @@ H5T__conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -6961,7 +6961,7 @@ H5T__conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
  *
  * Return:    Success:    non-negative
  *
- *        Failure:    negative
+ *            Failure:    negative
  *
  * Programmer:    Robb Matzke
  *        Monday, November 16, 1998
@@ -9305,10 +9305,10 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                 if (H5T_NORM_IMPLIED==dst.u.f.norm) {
                     /* Imply first bit */
                     H5T__bit_set(int_buf, first, (size_t)1, 0);
-            }
-            else if (H5T_NORM_NONE==dst.u.f.norm) {
-                first++;
-        }
+                }
+                else if (H5T_NORM_NONE==dst.u.f.norm) {
+                    first++;
+                }
 
                 /* Roundup for mantissa */
                 if(first > dst.u.f.msize) {
@@ -9344,7 +9344,7 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                             if(H5T__bit_get_d(int_buf, (first - dst.u.f.msize), (size_t)1))
                                do_round = 1;
                         }
-            }
+                    }
 
                     /* Right shift to drop off extra bits */
                     H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, buf_size * 8);
@@ -9353,28 +9353,28 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
                         H5T__bit_inc(int_buf, (size_t)0, buf_size * 8);
                         do_round = 0;
 
-            /* If integer is like 0x0ff...fff and we need to round up the
-            * last f, we get 0x100...000.  Treat this special case here.
-            */
+                        /* If integer is like 0x0ff...fff and we need to round up the
+                         * last f, we get 0x100...000.  Treat this special case here.
+                         */
                         if(H5T__bit_get_d(int_buf, dst.u.f.msize, (size_t)1)) {
-                        if (H5T_NORM_IMPLIED==dst.u.f.norm) {
-                    /* The bit at this 1's position was impled already, so this
-                    * number should be 0x200...000.  We need to increment the
-                    * exponent in this case.
-                    */
-                    expo++;
-                    } else if (H5T_NORM_NONE==dst.u.f.norm) {
-                /* Right shift 1 bit to let the carried 1 fit in the mantissa,
-                * and increment exponent by 1.
-                */
+                            if (H5T_NORM_IMPLIED==dst.u.f.norm) {
+                                /* The bit at this 1's position was impled already, so this
+                                * number should be 0x200...000.  We need to increment the
+                                * exponent in this case.
+                                */
+                                expo++;
+                            } else if (H5T_NORM_NONE==dst.u.f.norm) {
+                            /* Right shift 1 bit to let the carried 1 fit in the mantissa,
+                             * and increment exponent by 1.
+                             */
                                 H5T__bit_shift(int_buf, (ssize_t)-1, (size_t)0, buf_size * 8);
-                expo++;
-                }
-            }
+                                expo++;
+                            }
+                        }
                     }
                 } else {
                     /* The bit sequence can fit mantissa part.  Left shift to fit in from high-order of
-            * bit position. */
+                     * bit position. */
                     H5T__bit_shift(int_buf, (ssize_t)(dst.u.f.msize - first), (size_t)0, dst.u.f.msize);
                 }
 
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index ab6b86c..a41e94c 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -720,22 +720,22 @@ H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_ali
     if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
         if(size<=sizeof(float)) {
             match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
-        native_size = sizeof(float);
+            native_size = sizeof(float);
         }
         else if(size<=sizeof(double)) {
             match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
-        native_size = sizeof(double);
+            native_size = sizeof(double);
         }
 #if H5_SIZEOF_LONG_DOUBLE !=0
         else if(size<=sizeof(long double)) {
             match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
-        native_size = sizeof(long double);
+            native_size = sizeof(long double);
         }
 #endif
         else {   /* If not match, return the biggest datatype */
 #if H5_SIZEOF_LONG_DOUBLE !=0
             match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
-        native_size = sizeof(long double);
+            native_size = sizeof(long double);
 #else
             match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
             native_size = sizeof(double);
@@ -745,25 +745,25 @@ H5T__get_native_float(size_t size, H5T_direction_t direction, size_t *struct_ali
 #if H5_SIZEOF_LONG_DOUBLE !=0
         if(size>sizeof(double)) {
             match=H5T_NATIVE_FLOAT_MATCH_LDOUBLE;
-        native_size = sizeof(long double);
+            native_size = sizeof(long double);
         }
         else if(size>sizeof(float)) {
             match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
-        native_size = sizeof(double);
+            native_size = sizeof(double);
         }
         else {
             match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
-        native_size = sizeof(float);
-    }
+            native_size = sizeof(float);
+        }
 #else
         if(size>sizeof(float)) {
             match=H5T_NATIVE_FLOAT_MATCH_DOUBLE;
-        native_size = sizeof(double);
+            native_size = sizeof(double);
         }
         else {
             match=H5T_NATIVE_FLOAT_MATCH_FLOAT;
-        native_size = sizeof(float);
-    }
+            native_size = sizeof(float);
+        }
 #endif
     }
 
@@ -910,7 +910,7 @@ H5_GCC_DIAG_ON("duplicated-branches")
  *
  * Return:    Success:        Non-negative value.
  *
- *        Failure:        Negative value.
+ *            Failure:        Negative value.
  *
  * Programmer:    Raymond Lu
  *        December  10, 2002
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h
index 0c69ba6..56f48e0 100644
--- a/src/H5VMprivate.h
+++ b/src/H5VMprivate.h
@@ -204,7 +204,7 @@ H5VM_vector_zerop_u(int n, const hsize_t *v)
     if (!v)
         HGOTO_DONE(TRUE)
     while (n--)
-    if (*v++)
+        if (*v++)
             HGOTO_DONE(FALSE)
 
 done:
@@ -241,7 +241,7 @@ H5VM_vector_zerop_s(int n, const hssize_t *v)
     if (!v)
         HGOTO_DONE(TRUE)
     while (n--)
-    if (*v++)
+        if (*v++)
             HGOTO_DONE(FALSE)
 
 done:
@@ -530,9 +530,9 @@ static const unsigned char H5VM_bit_clear_g[8] = {0x7F, 0xBF, 0xDF, 0xEF, 0xF7,
  *
  * Purpose:     Determine the value of the n'th bit in a buffer.
  *
- * Note:    No range checking on <offset> is performed!
+ * Note:        No range checking on <offset> is performed!
  *
- * Note #2:    Bits are sequentially stored in the buffer, starting with bit
+ * Note #2:     Bits are sequentially stored in the buffer, starting with bit
  *              offset 0 in the first byte's high-bit position, proceeding down
  *              to bit offset 7 in the first byte's low-bit position, then to
  *              bit offset 8 in the second byte's high-bit position, etc.
@@ -561,9 +561,9 @@ H5VM_bit_get(const unsigned char *buf, size_t offset)
  *
  * Purpose:     Set/reset the n'th bit in a buffer.
  *
- * Note:    No range checking on <offset> is performed!
+ * Note:        No range checking on <offset> is performed!
  *
- * Note #2:    Bits are sequentially stored in the buffer, starting with bit
+ * Note #2:     Bits are sequentially stored in the buffer, starting with bit
  *              offset 0 in the first byte's high-bit position, proceeding down
  *              to bit offset 7 in the first byte's low-bit position, then to
  *              bit offset 8 in the second byte's high-bit position, etc.
diff --git a/test/big.c b/test/big.c
index 7917fa1..a0d767f 100644
--- a/test/big.c
+++ b/test/big.c
@@ -102,11 +102,11 @@ static hsize_t values_used[WRT_N];
  *
  * Purpose:    Create a random long long value.
  *         Ensures that a write at this value doesn't overlap any
- *        previous write.
+ *         previous write.
  *
  * Return:    Success:    Random value
  *
- *        Failure:    Random value which overlaps another write
+ *            Failure:    Random value which overlaps another write
  *
  * Programmer:    Robb Matzke
  *              Tuesday, November 24, 1998
@@ -152,12 +152,12 @@ randll(hsize_t limit, int current_index)
  * Function:    is_sparse
  *
  * Purpose:    Determines if the file system of the current working
- *        directory supports holes.
+ *             directory supports holes.
  *
  * Return:    Success:    Non-zero if holes are supported; zero
  *                otherwise.
  *
- *        Failure:    zero
+ *            Failure:    zero
  *
  * Programmer:    Robb Matzke
  *              Wednesday, July 15, 1998
@@ -190,12 +190,12 @@ is_sparse(void)
  * Function:    supports_big
  *
  * Purpose:    Determines if the file system of the current working
- *        directory supports big files.
+ *             directory supports big files.
  *
  * Return:    Success:    Non-zero if big files are supported; zero
  *                otherwise.
  *
- *        Failure:    zero
+ *            Failure:    zero
  *
  * Programmer:    Raymond Lu
  *              Wednesday, April 18, 2007
@@ -266,7 +266,7 @@ error:
  *
  * Return:    Success:    Non-zero
  *
- *        Failure:    zero
+ *            Failure:    zero
  *
  * Programmer:    Robb Matzke
  *              Thursday, August  6, 1998
@@ -332,14 +332,14 @@ H5_GCC_DIAG_ON("format-nonliteral")
  *
  * Return:    Success:    0
  *
- *        Failure:    >0
+ *            Failure:    >0
  *
  * Programmer:    Robb Matzke
  *              Wednesday, April  8, 1998
  *
  * Modifications:
  *     Robb Matzke, 15 Jul 1998
- *    Addresses are written to the file DNAME instead of stdout.
+ *     Addresses are written to the file DNAME instead of stdout.
  *
  *-------------------------------------------------------------------------
  */
@@ -476,7 +476,7 @@ error:
  *
  * Return:    Success:    0
  *
- *         Failure:    >0
+ *            Failure:    >0
  *
  * Programmer:    Robb Matzke
  *              Friday, April 10, 1998
@@ -739,7 +739,7 @@ error:
  *
  * Return:    Success:
  *
- *        Failure:
+ *            Failure:
  *
  * Programmer:    Robb Matzke
  *              Friday, April 10, 1998
diff --git a/test/fheap.c b/test/fheap.c
index 8410c0a..18d16a1 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -181,14 +181,14 @@ static int del_objs(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam,
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -218,14 +218,14 @@ init_small_cparam(H5HF_create_t *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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -255,13 +255,13 @@ init_large_cparam(H5HF_create_t *cparam)
 
 
 /*-------------------------------------------------------------------------
- * Function:    check_stats
+ * Function:  check_stats
  *
- * Purpose:    Verify stats for a heap
+ * Purpose:   Verify stats for a heap
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
@@ -318,13 +318,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    op_memcpy
+ * Function:  op_memcpy
  *
- * Purpose:    Perform 'memcpy' for an object
+ * Purpose:   Perform 'memcpy' for an object
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, September 11, 2006
@@ -342,9 +342,9 @@ op_memcpy(const void *obj, size_t obj_len, void *op_data)
 
 
 /*-------------------------------------------------------------------------
- * 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:
@@ -358,7 +358,7 @@ op_memcpy(const void *obj, size_t obj_len, void *op_data)
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -463,13 +463,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, June  6, 2006
@@ -502,9 +502,9 @@ get_del_string(const fheap_test_param_t *tparam)
 /*-------------------------------------------------------------------------
  * 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
@@ -532,13 +532,13 @@ get_fill_size(const fheap_test_param_t *tparam)
 
 
 /*-------------------------------------------------------------------------
- * Function:    begin_test
+ * Function:  begin_test
  *
- * Purpose:    Perform common "test being" operations
+ * Purpose:   Perform common "test being" operations
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
@@ -584,12 +584,12 @@ 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 18, 2006
@@ -640,13 +640,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
@@ -752,13 +752,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
@@ -790,12 +790,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August  4, 2006
@@ -858,13 +858,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, June  6, 2006
@@ -952,13 +952,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    del_objs
+ * Function:  del_objs
  *
- * Purpose:    Remove objects from heap
+ * Purpose:   Remove objects from heap
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, June  6, 2006
@@ -1034,9 +1034,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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:
@@ -1050,7 +1050,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March  7, 2006
@@ -1236,13 +1236,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1333,13 +1333,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, July 11, 2006
@@ -1379,13 +1379,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1413,16 +1413,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
@@ -1454,15 +1454,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1494,14 +1494,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1533,15 +1533,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1572,15 +1572,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1611,15 +1611,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 18, 2006
@@ -1650,15 +1650,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1690,15 +1690,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1730,15 +1730,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1780,15 +1780,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 10, 2006
@@ -1838,12 +1838,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    test_create
+ * Function:  test_create
  *
- * Purpose:    Create fractal heap
+ * Purpose:   Create fractal heap
  *
  * Return:    Success:    0
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, February 24, 2006
@@ -1956,12 +1956,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    test_reopen
+ * Function:  test_reopen
  *
- * Purpose:    Create & reopen a fractal heap
+ * Purpose:   Create & reopen a fractal heap
  *
  * Return:    Success:    0
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 18, 2006
@@ -2108,12 +2108,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 18, 2006
@@ -2285,12 +2285,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, January  5, 2007
@@ -2458,12 +2458,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
@@ -2802,12 +2802,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
@@ -2925,12 +2925,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    test_size
+ * Function:  test_size
  *
- * Purpose:    Test querying heap size
+ * Purpose:   Test querying heap size
  *
  * Return:    Success:    0
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, August 14, 2007
@@ -3203,12 +3203,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 18, 2006
@@ -3313,13 +3313,13 @@ error:
 #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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, February 24, 2006
@@ -3413,13 +3413,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
@@ -3507,14 +3507,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
@@ -3604,15 +3604,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March  6, 2006
@@ -3709,15 +3709,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March  7, 2006
@@ -3814,16 +3814,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March  7, 2006
@@ -3925,15 +3925,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 13, 2006
@@ -4020,15 +4020,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 14, 2006
@@ -4122,15 +4122,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 14, 2006
@@ -4221,16 +4221,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
@@ -4331,15 +4331,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
@@ -4428,15 +4428,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
@@ -4523,15 +4523,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 20, 2006
@@ -4623,16 +4623,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -4732,16 +4732,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -4833,9 +4833,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -4843,7 +4843,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -4942,9 +4942,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -4953,7 +4953,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -5049,9 +5049,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5060,7 +5060,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 21, 2006
@@ -5148,16 +5148,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5256,16 +5256,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5357,9 +5357,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5367,7 +5367,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5466,9 +5466,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5476,7 +5476,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5576,9 +5576,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5586,7 +5586,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5682,9 +5682,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5692,7 +5692,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5788,9 +5788,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5799,7 +5799,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -5902,9 +5902,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -5913,7 +5913,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -6021,9 +6021,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -6032,7 +6032,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -6132,9 +6132,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -6143,7 +6143,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -6244,9 +6244,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -6256,7 +6256,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -6376,13 +6376,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
@@ -6529,13 +6529,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
@@ -6692,13 +6692,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 22, 2006
@@ -6884,14 +6884,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, June  6, 2006
@@ -7052,14 +7052,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Saturday, June 10, 2006
@@ -7291,14 +7291,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, June 12, 2006
@@ -7590,12 +7590,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Sunday, April 1, 2012
@@ -7717,14 +7717,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 22, 2006
@@ -7791,14 +7791,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 22, 2006
@@ -7880,14 +7880,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, June  5, 2006
@@ -7951,14 +7951,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, June 12, 2006
@@ -8024,14 +8024,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, June 13, 2006
@@ -8101,14 +8101,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, June 13, 2006
@@ -8172,14 +8172,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, June 13, 2006
@@ -8247,14 +8247,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, July 24, 2006
@@ -8326,9 +8326,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
@@ -8336,7 +8336,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, March 27, 2006
@@ -8406,15 +8406,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 28, 2006
@@ -8504,16 +8504,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, March 28, 2006
@@ -8614,16 +8614,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Saturday, April  1, 2006
@@ -8708,9 +8708,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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).
@@ -8720,7 +8720,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Saturday, April  1, 2006
@@ -8851,9 +8851,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -8865,7 +8865,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
@@ -9018,9 +9018,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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).
@@ -9031,7 +9031,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
@@ -9148,9 +9148,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -9158,7 +9158,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Saturday, April 15, 2006
@@ -9276,16 +9276,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
@@ -9399,9 +9399,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -9409,7 +9409,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April  3, 2006
@@ -9527,9 +9527,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -9538,7 +9538,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 18, 2006
@@ -9667,9 +9667,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -9681,7 +9681,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
@@ -9833,16 +9833,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Saturday, April 15, 2006
@@ -9985,9 +9985,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -9996,7 +9996,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, July 11, 2006
@@ -10166,9 +10166,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -10176,7 +10176,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
@@ -10293,9 +10293,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -10305,7 +10305,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
@@ -10432,9 +10432,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -10443,7 +10443,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
@@ -10580,19 +10580,19 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *              indirect blocks (although this 3rd level indirect block only
  *              has one row of 2nd level indirect blocks) of 3rd level indirect
- *             block, then backfill & extend all skipped direct blocks.
+ *              block, then backfill & extend all skipped direct blocks.
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, April 11, 2006
@@ -10733,9 +10733,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -10746,7 +10746,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tues, April 18, 2006
@@ -10892,9 +10892,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -10906,7 +10906,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tues, April 18, 2006
@@ -11057,9 +11057,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -11069,7 +11069,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Saturday, April 15, 2006
@@ -11214,9 +11214,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -11228,7 +11228,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
@@ -11389,9 +11389,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -11405,7 +11405,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
@@ -11599,9 +11599,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -11617,7 +11617,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
@@ -11793,9 +11793,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -11811,7 +11811,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, April 17, 2006
@@ -12023,9 +12023,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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.
@@ -12034,7 +12034,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, July 24, 2006
@@ -12156,9 +12156,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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.
  *
@@ -12166,7 +12166,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, July 25, 2006
@@ -12326,9 +12326,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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.
@@ -12338,7 +12338,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, July 25, 2006
@@ -12436,9 +12436,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
@@ -12449,7 +12449,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, July 25, 2006
@@ -12555,14 +12555,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August  7, 2006
@@ -12705,14 +12705,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 11, 2006
@@ -12935,14 +12935,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 11, 2006
@@ -13240,14 +13240,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Friday, August 11, 2006
@@ -13665,12 +13665,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, August 15, 2006
@@ -13878,14 +13878,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
@@ -14028,14 +14028,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
@@ -14258,15 +14258,15 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
@@ -14866,12 +14866,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, August 14, 2006
@@ -15039,12 +15039,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, October 24, 2006
@@ -15365,16 +15365,16 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, May  9, 2006
@@ -15564,9 +15564,9 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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.
  *
@@ -15574,7 +15574,7 @@ error:
  *
  * Return:    Success:    0
  *
- *        Failure:    1
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, May 15, 2006
@@ -15775,12 +15775,12 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Monday, December 18, 2006
@@ -16059,14 +16059,14 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * 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
+ *            Failure:    1
  *
  * Programmer:    Quincey Koziol
  *              Tuesday, November 28, 2006
@@ -16234,13 +16234,13 @@ error:
 
 
 /*-------------------------------------------------------------------------
- * Function:    main
+ * Function:  main
  *
- * Purpose:    Test the fractal heap code
+ * Purpose:   Test the fractal heap code
  *
  * Return:    Success:
  *
- *        Failure:
+ *            Failure:
  *
  * Programmer:    Quincey Koziol
  *              Friday, February 24, 2006