From 25520640b2b5db099aaf3509ae76dd07e31ece46 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Fri, 14 Aug 2020 18:59:24 -0700
Subject: Misc normalizations with develop

---
 src/H5private.h                               |  24 +-
 src/H5public.h                                |  68 ++---
 test/cache_api.c                              |   8 +-
 test/direct_chunk.c                           |  14 +-
 test/dsets.c                                  |  34 ++-
 test/tattr.c                                  |  11 +-
 tools/src/h5diff/h5diff_main.c                |   2 +-
 tools/src/h5diff/ph5diff_main.c               |   2 +-
 tools/src/h5format_convert/h5format_convert.c |   6 +-
 tools/src/h5import/h5import.c                 |   4 +-
 tools/src/h5ls/h5ls.c                         |   2 +-
 tools/src/h5repack/h5repack.c                 |   2 +
 tools/src/h5repack/h5repack_parse.c           |   2 +-
 tools/src/misc/h5debug.c                      |   2 +-
 tools/src/misc/h5mkgrp.c                      |   8 +-
 tools/src/misc/h5repart.c                     |   2 +-
 tools/test/h5copy/testh5copy.sh.in            |  12 +-
 tools/test/h5diff/h5diff_plugin.sh.in         | 117 ++++----
 tools/test/h5diff/testh5diff.sh.in            |  43 +--
 tools/test/h5dump/h5dump_plugin.sh.in         |  28 +-
 tools/test/h5dump/testh5dump.sh.in            | 381 +++++++++++++-------------
 tools/test/h5dump/testh5dumppbits.sh.in       | 158 +++++------
 tools/test/h5dump/testh5dumpvds.sh.in         | 172 ++++++------
 tools/test/h5dump/testh5dumpxml.sh.in         |  31 +--
 tools/test/h5ls/h5ls_plugin.sh.in             |   6 +-
 tools/test/h5repack/h5repacktst.c             |  10 +-
 tools/test/misc/h5perf_gentest.c              |   4 +-
 tools/test/misc/h5repart_gentest.c            |   2 +-
 tools/test/misc/testh5mkgrp.sh.in             |  93 +++----
 29 files changed, 620 insertions(+), 628 deletions(-)

diff --git a/src/H5private.h b/src/H5private.h
index 08f69c0..d78513d 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -11,7 +11,7 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* Programmer:  Robb Matzke <matzke@llnl.gov>
+/* Programmer:  Robb Matzke
  *    Friday, October 30, 1998
  *
  * Purpose:  This file is included by all HDF5 library source files to
@@ -572,28 +572,6 @@
 #define H5_REQUEST_NULL                 NULL
 
 /*
- * A macro to portably decrement enumerated types.
- */
-#ifndef H5_DEC_ENUM
-#  define H5_DEC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)-1))
-#endif
-
-/* Double constant wrapper
- *
- * Quiets gcc warnings from -Wunsuffixed-float-constants.
- *
- * This is a really annoying warning since the standard specifies that
- * constants of type double do NOT get a suffix so there's no way
- * to specify a constant of type double. To quiet gcc, we specify floating
- * point constants as type long double and cast to double.
- *
- * Note that this macro only needs to be used where using a double
- * is important. For most code, suffixing constants with F will quiet the
- * compiler and not produce erroneous code.
- */
-#define H5_DOUBLE(S) ((double) S ## L)
-
-/*
  * Methods to compare the equality of floating-point values:
  *
  *    1. H5_XXX_ABS_EQUAL - check if the difference is smaller than the
diff --git a/src/H5public.h b/src/H5public.h
index 871c360..e451905 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -26,32 +26,32 @@
  * it via H5public.h.  The #ifndef _H5public_H guard above would
  * prevent repeated include.
  */
-#include "H5pubconf.h"		/*from configure                             */
+#include "H5pubconf.h"          /* From configure */
 
 /* API Version macro wrapper definitions */
 #include "H5version.h"
 
 #ifdef H5_HAVE_FEATURES_H
-#include <features.h>           /*for setting POSIX, BSD, etc. compatibility */
+#include <features.h>           /* For setting POSIX, BSD, etc. compatibility */
 #endif
 #ifdef H5_HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef H5_STDC_HEADERS
-#   include <limits.h>		/*for H5T_NATIVE_CHAR defn in H5Tpublic.h    */
-#   include <stdarg.h>      /*for variadic functions in H5VLpublic.h     */
+#   include <limits.h>          /* For H5T_NATIVE_CHAR defn in H5Tpublic.h  */
+#   include <stdarg.h>          /* For variadic functions in H5VLpublic.h   */
 #endif
 #ifndef __cplusplus
 # ifdef H5_HAVE_STDINT_H
-#   include <stdint.h>		/*for C9x types				     */
+#   include <stdint.h>          /* For C9x types */
 # endif
 #else
 # ifdef H5_HAVE_STDINT_H_CXX
-#   include <stdint.h>		/*for C9x types	when include from C++	     */
+#   include <stdint.h>          /* For C9x types (when included from C++) */
 # endif
 #endif
 #ifdef H5_HAVE_INTTYPES_H
-#   include <inttypes.h>        /* For uint64_t on some platforms            */
+#   include <inttypes.h>        /* C99/POSIX.1 header for uint64_t, PRIu64 */
 #endif
 #ifdef H5_HAVE_STDDEF_H
 #   include <stddef.h>
@@ -61,7 +61,7 @@
 #   define MPICH_SKIP_MPICXX 1
 #   define OMPI_SKIP_MPICXX 1
 #   include <mpi.h>
-#ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
+#ifndef MPI_FILE_NULL           /* MPIO may be defined in mpi.h already */
 #   include <mpio.h>
 #endif
 #endif
@@ -94,15 +94,15 @@ extern "C" {
 #endif
 
 /* Version numbers */
-#define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
-#define H5_VERS_MINOR	10	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	7	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE "1"	/* For pre-releases like snap0       */
-				/* Empty string for real releases.           */
+#define H5_VERS_MAJOR   1   /* For major interface/format changes       */
+#define H5_VERS_MINOR   10  /* For minor interface/format changes       */
+#define H5_VERS_RELEASE 7   /* For tweaks, bug-fixes, or development    */
+#define H5_VERS_SUBRELEASE "1"  /* For pre-releases like snap0          */
+                /* Empty string for real releases.           */
 #define H5_VERS_INFO    "HDF5 library version: 1.10.7-1"      /* Full version string */
 
-#define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
-				        H5_VERS_RELEASE)
+#define H5check()   H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,            \
+                        H5_VERS_RELEASE)
 
 /* macros for comparing the version */
 #define H5_VERSION_GE(Maj,Min,Rel) \
