[svn-r29836] Revert whitespace and non-critical changes for patch.

15 files changed, 334 insertions, 334 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 887c0f0..bffc14d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,7 +24,6 @@ include $(top_srcdir)/config/commence.am
 CONFIG=ordered
 
 # All subdirectories
-SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
-	h5format_convert perform
+SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat h5format_convert perform
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3d1791e..5604dbf 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -731,9 +731,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 CONFIG = ordered
 
 # All subdirectories
-SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
-	h5format_convert perform
-
+SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat h5format_convert perform
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/tools/h5format_convert/h5format_convert.c b/tools/h5format_convert/h5format_convert.c
index 2d7b721..75c3713 100644
--- a/tools/h5format_convert/h5format_convert.c
+++ b/tools/h5format_convert/h5format_convert.c
@@ -20,7 +20,7 @@
 
 /*
  * We include the private header file so we can get to the uniform
- * programming environment it declares.
+ * programming environment it declares.  
  * HDF5 API functions (except for H5G_basename())
  */
 #include "H5private.h"
@@ -44,13 +44,13 @@ static int verbose_g = 0;
 static const char *s_opts = "hVvd:n";
 static struct long_options l_opts[] = {
         { "help", no_arg, 'h' },
-    { "hel", no_arg, 'h'},
-    { "he", no_arg, 'h'},
+	{ "hel", no_arg, 'h'},
+	{ "he", no_arg, 'h'},
         { "version", no_arg, 'V' },
-    { "version", no_arg, 'V' },
-    { "versio", no_arg, 'V' },
-    { "versi", no_arg, 'V' },
-    { "vers", no_arg, 'V' },
+	{ "version", no_arg, 'V' },
+	{ "versio", no_arg, 'V' },
+	{ "versi", no_arg, 'V' },
+	{ "vers", no_arg, 'V' },
         { "verbose", no_arg, 'v' },
         { "verbos", no_arg, 'v' },
         { "verbo", no_arg, 'v' },
@@ -75,7 +75,7 @@ static struct long_options l_opts[] = {
  *
  *-------------------------------------------------------------------------
  */
-static void usage(const char *prog)
+static void usage(const char *prog) 
 {
     printf("usage: %s [OPTIONS] file_name\n", prog);
     printf("  OPTIONS\n");
@@ -110,68 +110,68 @@ static void usage(const char *prog)
  * Purpose: parse command line input
  *
  * Return: Success: 0
- *         Failure: 1
+ *  	   Failure: 1
  *
  *-------------------------------------------------------------------------
  */
 static int
-parse_command_line(int argc, const char **argv)
+parse_command_line(int argc, const char **argv) 
 {
     int opt;
 
      /* no arguments */
     if (argc == 1) {
         usage(h5tools_getprogname());
-    h5tools_setstatus(EXIT_FAILURE);
+	h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
 
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-    switch((char) opt) {
-        case 'h':
-        usage(h5tools_getprogname());
-        h5tools_setstatus(EXIT_SUCCESS);
-        goto error;
-
-        case 'V':
-        print_version(h5tools_getprogname());
-        h5tools_setstatus(EXIT_SUCCESS);
-        goto error;
-
-        case 'v':
-        verbose_g = TRUE;
-        break;
-
-        case 'd': /* -d dname */
-        if(opt_arg != NULL && *opt_arg)
-        /* if(opt_arg != NULL)*/
-            dname_g = HDstrdup(opt_arg);
-        if(dname_g == NULL) {
-            h5tools_setstatus(EXIT_FAILURE);
-            error_msg("No dataset name\n", opt_arg);
-            usage(h5tools_getprogname());
-            goto error;
-        }
-        dset_g = TRUE;
-        break;
-
-        case 'n': /* -n */
-        noop_g = TRUE;
-        break;
-
-        default:
-        h5tools_setstatus(EXIT_FAILURE);
-        usage(h5tools_getprogname());
-        goto error;
-        break;
-    } /* switch */
+	switch((char) opt) {
+	    case 'h':
+		usage(h5tools_getprogname());
+		h5tools_setstatus(EXIT_SUCCESS);
+		goto error;
+
+	    case 'V':
+		print_version(h5tools_getprogname());
+		h5tools_setstatus(EXIT_SUCCESS);
+		goto error;
+
+	    case 'v':
+		verbose_g = TRUE;
+		break;
+
+	    case 'd': /* -d dname */
+		if(opt_arg != NULL && *opt_arg)
+		/* if(opt_arg != NULL)*/
+		    dname_g = HDstrdup(opt_arg);
+		if(dname_g == NULL) {
+		    h5tools_setstatus(EXIT_FAILURE);
+		    error_msg("No dataset name\n", opt_arg);
+		    usage(h5tools_getprogname());
+		    goto error;
+		}
+		dset_g = TRUE;
+		break;
+
+	    case 'n': /* -n */
+		noop_g = TRUE;
+		break;
+
+	    default:
+		h5tools_setstatus(EXIT_FAILURE);
+		usage(h5tools_getprogname());
+		goto error;
+		break;
+	} /* switch */
     } /* while */
 
     if (argc <= opt_ind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
-    h5tools_setstatus(EXIT_FAILURE);
+	h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
 
@@ -205,17 +205,17 @@ leave(int ret)
  * Function: convert()
  *
  * Purpose: To downgrade a dataset's indexing type or layout version:
- *        For chunked:
- *          Downgrade the chunk indexing type to version 1 B-tree
- *              If type is already version 1 B-tree, no further action
- *        For compact/contiguous:
- *          Downgrade the layout version from 4 to 3
- *          If version is already <= 3, no further action
- *        For virtual:
- *          No further action
+ *		For chunked:
+ *		  Downgrade the chunk indexing type to version 1 B-tree
+ *	    	  If type is already version 1 B-tree, no further action
+ *		For compact/contiguous:
+ *		  Downgrade the layout version from 4 to 3
+ *		  If version is already <= 3, no further action
+ *		For virtual:
+ *		  No further action
  *
  * Return: Success: 0
- *         Failure: 1
+ *  	   Failure: 1
  *
  *-------------------------------------------------------------------------
  */
@@ -229,114 +229,114 @@ convert(hid_t fid, const char *dname)
 
     /* Open the dataset */
     if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
-    error_msg("unable to open dataset \"%s\"\n", dname);
-    h5tools_setstatus(EXIT_FAILURE);
-    goto error;
+	error_msg("unable to open dataset \"%s\"\n", dname);
+	h5tools_setstatus(EXIT_FAILURE);
+	goto error;
 
     } else if(verbose_g)
-    printf("Open the dataset\n");
+	printf("Open the dataset\n");
 
     /* Get the dataset's creation property list */
     if((dcpl = H5Dget_create_plist(did)) < 0) {
-    error_msg("unable to get the dataset creation property list\n");
-    h5tools_setstatus(EXIT_FAILURE);
-    goto error;
+	error_msg("unable to get the dataset creation property list\n");
+	h5tools_setstatus(EXIT_FAILURE);
+	goto error;
     }
 
     /* Get the dataset's layout */
     if((layout_type = H5Pget_layout(dcpl)) < 0) {
-    error_msg("unable to get the dataset layout type\n");
-    h5tools_setstatus(EXIT_FAILURE);
-    goto error;
+	error_msg("unable to get the dataset layout type\n");
+	h5tools_setstatus(EXIT_FAILURE);
+	goto error;
 
     } else if(verbose_g)
-    printf("Retrieve the dataset's layout\n");
+	printf("Retrieve the dataset's layout\n");
 
     switch(layout_type) {
-    case H5D_CHUNKED:
-        if(verbose_g)
-        printf("Dataset is a chunked dataset\n");
-
-        /* Get the dataset's chunk indexing type */
-        if(H5Dget_chunk_index_type(did, &idx_type) < 0) {
-        error_msg("unable to get the chunk indexing type for \"%s\"\n", dname);
-        h5tools_setstatus(EXIT_FAILURE);
-        goto error;
-        } else if(verbose_g)
-        printf("Retrieve the dataset's chunk indexing type\n");
-
-        if(idx_type == H5D_CHUNK_IDX_BTREE) {
-        if(verbose_g)
-            printf("Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
-        h5tools_setstatus(EXIT_SUCCESS);
-        goto done;
-        } else if (verbose_g)
-        printf("Dataset's chunk indexing type is not version 1 B-tree\n");
-        break;
-
-    case H5D_CONTIGUOUS:
-        if(verbose_g)
-        printf("Dataset is a contiguous dataset: downgrade layout version as needed\n");
-        break;
+	case H5D_CHUNKED:
+	    if(verbose_g)
+		printf("Dataset is a chunked dataset\n");
+
+	    /* Get the dataset's chunk indexing type */
+	    if(H5Dget_chunk_index_type(did, &idx_type) < 0) {
+		error_msg("unable to get the chunk indexing type for \"%s\"\n", dname);
+		h5tools_setstatus(EXIT_FAILURE);
+		goto error;
+	    } else if(verbose_g)
+		printf("Retrieve the dataset's chunk indexing type\n");
+
+	    if(idx_type == H5D_CHUNK_IDX_BTREE) {
+		if(verbose_g)
+		    printf("Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
+		h5tools_setstatus(EXIT_SUCCESS);
+		goto done;
+	    } else if (verbose_g)
+		printf("Dataset's chunk indexing type is not version 1 B-tree\n");
+	    break;
+
+	case H5D_CONTIGUOUS:
+	    if(verbose_g)
+		printf("Dataset is a contiguous dataset: downgrade layout version as needed\n");
+	    break;
 
         case H5D_COMPACT:
-        if(verbose_g)
-        printf("Dataset is a compact dataset: downgrade layout version as needed\n");
-        break;
+	    if(verbose_g)
+		printf("Dataset is a compact dataset: downgrade layout version as needed\n");
+	    break;
 
         case H5D_VIRTUAL:
-        if(verbose_g)
-        printf("No further action for virtual dataset\n");
-        goto done;
+	    if(verbose_g)
+		printf("No further action for virtual dataset\n");
+	    goto done;
 
-    default:
-        error_msg("unknown layout type for \"%s\"\n", dname);
-        h5tools_setstatus(EXIT_FAILURE);
-        goto error;
+	default:
+	    error_msg("unknown layout type for \"%s\"\n", dname);
+	    h5tools_setstatus(EXIT_FAILURE);
+	    goto error;
 
     } /* end switch */
 
     /* No further action if it is a noop */
     if(noop_g) {
-    if(verbose_g)
-        printf("Not converting the dataset\n");
-    h5tools_setstatus(EXIT_SUCCESS);
-    goto done;
+	if(verbose_g)
+	    printf("Not converting the dataset\n");
+	h5tools_setstatus(EXIT_SUCCESS);
+	goto done;
     }
 
     if(verbose_g)
-    printf("Converting the dataset...\n");
+	printf("Converting the dataset...\n");
 
     /* Downgrade the dataset */
     if(H5Dformat_convert(did) < 0) {
-    error_msg("unable to downgrade dataset for \"%s\"\n", dname);
-    h5tools_setstatus(EXIT_FAILURE);
-    goto error;
+	error_msg("unable to downgrade dataset for \"%s\"\n", dname);
+	h5tools_setstatus(EXIT_FAILURE);
+	goto error;
     } else if(verbose_g)
-    printf("Done\n");
+	printf("Done\n");
 
 done:
     /* Close the dataset */
     if(H5Dclose(did) < 0) {
         error_msg("unable to close dataset \"%s\"\n", dname);
         h5tools_setstatus(EXIT_FAILURE);
-    goto error;
+	goto error;
     } else if(verbose_g)
-    printf("Close the dataset\n");
-
+	printf("Close the dataset\n");
+    
     /* Close the dataset creation property list */
     if(H5Pclose(dcpl) < 0) {
         error_msg("unable to close dataset creation property list\n");
         h5tools_setstatus(EXIT_FAILURE);
-    goto error;
+	goto error;
     } else if(verbose_g)
-    printf("Close the dataset creation property list\n");
+	printf("Close the dataset creation property list\n");
 
     return(0);
 
 error:
     if(verbose_g)
-    printf("Error encountered\n");
+	printf("Error encountered\n");
 
     H5E_BEGIN_TRY {
         H5Pclose(dcpl);
@@ -351,10 +351,10 @@ error:
  * Function: convert_dsets_cb()
  *
  * Purpose:  The callback routine from the traversal to convert the
- *         chunk indexing type of the dataset object.
+ *	     chunk indexing type of the dataset object.
  *
  * Return: Success: 0
- *         Failure: 1
+ *  	   Failure: 1
  *-------------------------------------------------------------------------
  */
 static int
@@ -366,11 +366,11 @@ convert_dsets_cb(const char *path, const H5O_info_t *oi, const char *already_vis
     if(NULL == already_visited) {
 
         if(oi->type == H5O_TYPE_DATASET) {
-        if(verbose_g)
-        printf("Going to process dataset:%s...\n", path);
-        if(convert(fid, path) < 0)
-        goto error;
-    }
+	    if(verbose_g)
+		printf("Going to process dataset:%s...\n", path);
+	    if(convert(fid, path) < 0)
+		goto error;
+	}
 
     } /* end if */
 
@@ -386,10 +386,10 @@ error:
  * Function: main
  *
  * Purpose: To convert the chunk indexing type of a dataset in a file to
- *        version 1 B-tree.
+ *	    version 1 B-tree.
  *
  * Return: Success: 0
- *         Failure: 1
+ *  	   Failure: 1
  *
  *-------------------------------------------------------------------------
  */
@@ -412,31 +412,31 @@ main(int argc, const char *argv[])
 
     /* Parse command line options */
     if(parse_command_line(argc, argv) < 0)
-    goto done;
+	goto done;
     else if(verbose_g)
-    printf("Process command line options\n");
+	printf("Process command line options\n");
 
     if(noop_g && verbose_g)
-    printf("It is noop...\n");
+	printf("It is noop...\n");
 
     /* Open the HDF5 file */
     if((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, NULL, NULL, 0)) < 0) {
-    error_msg("unable to open file \"%s\"\n", fname_g);
-    h5tools_setstatus(EXIT_FAILURE);
-    goto done;
+	error_msg("unable to open file \"%s\"\n", fname_g);
+	h5tools_setstatus(EXIT_FAILURE);
+	goto done;
     } else if(verbose_g)
-    printf("Open the file %s\n", fname_g);
+	printf("Open the file %s\n", fname_g);
 
     if(dset_g) { /* Convert a specified dataset in the file */
-    if(verbose_g)
-        printf("Going to process dataset: %s...\n", dname_g);
-    if(convert(fid, dname_g) < 0)
-        goto done;
+	if(verbose_g)
+	    printf("Going to process dataset: %s...\n", dname_g);
+	if(convert(fid, dname_g) < 0)
+	    goto done;
     } else { /* Convert all datasets in the file */
-    if(verbose_g)
-        printf("Processing all datasets in the file...\n");
-    if(h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid) < 0)
-        goto done;
+	if(verbose_g)
+	    printf("Processing all datasets in the file...\n");
+	if(h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid) < 0)
+	    goto done;
     }
 
     if(verbose_g) {
@@ -458,18 +458,18 @@ main(int argc, const char *argv[])
 done:
     /* Close the file */
     if(fid >= 0) {
-    if(H5Fclose(fid) < 0) {
-        error_msg("unable to close file \"%s\"\n", fname_g);
-        h5tools_setstatus(EXIT_FAILURE);
-    } else if(verbose_g)
-        printf("Close the file\n");
-    }
+	if(H5Fclose(fid) < 0) {
+	    error_msg("unable to close file \"%s\"\n", fname_g);
+	    h5tools_setstatus(EXIT_FAILURE);
+	} else if(verbose_g)
+	    printf("Close the file\n");
+    } 
 
     if(fname_g)
-    HDfree(fname_g);
+	HDfree(fname_g);
     if(dname_g)
-    HDfree(dname_g);
-
+	HDfree(dname_g);
+    
     H5Eset_auto2(H5E_DEFAULT, func, edata);
     leave(h5tools_getstatus());
 
diff --git a/tools/h5format_convert/testh5fc.sh.in b/tools/h5format_convert/testh5fc.sh.in
index f3eadd6..15dba6d 100644
--- a/tools/h5format_convert/testh5fc.sh.in
+++ b/tools/h5format_convert/testh5fc.sh.in
@@ -34,8 +34,8 @@ EXIT_FAILURE=1
 FORMCONV=h5format_convert       # The tool name
 FORMCONV_BIN=`pwd`/$FORMCONV    # The path of the tool binary
 
-CHK_IDX=h5fc_chk_idx        # The program name
-CHK_IDX_BIN=`pwd`/$CHK_IDX        # The program to verify the chunk indexing type is v1 B-tree
+CHK_IDX=h5fc_chk_idx		# The program name
+CHK_IDX_BIN=`pwd`/$CHK_IDX    	# The program to verify the chunk indexing type is v1 B-tree
 
 RM='rm -rf'
 CMP='cmp -s'
@@ -154,10 +154,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-                $CP -f $tstfile $TESTDIR
+    	        $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-
+                
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -171,13 +171,13 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=`$DIRNAME $SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl`
+    SDIR=$SRC_H5FORMCONV_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
         $RM $TESTDIR
     else
-    $RM $TESTDIR/$TMPFILE
+	$RM $TESTDIR/$TMPFILE
     fi
 }
 
@@ -198,13 +198,13 @@ TESTING() {
 # non-zero value.
 #
 # $1: expected output
-# $2: the test file name
-#    --fname might be empty or fname does not exist
-#    --fname is copied to a temporary file for testing
+# $2: the test file name 
+#	--fname might be empty or fname does not exist
+#	--fname is copied to a temporary file for testing
 # $3 to at most $6--options to the tool such as:
-#     -d dname or --dname=dname
-#     -v or --verbose
-#     -n or --noop
+# 	-d dname or --dname=dname 
+# 	-v or --verbose
+# 	-n or --noop
 TOOLTEST_OUT() {
     # Prepare expected and actual output
     expect="$TESTDIR/$1"
@@ -224,8 +224,8 @@ TOOLTEST_OUT() {
     # Run test.
     TESTING $FORMCONV $3 $4 $5 $6 $2
     (
-    cd $TESTDIR
-    $RUNSERIAL $FORMCONV_BIN $3 $4 $5 $6 $TFILE
+	cd $TESTDIR
+	$RUNSERIAL $FORMCONV_BIN $3 $4 $5 $6 $TFILE
     ) >$actual 2>$actual_err
     cp $actual $actual_sav
     cp $actual_err $actual_err_sav
@@ -236,19 +236,19 @@ TOOLTEST_OUT() {
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-    $RM $actual $actual_err
-    $RM $actual $actual_err $actual_sav $actual_err_sav
+	$RM $actual $actual_err
+	$RM $actual $actual_err $actual_sav $actual_err_sav
     fi
 }
 
-# To check that the tool exits success, no output
+# To check that the tool exits success, no output 
 # Assume all short options
-# $1 is the test file name
-#    --fname exists
-#    --fname is copied to a temporary file for testing
+# $1 is the test file name 
+#	--fname exists
+#	--fname is copied to a temporary file for testing
 # $2 to at most $4--options to the tool such as:
-#     -d dname
-#     -n
+# 	-d dname
+# 	-n
 TOOLTEST() {
     TESTING $FORMCONV $2 $3 $4 $1
     $RM $TESTDIR/$TMPFILE
@@ -256,9 +256,9 @@ TOOLTEST() {
     $RUNSERIAL $FORMCONV_BIN $2 $3 $4 $TESTDIR/$TMPFILE
     exitcode=$?
     if [ $exitcode -ne 0 ]; then
-    echo "*FAILED*"
-    echo "    The tool exits failure"
-    nerrors="`expr $nerrors + 1`"
+	echo "*FAILED*"
+	echo "    The tool exits failure"
+	nerrors="`expr $nerrors + 1`"
     else
     echo " PASSED"
     fi
@@ -306,11 +306,11 @@ IDX_CHECK() {
     $RUNSERIAL $CHK_IDX_BIN $TESTDIR/$TMPCHKFILE $1
     ret=$?
     if [ $ret -eq 0 ]; then
-    echo " PASSED"
+	echo " PASSED"
     else
-    echo "*FAILED*"
-    echo "    The chunk indexing type is not correct"
-    nerrors="`expr $nerrors + 1`"
+	echo "*FAILED*"
+	echo "    The chunk indexing type is not correct"
+	nerrors="`expr $nerrors + 1`"
     fi
 }
 
@@ -343,7 +343,7 @@ H5DUMP_CHECK() {
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-    $RM $actual $actual_err
+	$RM $actual $actual_err
     fi
 }
 
@@ -352,12 +352,12 @@ SKIP() {
     TESTING $STAT $@
     echo  " -SKIP-"
 }
-
+  
 
 
 ##############################################################################
 ##############################################################################
-###              T H E   T E S T S                                ###
+###			  T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
 # prepare for test
@@ -457,7 +457,7 @@ TOOLTEST h5fc_non_v3.h5 -n
 #
 # No output from tests: just check exit code
 # h5format_convert h5fc_non_v3.h5
-# 1) convert all datasets
+# 1) convert all datasets 
 # 2) verify indexing types
 TOOLTEST_CHK h5fc_non_v3.h5
 IDX_CHECK /DSET_NDATA_EA
diff --git a/tools/h5import/h5importtestutil.sh.in b/tools/h5import/h5importtestutil.sh.in
index 5aafcb2..f2694a0 100644
--- a/tools/h5import/h5importtestutil.sh.in
+++ b/tools/h5import/h5importtestutil.sh.in
@@ -144,10 +144,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-                $CP -f $tstfile $TESTDIR
+    	        $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-
+                
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -266,7 +266,7 @@ else
 fi
 }
 
-echo ""
+echo "" 
 echo "=============================="
 echo "H5IMPORT tests started"
 echo "=============================="
@@ -290,30 +290,30 @@ $RUNSERIAL ./h5importtest
 TESTING "ASCII I32 rank 3 - Output BE " ;
 TOOLTEST $TESTDIR/txtin32.txt -c $TESTDIR/txtin32.conf -o txtin32.h5
 
-TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended"
+TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" 
 TOOLTEST $TESTDIR/txtin16.txt -c $TESTDIR/txtin16.conf -o txtin16.h5
 
-TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed "
+TESTING "ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed " 
 TOOLTEST $TESTDIR/txtin8.txt -c $TESTDIR/txtin8.conf  -o txtin8.h5
 
 
-TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed "
+TESTING "ASCII UI16 - rank 2 - Output LE+Chunked+Compressed " 
 TOOLTEST $TESTDIR/txtuin16.txt -c $TESTDIR/txtuin16.conf -o txtuin16.h5
 
-TESTING "ASCII UI32 - rank 3 - Output BE"
+TESTING "ASCII UI32 - rank 3 - Output BE" 
 TOOLTEST $TESTDIR/txtuin32.txt -c $TESTDIR/txtuin32.conf -o txtuin32.h5
 
 
-TESTING "ASCII F32 - rank 3 - Output LE "
+TESTING "ASCII F32 - rank 3 - Output LE " 
 TOOLTEST $TESTDIR/txtfp32.txt -c $TESTDIR/txtfp32.conf -o txtfp32.h5
 
-TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed "
+TESTING "ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed " 
 TOOLTEST $TESTDIR/txtfp64.txt -c $TESTDIR/txtfp64.conf -o txtfp64.h5
 
 
-TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
+TESTING "BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
 TOOLTEST binfp64.bin -c $TESTDIR/binfp64.conf -o binfp64.h5
-TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed "
+TESTING "H5DUMP-BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed " 
 if test $USE_FILTER_DEFLATE != "yes"; then
  SKIP "/fp/bin/64-bit" binfp64.h5
 else
@@ -321,49 +321,49 @@ else
 fi
 
 
-TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
+TESTING "BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
 TOOLTEST binin8.bin -c $TESTDIR/binin8.conf -o binin8.h5
-TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed "
+TESTING "H5DUMP-BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed " 
 if test $USE_FILTER_DEFLATE != "yes"; then
  SKIP "/int/bin/8-bit" binin8.h5
 else
  TOOLTEST2 "/int/bin/8-bit" binin8.h5
 fi
 
-TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
+TESTING "BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
 TOOLTEST binin16.bin -c $TESTDIR/binin16.conf -o binin16.h5
-TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended "
+TESTING "H5DUMP-BINARY I16 - rank 3 - Output order LE + CHUNKED + extended " 
 TOOLTEST2 "/int/bin/16-bit" binin16.h5
 
-TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED "
+TESTING "BINARY I32 - rank 3 - Output BE + CHUNKED " 
 TOOLTEST binin32.bin -c $TESTDIR/binin32.conf -o binin32.h5
-TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED "
+TESTING "H5DUMP-BINARY I32 - rank 3 - Output BE + CHUNKED " 
 TOOLTEST2 "/int/bin/32-bit" binin32.h5
 
 
-TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
+TESTING "BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
 TOOLTEST binuin16.bin -c $TESTDIR/binuin16.conf -o binuin16.h5
-TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED "
+TESTING "H5DUMP-BINARY UI16 - rank 3 - Output byte BE + CHUNKED " 
 TOOLTEST2 "/int/buin/16-bit" binuin16.h5
 
-TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED "
+TESTING "BINARY UI32 - rank 3 - Output LE + CHUNKED " 
 TOOLTEST binuin32.bin -c $TESTDIR/binuin32.conf -o binuin32.h5
-TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED "
+TESTING "H5DUMP-BINARY UI32 - rank 3 - Output LE + CHUNKED " 
 TOOLTEST2 "/int/buin/32-bit" binuin32.h5
 
 
-TESTING "STR"
+TESTING "STR" 
 TOOLTEST $TESTDIR/txtstr.txt -c $TESTDIR/txtstr.conf -o txtstr.h5
-TESTING "H5DUMP-STR"
+TESTING "H5DUMP-STR" 
 TOOLTEST4 "/mytext/data" txtstr.h5
 
 
-TESTING "BINARY I8 CR LF EOF"
+TESTING "BINARY I8 CR LF EOF" 
 TOOLTEST binin8w.bin -c $TESTDIR/binin8w.conf -o binin8w.h5
-TESTING "H5DUMP-BINARY I8 CR LF EOF"
+TESTING "H5DUMP-BINARY I8 CR LF EOF" 
 TOOLTEST2 "/dataset0" binin8w.h5
 
-TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE "
+TESTING "ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE " 
 TOOLTEST $TESTDIR/textpfe64.txt -c $TESTDIR/textpfe.conf -o textpfe.h5
 
 
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 6dca5f1..d8542a4 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -10,7 +10,7 @@ INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR})
 # --------------------------------------------------------------------
 # Add h5Repack executables
 # --------------------------------------------------------------------
-set (REPACK_COMMON_SOURCES
+set (REPACK_COMMON_SRCS
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_copy.c
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_filters.c
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_opttable.c
@@ -20,7 +20,7 @@ set (REPACK_COMMON_SOURCES
     ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack.c
 )
 
-add_executable (h5repack ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c)
+add_executable (h5repack ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repack_main.c)
 TARGET_NAMING (h5repack STATIC)
 TARGET_C_PROPERTIES (h5repack STATIC " " " ")
 target_link_libraries (h5repack  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -38,7 +38,7 @@ if (BUILD_TESTING)
   target_link_libraries (testh5repack_detect_szip ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
   set_target_properties (testh5repack_detect_szip PROPERTIES FOLDER tools)
 
-  add_executable (h5repacktest ${REPACK_COMMON_SOURCES} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c)
+  add_executable (h5repacktest ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c)
   TARGET_NAMING (h5repacktest STATIC)
   TARGET_C_PROPERTIES (h5repacktest STATIC " " " ")
   target_link_libraries (h5repacktest  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index 6dc350e..5ff0f50 100644
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -178,7 +178,7 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-                $CP -f $tstfile $TESTDIR
+    	        $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
 
@@ -195,7 +195,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=`$DIRNAME $SRC_H5REPACK_TESTFILES/h5repack-help.txt`
+    SDIR=$SRC_H5REPACK_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
@@ -540,11 +540,11 @@ TOOLTEST1()
     )
     RET=$?
     if [ $RET != 0 ] ; then
-    echo "*FAILED*"
-    nerrors="`expr $nerrors + 1`"
+	echo "*FAILED*"
+	nerrors="`expr $nerrors + 1`"
     else
-    echo " PASSED"
-    DIFFTEST $infile $outfile
+	echo " PASSED"
+	DIFFTEST $infile $outfile
     fi
     rm -f $outfile
 }
@@ -571,11 +571,11 @@ TOOLTESTV()
     ) >$actual 2>$actual_err
     RET=$?
     if [ $RET != 0 ] ; then
-    echo "*FAILED*"
-    nerrors="`expr $nerrors + 1`"
+	echo "*FAILED*"
+	nerrors="`expr $nerrors + 1`"
     else
-    echo " PASSED"
-    DIFFTEST $infile $outfile
+	echo " PASSED"
+	DIFFTEST $infile $outfile
     fi
 
     # display output compare
@@ -705,11 +705,11 @@ TOOLTEST_META()
     # verify sizes.
     MESSAGE "Verify the sizes of both output files ($size1 vs $size2)"
     if [ $size1 -lt $size2 ]; then
-        # pass
-    echo " PASSED"
+    	# pass
+	echo " PASSED"
     else
-    #fail
-    echo "*FAILED*"
+	#fail
+	echo "*FAILED*"
         nerrors="`expr $nerrors + 1`"
     fi
 
@@ -782,7 +782,7 @@ USE_FILTER_SZIP_ENCODER=`$RUNSERIAL $H5DETECTSZIP_BIN`
 fi
 
 ##############################################################################
-###              T H E   T E S T S
+###			  T H E   T E S T S
 ##############################################################################
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index c03b7a7..708c173 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -193,6 +193,7 @@ static void usage(const char *prog) {
 	printf("\n");
 }
 
+
 /*-------------------------------------------------------------------------
  * Function:    leave
  *
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 33c6b02..ce1ad34 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -10,7 +10,7 @@ add_definitions (${HDF_EXTRA_C_FLAGS})
 # Define Sources
 #-----------------------------------------------------------------------------
 
-set (H5_TOOLS_LIB_SOURCES
+set (H5_TOOLS_LIB_SRCS
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.c
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_array.c
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff_attr.c
@@ -37,7 +37,7 @@ set (H5_TOOLS_LIB_HDRS
     ${HDF5_TOOLS_LIB_SOURCE_DIR}/h5diff.h
 )
 
-add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SOURCES} ${H5_TOOLS_LIB_HDRS})
+add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
 TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}")
@@ -50,7 +50,7 @@ set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES
 set (install_targets ${HDF5_TOOLS_LIB_TARGET})
 
 if (BUILD_SHARED_LIBS)
-  add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SOURCES} ${H5_TOOLS_LIB_HDRS})
+  add_library (${HDF5_TOOLS_LIBSH_TARGET} SHARED ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB_HDRS})
   TARGET_C_PROPERTIES (${HDF5_TOOLS_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIBSH_TARGET}")
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index b4d6bac..bde6805 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -29,10 +29,12 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 TEST_PROG=h5repart_gentest talign
 TEST_SCRIPT=testh5repart.sh testh5mkgrp.sh testh5clear.sh
 
+
 check_PROGRAMS=$(TEST_PROG) repart_test clear_open_chk
 check_SCRIPTS=$(TEST_SCRIPT)
 SCRIPT_DEPEND=h5repart$(EXEEXT) h5mkgrp$(EXEEXT) h5clear$(EXEEXT)
 
+
 # These are our main targets, the tools
 bin_PROGRAMS=h5debug h5repart h5mkgrp h5clear
 bin_SCRIPTS=h5redeploy
diff --git a/tools/misc/clear_open_chk.c b/tools/misc/clear_open_chk.c
index 3344abf..7e86068 100644
--- a/tools/misc/clear_open_chk.c
+++ b/tools/misc/clear_open_chk.c
@@ -27,28 +27,28 @@ usage(void)
 } /* usage() */
 
 /*-------------------------------------------------------------------------
- * Function:    main
+ * Function:	main
  *
- * Purpose:    To open the file which has zero or nonzero status_flags in
- *        the superblock.
+ * Purpose:	To open the file which has zero or nonzero status_flags in 
+ *		the superblock.
  *
- * Return:    0 on success
- *        1 on failure
+ * Return:	0 on success
+ *		1 on failure
  *
- * Programmer:    Vailin Choi; July 2013
+ * Programmer:	Vailin Choi; July 2013
  *
  *-------------------------------------------------------------------------
  */
 int
 main(int argc, char *argv[])
 {
-    char *fname;    /* The HDF5 file name */
-    hid_t fid;        /* File ID */
+    char *fname;	/* The HDF5 file name */
+    hid_t fid;		/* File ID */
 
     /* Check the # of arguments */
     if(argc != 2) {
-        usage();
-        return(EXIT_FAILURE);
+	usage();
+	return(EXIT_FAILURE);
     }
 
     /* Get the file name */
@@ -56,16 +56,16 @@ main(int argc, char *argv[])
 
     /* Try opening the file */
     if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, NULL, NULL, (size_t)0)) < 0) {
-        HDfprintf(stderr, "clear_open_chk: unable to open the file\n");
-        return EXIT_FAILURE;
+	HDfprintf(stderr, "clear_open_chk: unable to open the file\n");
+	return EXIT_FAILURE;
     }
 
     if(fname)
         HDfree(fname);
     /* Close the file */
     if(H5Fclose(fid) < 0) {
-        HDfprintf(stderr, "clear_open_chk: cannot close the file\n");
-        return EXIT_FAILURE;
+	HDfprintf(stderr, "clear_open_chk: cannot close the file\n");
+	return EXIT_FAILURE;
     }
 
     /* Return success */
diff --git a/tools/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index bcb3247..3a60a84 100644
--- a/tools/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
@@ -16,11 +16,11 @@ INCLUDE_DIRECTORIES (${HDF5_TOOLS_SRC_DIR}/lib )
 # Add the executables
 # --------------------------------------------------------------------
 #-- Adding test for h5perf_serial
-set (h5perf_serial_SOURCES
+set (h5perf_serial_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
     ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
 )
-add_executable (h5perf_serial ${h5perf_serial_SOURCES})
+add_executable (h5perf_serial ${h5perf_serial_SRCS})
 TARGET_NAMING (h5perf_serial STATIC)
 TARGET_C_PROPERTIES (h5perf_serial STATIC " " " ")
 target_link_libraries (h5perf_serial ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -28,11 +28,11 @@ set_target_properties (h5perf_serial PROPERTIES FOLDER perform)
 
 if (HDF5_BUILD_PERFORM_STANDALONE)
   #-- Adding test for h5perf_serial_alone
-  set (h5perf_serial_alone_SOURCES
+  set (h5perf_serial_alone_SRCS
       ${HDF5_PERFORM_SOURCE_DIR}/sio_perf.c
       ${HDF5_PERFORM_SOURCE_DIR}/sio_engine.c
   )
-  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SOURCES})
+  add_executable (h5perf_serial_alone ${h5perf_serial_alone_SRCS})
   TARGET_NAMING (h5perf_serial_alone STATIC)
   TARGET_C_PROPERTIES (h5perf_serial_alone STATIC " " " ")
   target_link_libraries (h5perf_serial_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -43,30 +43,30 @@ if (HDF5_BUILD_PERFORM_STANDALONE)
 endif (HDF5_BUILD_PERFORM_STANDALONE)
 
 #-- Adding test for chunk
-set (chunk_SOURCES
+set (chunk_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/chunk.c
 )
-ADD_EXECUTABLE(chunk ${chunk_SOURCES})
+ADD_EXECUTABLE(chunk ${chunk_SRCS})
 TARGET_NAMING (chunk STATIC)
 TARGET_C_PROPERTIES (chunk STATIC " " " ")
 TARGET_LINK_LIBRARIES(chunk ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (chunk PROPERTIES FOLDER perform)
 
 #-- Adding test for iopipe
-set (iopipe_SOURCES
+set (iopipe_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/iopipe.c
 )
-add_executable (iopipe ${iopipe_SOURCES})
+add_executable (iopipe ${iopipe_SRCS})
 TARGET_NAMING (iopipe STATIC)
 TARGET_C_PROPERTIES (iopipe STATIC " " " ")
 target_link_libraries (iopipe ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
 set_target_properties (iopipe PROPERTIES FOLDER perform)
 
 #-- Adding test for overhead
-set (overhead_SOURCES
+set (overhead_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/overhead.c
 )
-add_executable (overhead ${overhead_SOURCES})
+add_executable (overhead ${overhead_SRCS})
 TARGET_NAMING (overhead STATIC)
 TARGET_C_PROPERTIES (overhead STATIC " " " ")
 target_link_libraries (overhead ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
@@ -74,10 +74,10 @@ set_target_properties (overhead PROPERTIES FOLDER perform)
 
 if (BUILD_TESTING)
 #-- Adding test for perf_meta
-  set (perf_meta_SOURCES
+  set (perf_meta_SRCS
       ${HDF5_PERFORM_SOURCE_DIR}/perf_meta.c
   )
-  add_executable (perf_meta ${perf_meta_SOURCES})
+  add_executable (perf_meta ${perf_meta_SRCS})
   TARGET_NAMING (perf_meta STATIC)
   TARGET_C_PROPERTIES (perf_meta STATIC " " " ")
   target_link_libraries (perf_meta ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
@@ -85,10 +85,10 @@ if (BUILD_TESTING)
 endif (BUILD_TESTING)
 
 #-- Adding test for zip_perf
-set (zip_perf_SOURCES
+set (zip_perf_SRCS
     ${HDF5_PERFORM_SOURCE_DIR}/zip_perf.c
 )
-add_executable (zip_perf ${zip_perf_SOURCES})
+add_executable (zip_perf ${zip_perf_SRCS})
 TARGET_NAMING (zip_perf STATIC)
 TARGET_C_PROPERTIES (zip_perf STATIC " " " ")
 target_link_libraries (zip_perf ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
@@ -96,11 +96,11 @@ set_target_properties (zip_perf PROPERTIES FOLDER perform)
 
 if (H5_HAVE_PARALLEL AND BUILD_TESTING)
   #-- Adding test for h5perf
-  set (h5perf_SOURCES
+  set (h5perf_SRCS
       ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
       ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
   )
-  add_executable (h5perf ${h5perf_SOURCES})
+  add_executable (h5perf ${h5perf_SRCS})
   TARGET_NAMING (h5perf STATIC)
   TARGET_C_PROPERTIES (h5perf STATIC " " " ")
   target_link_libraries (h5perf ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
@@ -108,11 +108,11 @@ if (H5_HAVE_PARALLEL AND BUILD_TESTING)
 
   if (HDF5_BUILD_PERFORM_STANDALONE)
     #-- Adding test for h5perf
-    set (h5perf_alone_SOURCES
+    set (h5perf_alone_SRCS
         ${HDF5_PERFORM_SOURCE_DIR}/pio_perf.c
         ${HDF5_PERFORM_SOURCE_DIR}/pio_engine.c
     )
-    add_executable (h5perf_alone ${h5perf_alone_SOURCES})
+    add_executable (h5perf_alone ${h5perf_alone_SRCS})
     TARGET_NAMING (h5perf_alone STATIC)
     TARGET_C_PROPERTIES (h5perf_alone STATIC " " " ")
     target_link_libraries (h5perf_alone ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
diff --git a/tools/perform/perf.c b/tools/perform/perf.c
index 5835727..7b9590c 100644
--- a/tools/perform/perf.c
+++ b/tools/perform/perf.c
@@ -28,20 +28,20 @@
 #ifdef H5_HAVE_PARALLEL
 
 #ifdef H5_STDC_HEADERS
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <stdio.h>
-#   include <stdlib.h>
-#   include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #endif
 
 #ifdef H5_HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #endif
 
 #ifdef H5_HAVE_SYS_STAT_H
-#   include <sys/stat.h>
+#include <sys/stat.h>
 #endif
 
 #if defined(H5_TIME_WITH_SYS_TIME)
@@ -65,13 +65,13 @@
 #define H5FATAL 1
 #define VRFY(val, mesg, fatal) do {                                            \
     if (!val) {                                                                \
-    printf("Proc %d: ", mynod);                 \
+  	printf("Proc %d: ", mynod);                 \
         printf("*** Assertion failed (%s) at line %4d in %s\n",                \
       mesg, (int)__LINE__, __FILE__);                  \
-    if (fatal){                     \
+  	if (fatal){                     \
       fflush(stdout);                   \
       goto die_jar_jar_die;                 \
-    }                       \
+  	}                       \
     }                                                                          \
 } while(0)
 #define RANK 1
@@ -182,38 +182,38 @@ int main(int argc, char **argv)
 
     /* setup file access template with parallel IO access. */
     if (opt_split_vfd){
-    hid_t mpio_pl;
-
-    mpio_pl = H5Pcreate (H5P_FILE_ACCESS);
-    VRFY((acc_tpl >= 0), "", H5FATAL);
-    ret = H5Pset_fapl_mpio(mpio_pl, MPI_COMM_WORLD, MPI_INFO_NULL);
-    VRFY((ret >= 0), "", H5FATAL);
-
-    /* set optional allocation alignment */
-    if (opt_alignment*opt_threshold != 1){
-        ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
-        VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
-    }
-
-    /* setup file access template */
-    acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
-    VRFY((acc_tpl >= 0), "", H5FATAL);
-    ret = H5Pset_fapl_split(acc_tpl, meta_ext, mpio_pl, raw_ext, mpio_pl);
-    VRFY((ret >= 0), "H5Pset_fapl_split succeeded", H5FATAL);
-    ret = H5Pclose(mpio_pl);
-    VRFY((ret >= 0), "H5Pclose mpio_pl succeeded", H5FATAL);
+  	hid_t mpio_pl;
+
+  	mpio_pl = H5Pcreate (H5P_FILE_ACCESS);
+  	VRFY((acc_tpl >= 0), "", H5FATAL);
+  	ret = H5Pset_fapl_mpio(mpio_pl, MPI_COMM_WORLD, MPI_INFO_NULL);
+  	VRFY((ret >= 0), "", H5FATAL);
+
+  	/* set optional allocation alignment */
+  	if (opt_alignment*opt_threshold != 1){
+      	ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
+      	VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
+  	}
+
+  	/* setup file access template */
+  	acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
+  	VRFY((acc_tpl >= 0), "", H5FATAL);
+  	ret = H5Pset_fapl_split(acc_tpl, meta_ext, mpio_pl, raw_ext, mpio_pl);
+  	VRFY((ret >= 0), "H5Pset_fapl_split succeeded", H5FATAL);
+  	ret = H5Pclose(mpio_pl);
+  	VRFY((ret >= 0), "H5Pclose mpio_pl succeeded", H5FATAL);
     }else{
-    /* setup file access template */
-    acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
-    VRFY((acc_tpl >= 0), "", H5FATAL);
-    ret = H5Pset_fapl_mpio(acc_tpl, MPI_COMM_WORLD, MPI_INFO_NULL);
-    VRFY((ret >= 0), "", H5FATAL);
-
-    /* set optional allocation alignment */
-    if (opt_alignment*opt_threshold != 1){
-        ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
-        VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
-    }
+  	/* setup file access template */
+  	acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
+  	VRFY((acc_tpl >= 0), "", H5FATAL);
+  	ret = H5Pset_fapl_mpio(acc_tpl, MPI_COMM_WORLD, MPI_INFO_NULL);
+  	VRFY((ret >= 0), "", H5FATAL);
+
+  	/* set optional allocation alignment */
+  	if (opt_alignment*opt_threshold != 1){
+  	    ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
+      	VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
+  	}
     }
 
     h5_fixname_no_suffix(FILENAME[0], acc_tpl, filename, sizeof filename);
@@ -227,7 +227,7 @@ int main(int argc, char **argv)
     sid = H5Screate_simple(RANK, dims, NULL);
     VRFY((sid >= 0), "H5Screate_simple succeeded", H5FATAL);
     dataset = H5Dcreate2(fid, "Dataset1", H5T_NATIVE_CHAR, sid,
-            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+      		H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     VRFY((dataset >= 0), "H5Dcreate2 succeeded", H5FATAL);
 
     /* create the memory dataspace and the file dataspace */
diff --git a/tools/perform/pio_engine.c b/tools/perform/pio_engine.c
index ad33fa5..eaedcb8 100644
--- a/tools/perform/pio_engine.c
+++ b/tools/perform/pio_engine.c
@@ -20,19 +20,19 @@
 #include "hdf5.h"
 
 #ifdef H5_STDC_HEADERS
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <stdio.h>
-#   include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #endif
 
 #ifdef H5_HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #endif
 
 #ifdef H5_HAVE_SYS_STAT_H
-#   include <sys/stat.h>
+#include <sys/stat.h>
 #endif
 
 #ifdef H5_HAVE_PARALLEL
diff --git a/tools/perform/sio_engine.c b/tools/perform/sio_engine.c
index ee340e5..505b0f7 100644
--- a/tools/perform/sio_engine.c
+++ b/tools/perform/sio_engine.c
@@ -19,19 +19,19 @@
 #include "hdf5.h"
 
 #ifdef H5_STDC_HEADERS
-#   include <errno.h>
-#   include <fcntl.h>
-#   include <stdio.h>
-#   include <stdlib.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #endif
 
 #ifdef H5_HAVE_UNISTD_H
-#   include <sys/types.h>
-#   include <unistd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #endif
 
 #ifdef H5_HAVE_SYS_STAT_H
-#   include <sys/stat.h>
+#include <sys/stat.h>
 #endif
 
 #include "sio_perf.h"
@@ -261,7 +261,7 @@ done:
         case HDF5:
             if (fd.h5fd != -1)
                 hrc = do_fclose(iot, &fd);
-            break;
+			break;
         default:
             /* unknown request */
             HDassert(0 && "Unknown IO type");
@@ -681,7 +681,7 @@ static herr_t dset_write(int local_dim, file_descr *fd, parameters *parms, void
                 VRFY((hrc >= 0), "H5Dwrite");
 
                 break;
-
+				
             default:
                 /* unknown request */
                 HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
@@ -857,7 +857,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
             GOTOERROR(FAIL);
         }
         break;
-
+		
         default:
         /* unknown request */
         HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
@@ -985,7 +985,7 @@ static herr_t dset_read(int local_dim, file_descr *fd, parameters *parms,
                 }
 #endif
                 break;
-
+				
             default:
                 /* unknown request */
                 HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type);
@@ -1103,7 +1103,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
             GOTOERROR(FAIL);
         }
         break;
-
+		
     default:
         /* unknown request */
         HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)param->io_type);
@@ -1231,7 +1231,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/)
 
         fd->h5fd = -1;
         break;
-
+		
     default:
         /* unknown request */
         HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);
@@ -1303,7 +1303,7 @@ do_cleanupfile(iotype iot, char *filename)
             }
             H5Pclose(fapl);
         break;
-
+			
     default:
         /* unknown request */
         HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot);