[svn-r18032] Description:

	Bring r18031 from trunk to 1.8 branch:

	Bring r18030 from merge_metadata_journaling branch to trunk:

	Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.

	Also, some other minor cleanups along the way.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
	(h5committested on trunk)

2 files changed, 19 insertions, 18 deletions

diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index aa6a7ed..55f421c 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -1427,7 +1427,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
             success = FALSE;
             if ( verbose ) {
                 HDfprintf(stdout,
-                          "%d:%s: data[i].len = %d != mssg->len = %d.\n",
+                          "%d:%s: data[i].len = %Zu != mssg->len = %d.\n",
                            world_mpi_rank, fcn_name,
                            data[target_index].len, mssg_ptr->len);
             }
@@ -1439,7 +1439,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
                 HDfprintf(stdout,
                   "%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n",
                          world_mpi_rank, fcn_name,
-                         mssg_ptr->src, target_index,
+                         mssg_ptr->src, 
 			target_index,
 			data[target_index].base_addr);
             }
@@ -1604,7 +1604,7 @@ serve_write_request(struct mssg_t * mssg_ptr)
             success = FALSE;
             if ( verbose ) {
                 HDfprintf(stdout,
-                          "%d:%s: data[i].len = %d != mssg->len = %d.\n",
+                          "%d:%s: data[i].len = %Zu != mssg->len = %d.\n",
                           world_mpi_rank, fcn_name,
                           data[target_index].len, mssg_ptr->len);
             }
@@ -3552,9 +3552,11 @@ setup_rand(void)
             }
         } else {
             seed = (unsigned)tv.tv_usec;
-	    HDfprintf(stdout, "%d:%s: seed = %d.\n",
-                      world_mpi_rank, fcn_name, seed);
-	    fflush(stdout);
+            if ( verbose ) {
+                HDfprintf(stdout, "%d:%s: seed = %d.\n",
+                          world_mpi_rank, fcn_name, seed);
+                fflush(stdout);
+            }
             HDsrand(seed);
         }
     }
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c
index 0773b93..ebe5c38 100644
--- a/testpar/t_pflush1.c
+++ b/testpar/t_pflush1.c
@@ -157,12 +157,11 @@ main(int argc, char* argv[])
 	    PASSED();
 	fflush(stdout);
 	fflush(stderr);
-    }
-    else
-    {
+    } /* end if */
+    else {
         SKIPPED();
         puts("    Test not compatible with current Virtual File Driver");
-    }
+    } /* end else */
 
     /*
      * Some systems like Linux with mpich, if you just _exit without MPI_Finalize
@@ -176,23 +175,23 @@ main(int argc, char* argv[])
      */
 
     /* close file1 */
-    if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0){
+    if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0) {
 	printf("H5Fget_vfd_handle for file1 failed\n");
 	goto error;
-    }
-    if(MPI_File_close(mpifh_p)!=MPI_SUCCESS){
+    } /* end if */
+    if(MPI_File_close(mpifh_p) != MPI_SUCCESS) {
 	printf("MPI_File_close for file1 failed\n");
 	goto error;
-    }
+    } /* end if */
     /* close file2 */
-    if(H5Fget_vfd_handle(file2, fapl, (void **)&mpifh_p) < 0){
+    if(H5Fget_vfd_handle(file2, fapl, (void **)&mpifh_p) < 0) {
 	printf("H5Fget_vfd_handle for file2 failed\n");
 	goto error;
-    }
-    if(MPI_File_close(mpifh_p)!=MPI_SUCCESS){
+    } /* end if */
+    if(MPI_File_close(mpifh_p) != MPI_SUCCESS) {
 	printf("MPI_File_close for file2 failed\n");
 	goto error;
-    }
+    } /* end if */
 
     fflush(stdout);
     fflush(stderr);