@@ -122,8 +122,8 @@ extern "C" {
  * The negative failure value is most commonly -1, but don't bet on it.  The
  * proper way to detect failure is something like:
  *
- * 	if((dset = H5Dopen2(file, name)) < 0)
- *	    fprintf(stderr, "unable to open the requested dataset\n");
+ *  if((dset = H5Dopen2(file, name)) < 0)
+ *      fprintf(stderr, "unable to open the requested dataset\n");
  */
 typedef int herr_t;
 
@@ -135,13 +135,13 @@ typedef int herr_t;
  * (false), positive (true), or negative (failure). The proper way to test
  * for truth from a htri_t function is:
  *
- * 	if ((retval = H5Tcommitted(type))>0) {
- *	    printf("data type is committed\n");
- *	} else if (!retval) {
- * 	    printf("data type is not committed\n");
- *	} else {
- * 	    printf("error determining whether data type is committed\n");
- *	}
+ *  if ((retval = H5Tcommitted(type)) > 0) {
+ *      printf("data type is committed\n");
+ *  } else if (!retval) {
+ *      printf("data type is not committed\n");
+ *  } else {
+ *      printf("error determining whether data type is committed\n");
+ *  }
  */
 #ifdef H5_HAVE_STDBOOL_H
   #include <stdbool.h>
@@ -183,8 +183,8 @@ typedef long long ssize_t;
  */
 #if H5_SIZEOF_LONG_LONG >= 8
 H5_GCC_DIAG_OFF(long-long)
-typedef unsigned long long 	hsize_t;
-typedef signed long long	hssize_t;
+typedef unsigned long long  hsize_t;
+typedef signed long long    hssize_t;
 H5_GCC_DIAG_ON(long-long)
 #       define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG
 #       define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG
@@ -229,7 +229,7 @@ H5_GCC_DIAG_ON(long-long)
 #else
 #   error "nothing appropriate for H5_PRINTF_HADDR_FMT"
 #endif
-#define HADDR_MAX		(HADDR_UNDEF-1)
+#define HADDR_MAX       (HADDR_UNDEF-1)
 
 /* uint32_t type is used for creation order field for messages.  It may be
  * defined in Posix.1g, otherwise it is defined here.
@@ -297,7 +297,7 @@ typedef enum {
     H5_ITER_INC,                /* Increasing order */
     H5_ITER_DEC,                /* Decreasing order */
     H5_ITER_NATIVE,             /* No particular order, whatever is fastest */
-    H5_ITER_N		        /* Number of iteration orders */
+    H5_ITER_N                   /* Number of iteration orders */
 } H5_iter_order_t;
 
 /* Iteration callback values */
@@ -314,10 +314,10 @@ typedef enum {
  * links in groups/attributes on objects.
  */
 typedef enum H5_index_t {
-    H5_INDEX_UNKNOWN = -1,	/* Unknown index type			*/
-    H5_INDEX_NAME,		/* Index on names 			*/
-    H5_INDEX_CRT_ORDER,		/* Index on creation order 		*/
-    H5_INDEX_N			/* Number of indices defined 		*/
+    H5_INDEX_UNKNOWN = -1,      /* Unknown index type                   */
+    H5_INDEX_NAME,              /* Index on names                       */
+    H5_INDEX_CRT_ORDER,         /* Index on creation order              */
+    H5_INDEX_N                  /* Number of indices defined            */
 } H5_index_t;
 
 /*
@@ -353,9 +353,9 @@ H5_DLL herr_t H5get_free_list_sizes(size_t *reg_size, size_t *arr_size,
     size_t *blk_size, size_t *fac_size);
 H5_DLL herr_t H5get_alloc_stats(H5_alloc_stats_t *stats);
 H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum,
-				unsigned *relnum);
+                unsigned *relnum);
 H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum,
-			       unsigned relnum);
+                unsigned relnum);
 H5_DLL herr_t H5is_library_threadsafe(hbool_t *is_ts);
 H5_DLL herr_t H5free_memory(void *mem);
 H5_DLL void *H5allocate_memory(size_t size, hbool_t clear);
diff --git a/test/cache_api.c b/test/cache_api.c
index 1e1a2c9..d6ea7e2 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -1664,7 +1664,7 @@ init_invalid_configs(void) {
     configs[13].lower_hr_threshold          = 1.00000001f;
 
     /* 14 -- increment too small */
-    configs[14].increment                   = H5_DOUBLE(0.999999999999);
+    configs[14].increment                   = 0.999999999999;
 
     /* 15 -- invalid flash_incr_mode */
     configs[15].flash_incr_mode             = (enum H5C_cache_flash_incr_mode)-1;
@@ -1697,7 +1697,7 @@ init_invalid_configs(void) {
 
     /* 23 -- decrement too big */
     configs[23].decr_mode                   = H5C_decr__threshold;
-    configs[23].decrement                   = H5_DOUBLE(1.0000000001);
+    configs[23].decrement                   = 1.0000000001;
 
     /* 24 -- epochs_before_eviction too small */
     configs[24].epochs_before_eviction      = 0;
@@ -1709,13 +1709,13 @@ init_invalid_configs(void) {
     configs[26].empty_reserve               = -0.0000000001f;
 
     /* 27 -- empty_reserve too big */
-    configs[27].empty_reserve               = H5_DOUBLE(1.00000000001);
+    configs[27].empty_reserve               = 1.00000000001;
 
     /* 28 -- upper_hr_threshold too small */
     configs[28].upper_hr_threshold          = -0.000000001f;
 
     /* 29 -- upper_hr_threshold too big */
-    configs[29].upper_hr_threshold          = H5_DOUBLE(1.00000001);
+    configs[29].upper_hr_threshold          = 1.00000001;
 
     /* 30 -- upper_hr_threshold <= lower_hr_threshold */
     configs[30].lower_hr_threshold          = 0.9f;
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 7b17043..2e6cc68 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -43,7 +43,7 @@
 #define CHUNK_NX     4
 #define CHUNK_NY     4
 
-#define DEFLATE_SIZE_ADJUST(s) (HDceil(((double)(s))*H5_DOUBLE(1.001))+H5_DOUBLE(12.0))
+#define DEFLATE_SIZE_ADJUST(s) (HDceil(((double)(s))*1.001)+12.0)
 
 /* Temporary filter IDs used for testing */
 #define H5Z_FILTER_BOGUS1    305
@@ -661,20 +661,20 @@ filter_bogus1(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
       size_t *buf_size, void **buf)
 {
     int *int_ptr=(int *)*buf;          /* Pointer to the data values */
-    ssize_t buf_left=(ssize_t)*buf_size;  /* Amount of data buffer left to process */
+    size_t buf_left=*buf_size;  /* Amount of data buffer left to process */
 
     if(flags & H5Z_FLAG_REVERSE) { /* read */
         /* Substract the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ -= (int)ADD_ON;
-            buf_left -= (ssize_t)sizeof(int);
+            buf_left -= sizeof(int);
         } /* end while */
     } /* end if */
     else { /* write */
         /* Add the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ += (int)ADD_ON;
-            buf_left -= (ssize_t)sizeof(int);
+            buf_left -= sizeof(int);
         } /* end while */
     } /* end else */
 
@@ -698,20 +698,20 @@ filter_bogus2(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
       size_t *buf_size, void **buf)
 {
     int *int_ptr=(int *)*buf;          /* Pointer to the data values */
-    ssize_t buf_left=(ssize_t)*buf_size;  /* Amount of data buffer left to process */
+    size_t buf_left=*buf_size;  /* Amount of data buffer left to process */
 
     if(flags & H5Z_FLAG_REVERSE) { /* read */
         /* Substract the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ /= (int)FACTOR;
-            buf_left -= (ssize_t)sizeof(int);
+            buf_left -= sizeof(int);
         } /* end while */
     } /* end if */
     else { /* write */
         /* Add the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ *= (int)FACTOR;
-            buf_left -= (ssize_t)sizeof(int);
+            buf_left -= sizeof(int);
         } /* end while */
     } /* end else */
 
diff --git a/test/dsets.c b/test/dsets.c
index f7e90a5..d72c65b 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:    Robb Matzke <matzke@llnl.gov>
+ * Programmer:    Robb Matzke
  *        Tuesday, December  9, 1997
  *
  * Purpose:    Tests the dataset interface (H5D)
@@ -274,13 +274,6 @@ const char *FILENAME[] = {
 #define STORAGE_SIZE_CHUNK_DIM1 5
 #define STORAGE_SIZE_CHUNK_DIM2 5
 
-/* Parameters for testing version bounds */
-#define VDS_FNAME1  "virtual_file1"
-#define VDS_FNAME2  "virtual_file2"
-#define SRC_FNAME   "source_file"
-#define SRC_DSET    "src_dset"
-#define V_DSET      "v_dset"
-
 /* Shared global arrays */
 #define DSET_DIM1       100
 #define DSET_DIM2       200
@@ -3176,18 +3169,18 @@ test_nbit_double(hid_t file)
      */
     double              orig_data[2][5] = {
         {
-            H5_DOUBLE(1.6081706885101836e+60),
-            H5_DOUBLE(-255.32099170994480),
-            H5_DOUBLE(1.2677579992621376e-61),
-            H5_DOUBLE(64568.289448797700),
-            H5_DOUBLE(-1.0619721778839084e-75)
+            (double)1.6081706885101836e+60L,
+            -255.32099170994480f,
+            (double)1.2677579992621376e-61L,
+            64568.289448797700f,
+            (double)-1.0619721778839084e-75L
         },
         {
-            H5_DOUBLE(2.1499497833454840e+56),
-            H5_DOUBLE(6.6562295504670740e-3),
-            H5_DOUBLE(-1.5747263393432150),
-            H5_DOUBLE(1.0711093225222612),
-            H5_DOUBLE(-9.8971679387636870e-1)
+            (double)2.1499497833454840e+56L,
+            6.6562295504670740e-3f,
+            -1.5747263393432150f,
+            1.0711093225222612f,
+            -9.8971679387636870e-1f
         }};
     double              new_data[2][5];
     size_t              precision, offset;
@@ -13232,6 +13225,11 @@ error:
  *
  *-------------------------------------------------------------------------
  */
+#define VDS_FNAME1  "virtual_file1"
+#define VDS_FNAME2  "virtual_file2"
+#define SRC_FNAME   "source_file"
+#define SRC_DSET    "src_dset"
+#define V_DSET      "v_dset"
 static herr_t
 test_versionbounds(void)
 {
diff --git a/test/tattr.c b/test/tattr.c
index b11fd0d..2a5e613 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -531,7 +531,7 @@ test_attr_flush(hid_t fapl)
     ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
     CHECK(ret, FAIL, "H5Awrite");
 
-    if(!H5_DBL_ABS_EQUAL(rdata, H5_DOUBLE(0.0)))
+    if(!H5_DBL_ABS_EQUAL(rdata, (double)0.0f))
         TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,(double)0.0F);
 
     ret=H5Fflush(fil, H5F_SCOPE_GLOBAL);
@@ -540,7 +540,7 @@ test_attr_flush(hid_t fapl)
     ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
     CHECK(ret, FAIL, "H5Awrite");
 
-    if(!H5_DBL_ABS_EQUAL(rdata, H5_DOUBLE(0.0)))
+    if(!H5_DBL_ABS_EQUAL(rdata, (double)0.0f))
         TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,(double)0.0F);
 
     ret=H5Awrite(att, H5T_NATIVE_DOUBLE, &wdata);
@@ -6560,13 +6560,6 @@ attr_iterate2_cb(hid_t loc_id, const char *attr_name, const H5A_info_t *info,
     char attrname[NAME_BUF_SIZE]; /* Object name */
     H5A_info_t my_info;         /* Local attribute info */
 
-#ifdef QAK
-HDfprintf(stderr, "attr_name = '%s'\n", attr_name);
-if(info)
-    HDfprintf(stderr, "info->corder = %u\n", (unsigned)info->corder);
-HDfprintf(stderr, "op_data->curr = %Hd\n", op_data->curr);
-#endif /* QAK */
-
     /* Increment # of times the callback was called */
     op_data->ncalled++;
 
diff --git a/tools/src/h5diff/h5diff_main.c b/tools/src/h5diff/h5diff_main.c
index 33d6570..e14447d 100644
--- a/tools/src/h5diff/h5diff_main.c
+++ b/tools/src/h5diff/h5diff_main.c
@@ -26,7 +26,7 @@
  * Return: An  exit status of 0 means no differences were found, 1 means some
  *   differences were found.
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: May 9, 2003
  *
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index c473c8b..2336378 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -31,7 +31,7 @@ static void ph5diff_worker(int );
  * Return: An exit status of 0 means no differences were found, 1 means some
  *   differences were found.
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: May 9, 2003
  *
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index fda5fe9..bd02e3b 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -64,7 +64,7 @@ static struct long_options l_opts[] = {
         { NULL, 0, '\0' }
 };
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -185,7 +185,7 @@ error:
     return(-1); ;
 } /* parse_command_line() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: leave
  *
@@ -387,7 +387,7 @@ error:
     return -1;
 } /* end convert_dsets_cb() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index b11fe7f..4a642e0 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -3735,8 +3735,8 @@ static int getExternalFilename(struct Input *in, FILE *strm)
         return (-1);
     }
 
-    in->externFilename = (char *) HDmalloc ((size_t) (HDstrlen(temp)) * sizeof(char));
-    (void) HDstrcpy(in->externFilename, temp);
+    in->externFilename = (char *) HDmalloc ((size_t) (HDstrlen(temp) + 1) * sizeof(char));
+    (void) HDstrncpy(in->externFilename, temp, HDstrlen(temp) + 1);
     return (0);
 }
 
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 8be1a11..c4c3122 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Monday, March 23, 1998
  */
 
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 9347eff..77f2272 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -522,6 +522,8 @@ done:
              */
             if (TRUE == h5tools_detect_vlen(wtype_id))
                 H5Dvlen_reclaim(wtype_id, space_id, H5P_DEFAULT, buf);
+
+            /* Free buf */
             HDfree(buf);
         }
 
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index 95cacc1..50ccd7a 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -478,7 +478,7 @@ obj_list_t* parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt,
  * Example:
  * "AA,B,CDE:CHUNK=10X10"
  *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ * Programmer: Pedro Vicente
  *
  * Date: December 30, 2003
  *
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index 58a99a4..351c577 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -15,7 +15,7 @@
  *
  * Created:             debug.c
  *                      Jul 18 1997
- *                      Robb Matzke <matzke@llnl.gov>
+ *                      Robb Matzke
  *
  * Purpose:             Debugs an existing HDF5 file at a low level.
  *
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index 2b4d57f..2046373 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -46,7 +46,7 @@ typedef struct mkgrp_opt_t {
 
 mkgrp_opt_t params_g;           /* Command line parameter settings */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
@@ -78,7 +78,7 @@ leave(int ret)
     HDexit(ret);
 } /* end leave() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -104,7 +104,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "\n");
 } /* end usage() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
@@ -200,7 +200,7 @@ parse_command_line(int argc, const char *argv[], mkgrp_opt_t *options)
     return 0;
 } /* parse_command_line() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index d516fa0..371cf2c 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Purpose:    Repartitions a file family.  This program can be used to
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in
index 2440ca4..ebbcb6c 100644
--- a/tools/test/h5copy/testh5copy.sh.in
+++ b/tools/test/h5copy/testh5copy.sh.in
@@ -13,7 +13,7 @@
 #
 # Tests for the h5copy tool
 #
-# Pedro Vicente Nunes (pvn@hdfgroup.org), Albert Cheng (acheng@hdfgroup.org)
+# Pedro Vicente Nunes, Albert Cheng
 # Thursday, July 20, 2006
 #
 
@@ -200,6 +200,7 @@ TOOLTEST()
         fi
         runh5diff=no
     fi
+
     if [ "$3" = -o ]; then
         outputfile=$4
     else
@@ -219,6 +220,7 @@ TOOLTEST()
         $RUNSERIAL $H5COPY_BIN $@
     ) > $actualout 2> $actualerr
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -268,6 +270,7 @@ TOOLTEST_PREFILL()
         $RUNSERIAL $H5COPY_BIN  -i $inputfile -o $outputfile -v -s $grp_name -d $grp_name2
     ) > $actualout 2> $actualerr
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -282,6 +285,7 @@ TOOLTEST_PREFILL()
             $RUNSERIAL $H5COPY_BIN  -i $inputfile -o $outputfile -v -s $obj_name -d $obj_name2
         ) > $actualout 2> $actualerr
         RET=$?
+
         if [ $RET != 0 ]; then
             echo "*FAILED*"
             echo "failed result is:"
@@ -313,6 +317,7 @@ TOOLTEST_SAME()
     else
         runh5diff=no
     fi
+
     if [ "$3" = -o ]; then
         outputfile=$4
     else
@@ -330,6 +335,7 @@ TOOLTEST_SAME()
         $RUNSERIAL $H5COPY_BIN  -i $inputfile -o $outputfile -v -s $grp_name -d $grp_name
     ) > $actualout 2> $actualerr
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -344,6 +350,7 @@ TOOLTEST_SAME()
             $RUNSERIAL $H5COPY_BIN  -i $outputfile -o $outputfile -v -s $grp_name -d $grp_name2
         ) > $actualout 2> $actualerr
         RET=$?
+
         if [ $RET != 0 ]; then
             echo "*FAILED*"
             echo "failed result is:"
@@ -406,6 +413,7 @@ TOOLTEST_FAIL()
     if [ "$1" = -i ]; then
         inputfile=$2
     fi
+
     if [ "$3" = -o ]; then
         outputfile=$4
     fi
@@ -417,8 +425,8 @@ TOOLTEST_FAIL()
         #echo "#############################"
         $RUNSERIAL $H5COPY_BIN $@
     ) > $actualout 2> $actualerr
-
     RET=$?
+
     # save actualout and actualerr in case they are needed later.
     cp $actualout $actualout_sav
     STDOUT_FILTER $actualout
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index 341cba5..ffc43da 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -135,24 +135,24 @@ CLEAN_TESTFILES_AND_TESTDIR()
 #   -h   print help page
 while [ $# -gt 0 ]; do
     case "$1" in
-    -p)    # reset the tool name and bin to run ph5diff tests
-    TESTNAME=ph5diff
-    H5DIFF=../../src/h5diff/ph5diff  # The tool name
-    H5DIFF_BIN=`pwd`/$H5DIFF    # The path of the tool binary
-    pmode=yes
-    shift
-    ;;
+    -p) # reset the tool name and bin to run ph5diff tests
+        TESTNAME=ph5diff
+        H5DIFF=../../src/h5diff/ph5diff  # The tool name
+        H5DIFF_BIN=`pwd`/$H5DIFF    # The path of the tool binary
+        pmode=yes
+        shift
+        ;;
     -h) # print help page
-    echo "$0 [-p] [-h]"
-    echo "    -p   run ph5diff tests"
-    echo "    -h   print help page"
-    shift
-    exit 0
-    ;;
+        echo "$0 [-p] [-h]"
+        echo "    -p   run ph5diff tests"
+        echo "    -h   print help page"
+        shift
+        exit 0
+        ;;
     *)  # unknown option
         echo "$0: Unknown option ($1)"
-    exit 1
-    ;;
+        exit 1
+        ;;
     esac
 done
 
@@ -218,19 +218,21 @@ TOOLTEST() {
     # Run test.
     TESTING $H5DIFF $@
     (
-    #echo "#############################"
-    #echo "Expected output for '$H5DIFF $@'"
-    #echo "#############################"
-    cd $TESTDIR
-    eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
+        #echo "#############################"
+        #echo "Expected output for '$H5DIFF $@'"
+        #echo "#############################"
+        cd $TESTDIR
+        eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
     ) >$actual 2>$actual_err
     EXIT_CODE=$?
+
     # save actual and actual_err in case they are needed later.
     cp $actual $actual_sav
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
+
     # don't add exit code check in pmode, as it causes failure. (exit code
     # is from mpirun not tool)
     # if any problem occurs relate to an exit code, it will be caught in
@@ -260,27 +262,29 @@ TOOLTEST() {
         actual_sorted=actual_sorted
         sort $expect -o $expect_sorted
         sort $actual -o $actual_sorted
+
         # remove "EXIT CODE:" line from expect file. test for exit code
         # is done by serial mode.
         grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
         mv $expect_sorted.noexit $expect_sorted
-    if $CMP $expect_sorted $actual_sorted; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-        nerrors="`expr $nerrors + 1`"
-        if test yes = "$verbose"; then
-        echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
-        $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
-        echo "====The actual output ($actual_sav)"
-        sed 's/^/    /' < $actual_sav
-        echo "====The actual stderr ($actual_err_sav)"
-        sed 's/^/    /' < $actual_err_sav
-        echo "====End of actual stderr ($actual_err_sav)"
-        echo ""
+
+        if $CMP $expect_sorted $actual_sorted; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            nerrors="`expr $nerrors + 1`"
+            if test yes = "$verbose"; then
+                echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
+                $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
+                echo "====The actual output ($actual_sav)"
+                sed 's/^/    /' < $actual_sav
+                echo "====The actual stderr ($actual_err_sav)"
+                sed 's/^/    /' < $actual_err_sav
+                echo "====End of actual stderr ($actual_err_sav)"
+                echo ""
+            fi
         fi
     fi
-    fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
@@ -306,18 +310,20 @@ TOOLTEST_ERR() {
     # Run test.
     TESTING $H5DIFF $@
     (
-    #echo "#############################"
-    #echo "Expected output for '$H5DIFF $@'"
-    #echo "#############################"
-    cd $TESTDIR
-    eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
+        #echo "#############################"
+        #echo "Expected output for '$H5DIFF $@'"
+        #echo "#############################"
+        cd $TESTDIR
+        eval $ENVCMD $RUNCMD $H5DIFF_BIN "$@"
     ) >$actual 2>$actual_err
     EXIT_CODE=$?
+
     # save actual and actual_err in case they are needed later.
     cp $actual $actual_sav
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
+
     # don't add exit code check in pmode, as it causes failure. (exit code
     # is from mpirun not tool)
     # if any problem occurs relate to an exit code, it will be caught in
@@ -348,23 +354,24 @@ TOOLTEST_ERR() {
         sort $expect_err -o $expect_sorted
         sort $actual_err -o $actual_sorted
         mv $expect_sorted.noexit $expect_sorted
-    if $CMP $expect_sorted $actual_sorted; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-        nerrors="`expr $nerrors + 1`"
-        if test yes = "$verbose"; then
-        echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
-        $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
-        echo "====The actual output ($actual_sav)"
-        sed 's/^/    /' < $actual_sav
-        echo "====The actual stderr ($actual_err_sav)"
-        sed 's/^/    /' < $actual_err_sav
-        echo "====End of actual stderr ($actual_err_sav)"
-        echo ""
+
+        if $CMP $expect_sorted $actual_sorted; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            nerrors="`expr $nerrors + 1`"
+            if test yes = "$verbose"; then
+                echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
+                $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
+                echo "====The actual output ($actual_sav)"
+                sed 's/^/    /' < $actual_sav
+                echo "====The actual stderr ($actual_err_sav)"
+                sed 's/^/    /' < $actual_err_sav
+                echo "====End of actual stderr ($actual_err_sav)"
+                echo ""
+            fi
         fi
     fi
-    fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 962f09c..efc2722 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -486,18 +486,20 @@ TOOLTEST() {
     # Run test.
     TESTING $H5DIFF $@
     (
-    #echo "#############################"
-    #echo "Expected output for '$H5DIFF $@'"
-    #echo "#############################"
-    cd $TESTDIR
-    eval $RUNCMD $H5DIFF_BIN "$@"
+        #echo "#############################"
+        #echo "Expected output for '$H5DIFF $@'"
+        #echo "#############################"
+        cd $TESTDIR
+        eval $RUNCMD $H5DIFF_BIN "$@"
     ) >$actual 2>$actual_err
     EXIT_CODE=$?
+
     # save actual and actual_err in case they are needed later.
     cp $actual $actual_sav
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
+
     # don't add exit code check in pmode, as it causes failure. (exit code
     # is from mpirun not tool)
     # if any problem occurs relate to an exit code, it will be caught in
@@ -531,23 +533,24 @@ TOOLTEST() {
         # is done by serial mode.
         grep -v "EXIT CODE:" $expect_sorted > $expect_sorted.noexit
         mv $expect_sorted.noexit $expect_sorted
-    if $CMP $expect_sorted $actual_sorted; then
-        echo " PASSED"
-    else
-        echo "*FAILED*"
-        nerrors="`expr $nerrors + 1`"
-        if test yes = "$verbose"; then
-        echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
-        $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
-        echo "====The actual output ($actual_sav)"
-        sed 's/^/    /' < $actual_sav
-        echo "====The actual stderr ($actual_err_sav)"
-        sed 's/^/    /' < $actual_err_sav
-        echo "====End of actual stderr ($actual_err_sav)"
-        echo ""
+
+        if $CMP $expect_sorted $actual_sorted; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            nerrors="`expr $nerrors + 1`"
+            if test yes = "$verbose"; then
+            echo "====Expected result ($expect_sorted) differs from actual result ($actual_sorted)"
+            $DIFF $expect_sorted $actual_sorted |sed 's/^/    /'
+            echo "====The actual output ($actual_sav)"
+            sed 's/^/    /' < $actual_sav
+            echo "====The actual stderr ($actual_err_sav)"
+            sed 's/^/    /' < $actual_err_sav
+            echo "====End of actual stderr ($actual_err_sav)"
+            echo ""
+            fi
         fi
     fi
-    fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index 6a00a16..d940ab3 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -181,8 +181,8 @@ TOOLTEST() {
     # Run test.
     TESTING $H5DUMP $@
     (
-    cd $TESTDIR
-      $ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $H5DUMP_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -192,24 +192,24 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual > /dev/null 2>&1 ; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
 
 }
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 02d5da0..1704e1e 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -458,14 +458,14 @@ TESTING() {
 TOOLTEST() {
     # check if caseless compare and diff requested
     if [ "$1" = ignorecase ]; then
-    caseless="-i"
-    # replace cmp with diff which runs much longer.
-    xCMP="$DIFF -i"
-    shift
+        caseless="-i"
+        # replace cmp with diff which runs much longer.
+        xCMP="$DIFF -i"
+        shift
     else
-    caseless=""
-    # stick with faster cmp if ignorecase is not requested.
-    xCMP="$CMP"
+        caseless=""
+        # stick with faster cmp if ignorecase is not requested.
+        xCMP="$CMP"
     fi
 
     expect="$TESTDIR/$1"
@@ -478,8 +478,8 @@ TOOLTEST() {
     # Run test.
     TESTING $DUMPER $@
     (
-    cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -488,24 +488,24 @@ TOOLTEST() {
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $xCMP $expect $actual > /dev/null 2>&1 ; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $caseless $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
 
 }
@@ -527,41 +527,41 @@ TOOLTEST2() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $CMP $expectdata $actualdata; then
-        echo " PASSED"
-      else
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $CMP $expectdata $actualdata; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        fi
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err
+        rm -f $actual $actualdata $actual_err
     fi
 
 }
@@ -585,56 +585,55 @@ TOOLTEST2A() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $DIFF $expectdata $actualdata; then
-        if [ ! -f $expectmeta ]; then
-        # Create the expect meta file if it doesn't yet exist.
-          echo " CREATED"
-          cp $actualmeta $expectmeta
-          echo "    Expected metafile (*.ddl) missing"
-          nerrors="`expr $nerrors + 1`"
-        elif $CMP $expectmeta $actualmeta; then
-          echo " PASSED"
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $DIFF $expectdata $actualdata; then
+            if [ ! -f $expectmeta ]; then
+                # Create the expect meta file if it doesn't yet exist.
+                echo " CREATED"
+                cp $actualmeta $expectmeta
+                echo "    Expected metafile (*.ddl) missing"
+                nerrors="`expr $nerrors + 1`"
+            elif $CMP $expectmeta $actualmeta; then
+                echo " PASSED"
+            else
+                echo "*FAILED*"
+                echo "    Expected metafile (*.ddl) differs from actual metafile (*.txt)"
+                nerrors="`expr $nerrors + 1`"
+                test yes = "$verbose" && $DIFF $expectmeta $actualmeta |sed 's/^/    /'
+            fi
         else
-          echo "*FAILED*"
-          echo "    Expected metafile (*.ddl) differs from actual metafile (*.txt)"
-          nerrors="`expr $nerrors + 1`"
-          test yes = "$verbose" && $DIFF $expectmeta $actualmeta |sed 's/^/    /'
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
         fi
-      else
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err $actualmeta
+        rm -f $actual $actualdata $actual_err $actualmeta
     fi
-
 }
 
 # same as TOOLTEST2 but only compares the generated data file to the expected data file
@@ -651,28 +650,28 @@ TOOLTEST2B() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expectdata ]; then
-    # Create the expect data file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actualdata $expectdata
-      echo "    Expected data (*.exp) missing"
-      nerrors="`expr $nerrors + 1`"
+        # Create the expect data file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actualdata $expectdata
+        echo "    Expected data (*.exp) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expectdata $actualdata; then
-      echo " PASSED"
+        echo " PASSED"
     else
-      echo "*FAILED*"
-      echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err
+        rm -f $actual $actualdata $actual_err
     fi
 
 }
@@ -692,8 +691,8 @@ TOOLTEST3() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -712,23 +711,23 @@ TOOLTEST3() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -750,8 +749,8 @@ TOOLTEST4() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -770,30 +769,30 @@ TOOLTEST4() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-     else
-      echo "*FAILED*"
-      echo "    Expected result (*.err) differs from actual result (*.oerr)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-     fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -815,8 +814,8 @@ TOOLTEST5() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -835,33 +834,33 @@ TOOLTEST5() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-     else
-      echo "*FAILED*"
-      echo "    Expected result (*.err) differs from actual result (*.oerr)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-     fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
-
 }
+
 # ADD_HELP_TEST
 TOOLTEST_HELP() {
 
@@ -873,27 +872,27 @@ TOOLTEST_HELP() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expectdata ]; then
-    # Create the expect data file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actual $expect-CREATED
-      echo "    Expected output (*.txt) missing"
-      nerrors="`expr $nerrors + 1`"
+        # Create the expect data file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect-CREATED
+        echo "    Expected output (*.txt) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-      echo " PASSED"
+        echo " PASSED"
     else
-      echo "*FAILED*"
-      echo "    Expected output (*.txt) differs from actual output (*.out)"
-      nerrors="`expr $nerrors + 1`"
+        echo "*FAILED*"
+        echo "    Expected output (*.txt) differs from actual output (*.out)"
+        nerrors="`expr $nerrors + 1`"
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
 
 }
@@ -913,14 +912,16 @@ GREPTEST()
     # Run test.
     TESTING $DUMPER -p $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
     ) >$actual 2>$actual_err
+
     if [ "$txttype" = "ERRTXT" ]; then
         $GREP "$expectdata" $actual_err > /dev/null
     else
         $GREP "$expectdata" $actual > /dev/null
     fi
+
     if [ $? -eq 0 ]; then
         echo " PASSED"
     else
@@ -930,7 +931,7 @@ GREPTEST()
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
 }
 
@@ -949,14 +950,16 @@ GREPTEST2()
     # Run test.
     TESTING $DUMPER -p $@
     (
-      cd $TESTDIR
-      $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
+        cd $TESTDIR
+        $ENVCMD $RUNSERIAL $DUMPER_BIN -p "$@"
     ) >$actual 2>$actual_err
+
     if [ "$txttype" = "ERRTXT" ]; then
         $GREP "$expectdata" $actual_err > /dev/null
     else
         $GREP "$expectdata" $actual > /dev/null
     fi
+
     if [ $? -eq 0 ]; then
         echo " PASSED"
     else
@@ -966,21 +969,21 @@ GREPTEST2()
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actual_err
+        rm -f $actual $actual_err
     fi
 }
 
 # Print a "SKIP" message
 SKIP() {
-   TESTING $DUMPER $@
+    TESTING $DUMPER $@
     echo  " -SKIP-"
 }
 
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
- SPACES="                                                               "
- echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 
@@ -990,10 +993,11 @@ DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5DIFF_BIN "$@" -q
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN "$@" -q
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
@@ -1007,8 +1011,8 @@ DIFFTEST()
 # beginning with the word "Verifying".
 #
 PRINT_H5IMPORT() {
- SPACES="                                                               "
- echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Call the h5import tool
@@ -1018,15 +1022,16 @@ IMPORTTEST()
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
     if [ -f $hdf5_file ]; then
-     rm -f $hdf5_file
+        rm -f $hdf5_file
     fi
 
     PRINT_H5IMPORT  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
@@ -1131,9 +1136,9 @@ TOOLTEST tcomp-4.ddl --enable-error-stack tcompound_complex.h5
 TOOLTEST tcompound_complex2.ddl --enable-error-stack tcompound_complex2.h5
 # tests for bitfields and opaque data types
 if test $WORDS_BIGENDIAN != "yes"; then
-TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
+    TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
 else
-TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
+    TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
 fi
 
 #test for the nested compound type
@@ -1311,12 +1316,12 @@ TOOLTEST tallfilters.ddl --enable-error-stack -H -p -d all  tfilters.h5
 TOOLTEST tuserfilter.ddl --enable-error-stack -H  -p -d myfilter  tfilters.h5
 
 if test $USE_FILTER_DEFLATE = "yes" ; then
-  # data read internal filters
-  TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
-  if test $USE_FILTER_SZIP = "yes"; then
-    # data read
-    TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
-  fi
+    # data read internal filters
+    TOOLTEST treadintfilter.ddl --enable-error-stack -d deflate -d shuffle -d fletcher32 -d nbit -d scaleoffset tfilters.h5
+    if test $USE_FILTER_SZIP = "yes"; then
+        # data read
+        TOOLTEST treadfilter.ddl --enable-error-stack -d all -d szip tfilters.h5
+    fi
 fi
 
 # test for displaying objects with very long names
@@ -1373,9 +1378,9 @@ TOOLTEST   tbin4.ddl --enable-error-stack -d double  -b FILE -o out4.bin    tbin
 
 # Clean up binary output files
 if test -z "$HDF5_NOCLEANUP"; then
- rm -f out[1-4].bin
- rm -f out1.h5
- rm -f out3.h5
+    rm -f out[1-4].bin
+    rm -f out1.h5
+    rm -f out3.h5
 fi
 
 # test for dataset region references
@@ -1387,7 +1392,7 @@ TOOLTEST2 tbinregR.exp --enable-error-stack -d /Dataset1 -s 0 -R -y -o tbinregR.
 
 # Clean up text output files
 if test -z "$HDF5_NOCLEANUP"; then
- rm -f tbinregR.txt
+    rm -f tbinregR.txt
 fi
 
 # tests for group creation order
diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in
index febce2c..ff0659a 100644
--- a/tools/test/h5dump/testh5dumppbits.sh.in
+++ b/tools/test/h5dump/testh5dumppbits.sh.in
@@ -236,26 +236,25 @@ TOOLTEST() {
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-   nerrors="`expr $nerrors + 1`"
-   test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
-
 }
 
 
@@ -274,36 +273,36 @@ TOOLTEST2() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $CMP $expectdata $actualdata; then
-        echo " PASSED"
-      else
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $CMP $expectdata $actualdata; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        fi
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
@@ -328,8 +327,8 @@ TOOLTEST3() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -348,23 +347,23 @@ TOOLTEST3() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -385,8 +384,8 @@ TOOLTEST4() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -405,30 +404,30 @@ TOOLTEST4() {
      $actual_err > $actual_ext
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-     else
-      echo "*FAILED*"
-      echo "    Expected result (*.err) differs from actual result (*.oerr)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-     fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -442,8 +441,8 @@ SKIP() {
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
- SPACES="                                                               "
- echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 
@@ -453,10 +452,11 @@ DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5DIFF_BIN "$@" -q
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN "$@" -q
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
@@ -470,8 +470,8 @@ DIFFTEST()
 # beginning with the word "Verifying".
 #
 PRINT_H5IMPORT() {
- SPACES="                                                               "
- echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Call the h5import tool
@@ -481,22 +481,22 @@ IMPORTTEST()
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
     if [ -f $hdf5_file ]; then
-     rm -f $hdf5_file
+        rm -f $hdf5_file
     fi
 
     PRINT_H5IMPORT  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
          echo " PASSED"
     fi
-
 }
 
 
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index f89234e..29ff238 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -205,8 +205,8 @@ TOOLTEST() {
     # Run test.
     TESTING $DUMPER $@
     (
-    cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -216,26 +216,25 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
 
-  if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-   nerrors="`expr $nerrors + 1`"
-   test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
+        rm -f $actual $actual_err $actual_sav $actual_err_sav $actual_ext
     fi
-
 }
 
 
@@ -254,42 +253,42 @@ TOOLTEST2() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
-    elif $CMP $expect $actual; then
-      if [ ! -f $expectdata ]; then
-      # Create the expect data file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
-        cp $actualdata $expectdata
-        echo "    Expected data (*.exp) missing"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
         nerrors="`expr $nerrors + 1`"
-      elif $CMP $expectdata $actualdata; then
-        echo " PASSED"
-      else
+    elif $CMP $expect $actual; then
+        if [ ! -f $expectdata ]; then
+            # Create the expect data file if it doesn't yet exist.
+            echo " CREATED"
+            cp $actualdata $expectdata
+            echo "    Expected data (*.exp) missing"
+            nerrors="`expr $nerrors + 1`"
+        elif $CMP $expectdata $actualdata; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
+        fi
+    else
         echo "*FAILED*"
-        echo "    Expected datafile (*.exp) differs from actual datafile (*.txt)"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
         nerrors="`expr $nerrors + 1`"
-        test yes = "$verbose" && $DIFF $expectdata $actualdata |sed 's/^/    /'
-      fi
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-     rm -f $actual $actualdata $actual_err
+        rm -f $actual $actualdata $actual_err
     fi
 
 }
@@ -309,8 +308,8 @@ TOOLTEST3() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -326,27 +325,27 @@ TOOLTEST3() {
         -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         -e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
         -e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
-     $actual_err > $actual_ext
+        $actual_err > $actual_ext
     cat $actual_ext >> $actual
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.ddl) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
-     echo " PASSED"
+        echo " PASSED"
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -367,8 +366,8 @@ TOOLTEST4() {
     # Run test.
     TESTING $DUMPER $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
     # save actual and actual_err in case they are needed later.
@@ -384,47 +383,46 @@ TOOLTEST4() {
         -e 's/[1-9]*\.[0-9]*\.[0-9]*[^)]*/version (number)/' \
         -e 's/H5Eget_auto[1-2]*/H5Eget_auto(1 or 2)/' \
         -e 's/H5Eset_auto[1-2]*/H5Eset_auto(1 or 2)/' \
-     $actual_err > $actual_ext
+        $actual_err > $actual_ext
     #cat $actual_ext >> $actual
 
     if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-     echo " CREATED"
-     cp $actual $expect
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
     elif $CMP $expect $actual; then
-     if $CMP $expect_err $actual_ext; then
-      echo " PASSED"
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.err) differs from actual result (*.oerr)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-    fi
+        if $CMP $expect_err $actual_ext; then
+            echo " PASSED"
+        else
+            echo "*FAILED*"
+            echo "    Expected result (*.err) differs from actual result (*.oerr)"
+            nerrors="`expr $nerrors + 1`"
+            test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+        fi
     else
-     echo "*FAILED*"
-     echo "    Expected result (*.ddl) differs from actual result (*.out)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.ddl) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
-
 }
 
 # Print a "SKIP" message
 SKIP() {
-   TESTING $DUMPER $@
+    TESTING $DUMPER $@
     echo  " -SKIP-"
 }
 
 # Print a line-line message left justified in a field of 70 characters
 #
 PRINT_H5DIFF() {
- SPACES="                                                               "
- echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5diff $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 
@@ -434,25 +432,25 @@ DIFFTEST()
 {
     PRINT_H5DIFF  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5DIFF_BIN "$@" -q
+        cd $TESTDIR
+        $RUNSERIAL $H5DIFF_BIN "$@" -q
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
          echo " PASSED"
     fi
-
 }
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Verifying".
 #
 PRINT_H5IMPORT() {
- SPACES="                                                               "
- echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo " Running h5import $* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Call the h5import tool
@@ -462,22 +460,22 @@ IMPORTTEST()
     # remove the output hdf5 file if it exists
     hdf5_file="$TESTDIR/$5"
     if [ -f $hdf5_file ]; then
-     rm -f $hdf5_file
+        rm -f $hdf5_file
     fi
 
     PRINT_H5IMPORT  $@
     (
-  cd $TESTDIR
-  $RUNSERIAL $H5IMPORT_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $H5IMPORT_BIN "$@"
     )
     RET=$?
+
     if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
          echo " PASSED"
     fi
-
 }
 
 
@@ -491,7 +489,7 @@ COPY_TESTFILES_TO_TESTDIR
 
 ####### test for dataset vds ######
 
-  # Data read
+# Data read
 if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST tvds-1.ddl --enable-error-stack 1_vds.h5
     TOOLTEST tvds-2.ddl --enable-error-stack 2_vds.h5
@@ -504,7 +502,7 @@ if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST vds-gap2.ddl --vds-gap-size=2 --enable-error-stack vds-eiger.h5
 fi
 
-  # Layout read
+# Layout read
 if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST tvds_layout-1.ddl -p --enable-error-stack 1_vds.h5
     TOOLTEST tvds_layout-2.ddl -p --enable-error-stack 2_vds.h5
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index f7af300..52a13c2 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -262,36 +262,35 @@ TOOLTEST() {
     # Run test.
     TESTING $DUMPER $@
     (
-    cd $TESTDIR
-      $RUNSERIAL $DUMPER_BIN "$@"
+        cd $TESTDIR
+        $RUNSERIAL $DUMPER_BIN "$@"
     ) >$actual 2>$actual_err
 
-
    if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-    echo " CREATED"
-     cp $actual $expect
-     echo "    Expected result (*.xml) missing"
-     nerrors="`expr $nerrors + 1`"
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.xml) missing"
+        nerrors="`expr $nerrors + 1`"
    elif  $CMP $expect $actual; then
-      echo " PASSED"
+        echo " PASSED"
    else
-      echo "*FAILED*"
-      echo "    Expected result (*.xml) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "*FAILED*"
+        echo "    Expected result (*.xml) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
    fi
 
    # Clean up output file
    if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_err
+        rm -f $actual $actual_err
    fi
 }
 
 # Print a "SKIP" message
 SKIP() {
-         TESTING $DUMPER $@
-          echo  " -SKIP-"
+    TESTING $DUMPER $@
+    echo  " -SKIP-"
 }
 
 
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index c89269d..28370e6 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -139,8 +139,8 @@ CLEAN_TESTFILES_AND_TESTDIR()
 # Print a $* message left justified in a field of 70 characters
 #
 MESSAGE() {
-   SPACES="                                                               "
-   echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
+    SPACES="                                                               "
+    echo "$* $SPACES" | cut -c1-70 | tr -d '\012'
 }
 
 # Print a line-line message left justified in a field of 70 characters
@@ -206,7 +206,7 @@ TOOLTEST() {
             echo ""
         fi
     elif [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
         echo "    Expected result (*.ls) missing"
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 911572e..5cd76ef 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -3872,7 +3872,7 @@ out:
 *
 * Purpose: write datasets in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -4736,7 +4736,7 @@ out:
 *
 * Purpose: write attributes in LOC_ID (dataset, group, named datatype)
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -5927,7 +5927,7 @@ out:
 *
 * Purpose: utility function to create and write a dataset in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -5963,7 +5963,7 @@ out:
 *
 * Purpose: utility function to create and write a dataset in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
@@ -6011,7 +6011,7 @@ out:
 *
 * Purpose: utility function to write an attribute in LOC_ID
 *
-* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+* Programmer: Pedro Vicente
 *
 * Date: November 12, 2003
 *
diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c
index f50e5fb..511a9e2 100644
--- a/tools/test/misc/h5perf_gentest.c
+++ b/tools/test/misc/h5perf_gentest.c
@@ -14,7 +14,7 @@
   creates a large number of attributes, groups, and datasets by specifying
   -a, -g, -d options respectively. Using "-h" option to see details.
 
-  Programmer:  Peter Cao <xcao@hdfgroup.org>, Jan. 2013
+  Programmer:  Peter Cao, Jan. 2013
  ****************************************************************************/
 
 #include "hdf5.h"
@@ -128,7 +128,7 @@ int main (int argc, char *argv[])
 
   Return:  Non-negative on success/Negative on failure
 
-  Programmer:  Peter Cao <xcao@hdfgroup.org>, Jan. 2013
+  Programmer:  Peter Cao, Jan. 2013
  ****************************************************************************/
 herr_t create_perf_test_file(const char *fname, int ngrps, int ndsets,
        int nattrs, hsize_t nrows, hsize_t dim0, hsize_t chunk, int vlen,
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index bd94104..520069f 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -12,7 +12,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Raymond Lu<slu@ncsa.uiuc.edu>
+ * Programmer:  Raymond Lu
  *              June 1, 2005
  *
  * Purpose:     Generate a family file of 1024 bytes for each member
diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in
index 3ad1f71..7dc8155 100644
--- a/tools/test/misc/testh5mkgrp.sh.in
+++ b/tools/test/misc/testh5mkgrp.sh.in
@@ -13,7 +13,7 @@
 #
 # Tests for the h5mkgrp tool
 #
-# Quincey Koziol (koziol@hdfgroup.org)
+# Quincey Koziol
 # Tuesday, February 13, 2007
 #
 
@@ -150,10 +150,11 @@ TOOLTEST()
 {
     TESTING $H5MKGRP $@
     (
-    cd $TESTDIR
-    $RUNSERIAL $H5MKGRP_BIN $@
+        cd $TESTDIR
+        $RUNSERIAL $H5MKGRP_BIN $@
     ) > output.out
     RET=$?
+
     if [ $RET != 0 ]; then
         echo "*FAILED*"
         echo "failed result is:"
@@ -164,7 +165,7 @@ TOOLTEST()
 
         # Clean up output file
         if test -z "$HDF5_NOCLEANUP"; then
-           rm -f output.out
+            rm -f output.out
         fi
     fi
 }
@@ -181,8 +182,8 @@ H5LSTEST()
     # any unexpected output from that stream too.
     VERIFY_H5LS  $@
     (
-      cd $TESTDIR
-      $RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
+        cd $TESTDIR
+        $RUNSERIAL $H5LS_BIN $H5LS_ARGS $@
     ) 2>&1 |sed 's/Modified:.*/Modified:  XXXX-XX-XX XX:XX:XX XXX/' >$actual
 
     # save actual in case it is needed later.
@@ -190,25 +191,25 @@ H5LSTEST()
     STDOUT_FILTER $actual
     STDERR_FILTER $actual
 
-   if [ ! -f $expect ]; then
-      # Create the expect file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actual $expect
-      echo "    Expected result (*.ls) missing"
-      nerrors="`expr $nerrors + 1`"
-   elif $CMP $expect $actual; then
-      echo " PASSED"
-   else
-      echo "*FAILED*"
-      echo "    Expected result (*.ls) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
-   fi
-
-   # Clean up output file
-   if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_sav
-   fi
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.ls) missing"
+        nerrors="`expr $nerrors + 1`"
+    elif $CMP $expect $actual; then
+        echo " PASSED"
+    else
+        echo "*FAILED*"
+        echo "    Expected result (*.ls) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+        rm -f $actual $actual_sav
+    fi
 }
 
 # Single run of tool
@@ -258,30 +259,30 @@ CMPTEST()
     # any unexpected output from that stream too.
     TESTING $H5MKGRP $@
     (
-    cd $TESTDIR
-    $RUNSERIAL $H5MKGRP_BIN $@
+        cd $TESTDIR
+        $RUNSERIAL $H5MKGRP_BIN $@
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual
 
-   if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-      echo " CREATED"
-      cp $actual $expect
-      echo "    Expected result (*.txt) missing"
-      nerrors="`expr $nerrors + 1`"
-   elif $CMP $expect $actual; then
-      echo " PASSED"
-   else
-      echo "*FAILED*"
-      echo "    Expected result (*.txt) differs from actual result (*.out)"
-      nerrors="`expr $nerrors + 1`"
-      test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
-   fi
-
-   # Clean up output file
-   if test -z "$HDF5_NOCLEANUP"; then
-      rm -f $actual $actual_err
-   fi
+    if [ ! -f $expect ]; then
+        # Create the expect file if it doesn't yet exist.
+        echo " CREATED"
+        cp $actual $expect
+        echo "    Expected result (*.txt) missing"
+        nerrors="`expr $nerrors + 1`"
+    elif $CMP $expect $actual; then
+        echo " PASSED"
+    else
+        echo "*FAILED*"
+        echo "    Expected result (*.txt) differs from actual result (*.out)"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+    fi
+
+    # Clean up output file
+    if test -z "$HDF5_NOCLEANUP"; then
+        rm -f $actual $actual_err
+    fi
 }
 
 ##############################################################################
-- 
cgit v0.12