[svn-r12440] Purpose:

    Code cleanup

Description:
    Trim trailing whitespace in Makefile.am and C/C++ source files to make
diffing changes easier.

Platforms tested:
    None necessary, whitespace only change

5 files changed, 30 insertions, 30 deletions

diff --git a/perform/benchpar.c b/perform/benchpar.c
index 947a20c..517e4e0 100644
--- a/perform/benchpar.c
+++ b/perform/benchpar.c
@@ -23,15 +23,15 @@
 
 /* Local macros */
 
-/*      
+/*
  * HDF Boolean type.
  */
 #ifndef FALSE
 #   define FALSE 0
 #endif
 #ifndef TRUE
-#   define TRUE 1 
-#endif 
+#   define TRUE 1
+#endif
 
 /* defines for type of VFL driver to use */
 #define FACC_DEFAULT    0
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 8b0a7d0..833eabd 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -652,12 +652,12 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
 	    } /* end if */
 	    /* 2D dataspace */
 	    else {
-		/* Build partial buffer derived type for contiguous access */				
+		/* Build partial buffer derived type for contiguous access */
 		mrc = MPI_Type_contiguous((int)buf_size, MPI_BYTE,
 			&contig_cont);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
 
-		/* Build contiguous file's derived type */				
+		/* Build contiguous file's derived type */
 		mrc = MPI_Type_vector((int)blk_size, (int)1, (int)(snbytes/buf_size),
 			contig_cont, &mpi_cont_type);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -666,12 +666,12 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
 		mrc = MPI_Type_commit(&mpi_cont_type);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_COMMIT");
 
-		/* Build partial buffer derived type for interleaved access */				
+		/* Build partial buffer derived type for interleaved access */
 		mrc = MPI_Type_contiguous((int)blk_size, MPI_BYTE,
 			&contig_inter);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
 
-		/* Build interleaved file's derived type */				
+		/* Build interleaved file's derived type */
 		mrc = MPI_Type_vector((int)buf_size, (int)1, (int)(snbytes/blk_size),
 			contig_inter, &mpi_inter_type);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -707,7 +707,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
 			h5count[0] = buf_size/blk_size;
 		    } /* end else */
 		    hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-			    h5start, h5stride, h5count, h5block); 
+			    h5start, h5stride, h5count, h5block);
 		    VRFY((hrc >= 0), "H5Sselect_hyperslab");
 		} /* end if */
 		else {
@@ -757,7 +757,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
 			h5count[1] = 1;
 		    } /* end else */
 		    hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-			    h5start, h5stride, h5count, h5block); 
+			    h5start, h5stride, h5count, h5block);
 		    VRFY((hrc >= 0), "H5Sselect_hyperslab");
 		} /* end if */
 		else {
@@ -959,7 +959,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
 			    /* Set the base of user's buffer */
 			    buf_p = (unsigned char *)buffer;
 
-			    /* Set the number of bytes to transfer this time */						
+			    /* Set the number of bytes to transfer this time */
 			    nbytes_toxfer = buf_size*blk_size;
 
 			    /* Compute file offset */
@@ -995,7 +995,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
 			    /* Set the base of user's buffer */
 			    buf_p=(unsigned char *)buffer;
 
-			    /* Set the number of bytes to transfer this time */						
+			    /* Set the number of bytes to transfer this time */
 			    nbytes_toxfer=buf_size*blk_size;
 
 			    /* Compute file offset */
@@ -1522,7 +1522,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
 			&contig_cont);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
 
-		/* Build contiguous file's derived type */				
+		/* Build contiguous file's derived type */
 		mrc = MPI_Type_vector((int)blk_size, (int)1, (int)(snbytes/buf_size),
 			contig_cont, &mpi_cont_type);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -1536,7 +1536,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
 			&contig_inter);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
 
-		/* Build interleaved file's derived type */				
+		/* Build interleaved file's derived type */
 		mrc = MPI_Type_vector((int)buf_size, (int)1, (int)(snbytes/blk_size),
 			contig_inter, &mpi_inter_type);
 		VRFY((mrc==MPI_SUCCESS), "MPIO_TYPE_CREATE");
@@ -1572,7 +1572,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
 			h5count[0] = buf_size/blk_size;
 		    } /* end else */
 		    hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-			    h5start, h5stride, h5count, h5block); 
+			    h5start, h5stride, h5count, h5block);
 		    VRFY((hrc >= 0), "H5Sselect_hyperslab");
 		} /* end if */
 		else {
@@ -1622,7 +1622,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
 			h5count[1] = 1;
 		    } /* end else */
 		    hrc = H5Sselect_hyperslab(h5dset_space_id, H5S_SELECT_SET,
-			    h5start, h5stride, h5count, h5block); 
+			    h5start, h5stride, h5count, h5block);
 		    VRFY((hrc >= 0), "H5Sselect_hyperslab");
 		} /* end if */
 		else {
@@ -1783,7 +1783,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
 			    /* Set the base of user's buffer */
 			    buf_p = (unsigned char *)buffer;
 
-			    /* Set the number of bytes to transfer this time */						
+			    /* Set the number of bytes to transfer this time */
 			    nbytes_toxfer = buf_size*blk_size;
 
 			    /* Compute file offset */
@@ -1819,7 +1819,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
 			    /* Set the base of user's buffer */
 			    buf_p=(unsigned char *)buffer;
 
-			    /* Set the number of bytes to transfer this time */						
+			    /* Set the number of bytes to transfer this time */
 			    nbytes_toxfer=buf_size*blk_size;
 
 			    /* Compute file offset */
@@ -2303,7 +2303,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
 	    } /* end if */
 	    else {
 		/* Set the file driver to the MPI-I/O driver */
-		hrc = H5Pset_fapl_mpio(acc_tpl, pio_comm_g, h5_io_info_g);     
+		hrc = H5Pset_fapl_mpio(acc_tpl, pio_comm_g, h5_io_info_g);
 		if (hrc < 0) {
 		    fprintf(stderr, "HDF5 Property List Set failed\n");
 		    GOTOERROR(FAIL);
@@ -2338,7 +2338,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags)
 	    }
 
 	    break;
