[svn-r18650] Description:

	Bring back various minor tweaks & cleanups from the revise_chunks
branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

8 files changed, 14 insertions, 12 deletions

diff --git a/tools/h5copy/h5copygentest.c b/tools/h5copy/h5copygentest.c
index 42bc3cd..b6346de 100644
--- a/tools/h5copy/h5copygentest.c
+++ b/tools/h5copy/h5copygentest.c
@@ -528,7 +528,6 @@ static herr_t gen_region_ref(hid_t loc_id)
     char  data[3][16] = {"The quick brown", "fox jumps over ", "the 5 lazy dogs"};
     hsize_t dims2[2] = {3,16};
     hsize_t coords[4][2] = { {0,1}, {2,11}, {1,0}, {2,4} };
-
     hdset_reg_ref_t  rr_data[2];
     hsize_t start[2] = {0,0};
     hsize_t stride[2] = {2,11};
diff --git a/tools/h5copy/testh5copy.sh b/tools/h5copy/testh5copy.sh
index 31104dd..3f24bdf 100644
--- a/tools/h5copy/testh5copy.sh
+++ b/tools/h5copy/testh5copy.sh
@@ -261,6 +261,7 @@ COPY_OBJECTS()
     # Remove any output file left over from previous test run
     rm -f $FILEOUT
 
+    echo "Testing from `basename $TESTFILE` to `basename $FILEOUT` for the following tests:"
     echo "Test copying various forms of datasets"
     TOOLTEST -i $TESTFILE -o $FILEOUT -v -s simple     -d simple
     TOOLTEST -i $TESTFILE -o $FILEOUT -v -s chunk      -d chunk
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index f8c7d11..45aa53c 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -105,6 +105,8 @@
 
 /* utility functions */
 static int
+make_dset(hid_t loc_id, const char *name, hid_t sid, hid_t tid, hid_t dcpl, void *buf);
+static int
 write_attr(hid_t loc_id, int rank, hsize_t *dims, const char *attr_name,
                 hid_t tid, void *buf);
 static int
@@ -382,7 +384,6 @@ gent_dataset2(void)
     H5Fclose(fid);
 }
 
-
 static void
 gent_attribute(void)
 {
@@ -2957,7 +2958,6 @@ static void gent_array8(void)
     hsize_t sdims[] = {F64_DIM0};
     hsize_t tdims[] = {F64_DIM1};
     int         wdata[(F64_DIM1) * sizeof(int)];      /* Write buffer */
-    int         ndims;
     int     i;
 
     /*
@@ -6502,7 +6502,7 @@ gent_fs_strategy_threshold(void)
  fcpl = H5Pcreate(H5P_FILE_CREATE);
 
  /* Set file space information */
- H5Pset_file_space(fcpl, STRATEGY, THRESHOLD10);
+ H5Pset_file_space(fcpl, STRATEGY, (hsize_t)THRESHOLD10);
 
  /* Create the file with the specified strategy and threshold */
  fid = H5Fcreate(FILE66, H5F_ACC_TRUNC, fcpl, H5P_DEFAULT);
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index 96b8369..8d10a57 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -96,7 +96,7 @@ h5repack_init(pack_opt_t *options, int verbose, H5F_file_space_type_t strategy,
     int k, n;
     memset(options,0,sizeof(pack_opt_t));
     options->min_comp = 1024;
-    options->verbose   = verbose;
+    options->verbose  = verbose;
 
     for ( n = 0; n < H5_REPACK_MAX_NFILTERS; n++)
     {
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 78bae25..a95c4c4 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -108,7 +108,7 @@ int main(int argc, const char **argv)
     int           ret=-1;
 
     /* initialize options  */
-    h5repack_init (&options, 0, 0, (hsize_t)0);
+    h5repack_init(&options, 0, 0, (hsize_t)0);
 
     parse_command_line(argc, argv, &options);
 
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index f4abff5..74c901f 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -321,7 +321,7 @@ int main (void)
         GOERROR;
     if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
         GOERROR;
-    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options) <= 0)
         GOERROR;
     if (h5repack_end (&pack_options) < 0)
         GOERROR;
@@ -611,7 +611,7 @@ int main (void)
         GOERROR;
     if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
         GOERROR;
-    if (h5repack_verify(FNAME4, FNAME4OUT,&pack_options)<=0)
+    if (h5repack_verify(FNAME4, FNAME4OUT, &pack_options )<= 0)
         GOERROR;
     if (h5repack_end (&pack_options) < 0)
         GOERROR;
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 87f7b41..be74d21 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -955,7 +955,6 @@ print_file_info(const iter_t *iter)
     return 0;
 } /* print_file_info() */
 
-
 
 /*-------------------------------------------------------------------------
  * Function: print_group_info
@@ -1331,18 +1330,20 @@ print_storage_summary(const iter_t *iter)
 static herr_t
 print_file_metadata(const iter_t *iter)
 {
-    printf("File space information for file metadata (in bytes):\n");
+    HDfprintf(stdout, "File space information for file metadata (in bytes):\n");
     HDfprintf(stdout, "\tSuperblock: %Hu\n", iter->super_size);
     HDfprintf(stdout, "\tSuperblock extension: %Hu\n", iter->super_ext_size);
     HDfprintf(stdout, "\tUser block: %Hu\n", iter->ublk_size);
 
     HDfprintf(stdout, "\tObject headers: (total/unused)\n");
-    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
+    HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n",
+                iter->group_ohdr_info.total_size,
 		iter->group_ohdr_info.free_size);
     HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
 		iter->dset_ohdr_info.total_size,
 		iter->dset_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
+    HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n",
+                iter->dtype_ohdr_info.total_size,
 		iter->dtype_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tGroups:\n");
diff --git a/tools/h5stat/testh5stat.sh.in b/tools/h5stat/testh5stat.sh.in
index 591471e..0ecb4ce 100644
--- a/tools/h5stat/testh5stat.sh.in
+++ b/tools/h5stat/testh5stat.sh.in
@@ -141,3 +141,4 @@ else
     echo "$TESTNAME tests failed with $nerrors errors."
     exit $EXIT_FAILURE
 fi
+