-    } 
+    }
 
 done:
     return ret_code;
diff --git a/perform/pio_perf.c b/perform/pio_perf.c
index f19afa7..2bb3a67 100644
--- a/perform/pio_perf.c
+++ b/perform/pio_perf.c
@@ -465,7 +465,7 @@ run_test_loop(struct options *opts)
 		    parms.num_bytes = (off_t)pow((double)(opts->num_bpp*parms.num_procs),2);
 		    if (parms.interleaved)
 			output_report("Transfer Buffer Size: %ldx%ld bytes, File size: %.2f MBs\n",
-				buf_size, opts->blk_size, 
+				buf_size, opts->blk_size,
 				((double)parms.num_dsets * (double)parms.num_bytes)
 				/ ONE_MB);
 		    else
@@ -669,7 +669,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
 	    get_minmax(&read_close_mm, t);
 
 	    read_close_mm_table[i] = read_close_mm;
-	    
+
         }
 
         pio_time_destroy(res.timers);
@@ -739,7 +739,7 @@ run_test(iotype iot, parameters parms, struct options *opts)
     }
 
 
-    
+
     if (!parms.h5_write_only) {
         /* Read statistics	*/
         /* Print the raw data throughput if desired */
@@ -1196,7 +1196,7 @@ report_parameters(struct options *opts)
         HDfprintf(output, "2D\n");
     else
         HDfprintf(output, "1D\n");
-	
+
     HDfprintf(output, "rank %d: VFL used for HDF5 I/O=", rank);
     if(opts->h5_use_mpi_posix)
         HDfprintf(output, "MPI-posix driver\n");
diff --git a/perform/pio_standalone.c b/perform/pio_standalone.c
index 33d2ccc..2ad0916 100644
--- a/perform/pio_standalone.c
+++ b/perform/pio_standalone.c
@@ -107,7 +107,7 @@ get_option(int argc, const char **argv, const char *opts, const struct long_opti
         opt_opt = argv[opt_ind][sp];
 
         if (opt_opt == ':' || (cp = strchr(opts, opt_opt)) == 0) {
-	        	                       
+
             if (opt_err)
                 HDfprintf(stderr, "%s: unknown option \"%c\"\n",
                         argv[0], opt_opt);
diff --git a/perform/pio_timer.c b/perform/pio_timer.c
index a528e5d..3d0cb3e 100644
--- a/perform/pio_timer.c
+++ b/perform/pio_timer.c
@@ -38,11 +38,11 @@
 /* global variables */
 pio_time   *timer_g;            /* timer: global for stub functions     */
 
-/* 
+/*
  * Function:  sub_time
  * Purpose:   Struct two time values, and return the difference, in microseconds
- * 
- * 	      Note that the function assumes that a > b 
+ *
+ * 	      Note that the function assumes that a > b
  * Programmer: Leon Arber, 1/27/06
  */
 static double sub_time(struct timeval* a, struct timeval* b)
@@ -145,7 +145,7 @@ set_time(pio_time *pt, timer_type t, int start_stop)
 
             } else {
                 pt->total_time[t] += MPI_Wtime() - pt->mpi_timer[t];
-		pt->mpi_timer[t] = MPI_Wtime(); 
+		pt->mpi_timer[t] = MPI_Wtime();
 
 		/* When we stop the timer for HDF5_GROSS_WRITE_FIXED_DIMS or HDF5_GROSS_READ_FIXED_DIMS
 		 * we compute the time it took to close the file after the last read/write finished */
@@ -165,7 +165,7 @@ set_time(pio_time *pt, timer_type t, int start_stop)
 		else if(t == HDF5_FINE_READ_FIXED_DIMS)
 		    pt->total_time[HDF5_FILE_READ_OPEN] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_GROSS_READ_FIXED_DIMS]));
 
-		
+
             } else {
                 struct timeval sys_t;
 
@@ -183,7 +183,7 @@ set_time(pio_time *pt, timer_type t, int start_stop)
 		    pt->total_time[HDF5_FILE_WRITE_CLOSE] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_FINE_WRITE_FIXED_DIMS]));
 		else if(t == HDF5_GROSS_READ_FIXED_DIMS)
 		    pt->total_time[HDF5_FILE_READ_CLOSE] += sub_time(&(pt->sys_timer[t]), &(pt->sys_timer[HDF5_FINE_READ_FIXED_DIMS]));
-	
+
             }
         }