more fix and address comments

4 files changed, 8 insertions, 30 deletions

diff --git a/test/page_buffer.c b/test/page_buffer.c
index f6ce4a7..1172ae7 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -38,9 +38,6 @@
 
 
 #define FILENAME_LEN            1024
-#define NUM_DSETS               5
-#define NX                      100
-#define NY                      50
 
 /* helper routines */
 #ifndef H5_HAVE_PARALLEL
@@ -65,6 +62,7 @@ const char *FILENAME[] = {
     NULL
 };
 
+#ifndef H5_HAVE_PARALLEL
 
 /*-------------------------------------------------------------------------
  * Function:    create_file()
@@ -299,6 +297,7 @@ error:
     } H5E_END_TRY;
     return 1;
 }
+#endif
 
 /*
  *
@@ -360,6 +359,7 @@ error:
 
 } /* set_multi_split() */
 
+#ifndef H5_HAVE_PARALLEL
 
 /*-------------------------------------------------------------------------
  * Function:    test_args()
@@ -383,7 +383,6 @@ error:
  *-------------------------------------------------------------------------
  */
 
-#ifndef H5_HAVE_PARALLEL
 static unsigned
 test_args(hid_t orig_fapl, const char *env_h5_drvr)
 {
@@ -538,7 +537,6 @@ error:
     } H5E_END_TRY;
     return 1;
 } /* test_args */
-#endif
 
 
 /*-------------------------------------------------------------------------
@@ -571,7 +569,6 @@ error:
  */
 
 /* Changes due to file space page size has a minimum size of 512 */
-#ifndef H5_HAVE_PARALLEL
 static unsigned
 test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr)
 {
@@ -817,7 +814,6 @@ error:
     } H5E_END_TRY;
     return 1;
 } /* test_raw_data_handling */
-#endif
 
 
 /*-------------------------------------------------------------------------
@@ -850,7 +846,6 @@ error:
  *-------------------------------------------------------------------------
  */
 
-#ifndef H5_HAVE_PARALLEL
 static unsigned
 test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr)
 {
@@ -1072,7 +1067,6 @@ error:
     } H5E_END_TRY;
     return 1;
 } /* test_lru_processing */
-#endif
 
 
 /*-------------------------------------------------------------------------
@@ -1106,7 +1100,6 @@ error:
  *-------------------------------------------------------------------------
  */
 
-#ifndef H5_HAVE_PARALLEL
 static unsigned
 test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr)
 {
@@ -1710,7 +1703,6 @@ error:
     return 1;
 
 } /* test_min_threshold */
-#endif
 
 
 /*-------------------------------------------------------------------------
@@ -1743,7 +1735,6 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-#ifndef H5_HAVE_PARALLEL
 static unsigned
 test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr)
 {
diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c
index abbfbb3..c12cf5a 100644
--- a/testpar/t_shapesame.c
+++ b/testpar/t_shapesame.c
@@ -1981,7 +1981,6 @@ contig_hs_dr_pio_test__run_test(const int test_num,
 #if CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     const char *fcnName = "contig_hs_dr_pio_test__run_test()";
 #endif /* CONTIG_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
-    int        mpi_rank;
     struct hs_dr_pio_test_vars_t test_vars =
     {
         /* int           mpi_size                        = */ -1,
@@ -2049,9 +2048,6 @@ contig_hs_dr_pio_test__run_test(const int test_num,
                           small_rank, large_rank, use_collective_io,
                           dset_type, express_test, tv_ptr);
 
-    /* initialize the local copy of mpi_rank */
-    mpi_rank = tv_ptr->mpi_rank;
-
     /* initialize skips & max_skips */
     tv_ptr->skips = *skips_ptr;
     tv_ptr->max_skips = max_skips;
@@ -3520,7 +3516,6 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t * tv_ptr)
     const char *fcnName = "ckrbrd_hs_dr_pio_test__m2d_l2s()";
 #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG */
     hbool_t    data_ok = FALSE;
-    hbool_t    mis_match = FALSE;
     int        i, j, k, l;
     size_t      u;
     size_t      start_index;
@@ -3768,8 +3763,6 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t * tv_ptr)
 
                     /* verify that expected data is retrieved */
 
-                    mis_match = FALSE;
-
                     expected_value = (uint32_t)(
                 (i * tv_ptr->edge_size * tv_ptr->edge_size *
                                  tv_ptr->edge_size * tv_ptr->edge_size) +
@@ -3878,7 +3871,6 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t * tv_ptr)
     const char *fcnName = "ckrbrd_hs_dr_pio_test__m2d_s2l()";
 #endif /* CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG */
     hbool_t    data_ok = FALSE;
-    hbool_t    mis_match = FALSE;
     int        i, j, k, l;
     size_t      u;
     size_t      start_index;
@@ -4138,8 +4130,6 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t * tv_ptr)
                     HDassert( stop_index < tv_ptr->large_ds_size );
 
 
-                    mis_match = FALSE;
-
                     data_ok = TRUE;
 
                     ptr_1 = tv_ptr->large_ds_buf_1;
@@ -4235,7 +4225,6 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num,
 #if CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG
     const char *fcnName = "ckrbrd_hs_dr_pio_test__run_test()";
 #endif /* CKRBRD_HS_DR_PIO_TEST__RUN_TEST__DEBUG */
-    int        mpi_rank; /* needed by VRFY */
     struct hs_dr_pio_test_vars_t test_vars =
     {
         /* int           mpi_size                        = */ -1,
@@ -4305,10 +4294,6 @@ ckrbrd_hs_dr_pio_test__run_test(const int test_num,
                           tv_ptr);
 
 
-    /* initialize the local copy of mpi_rank */
-    mpi_rank = tv_ptr->mpi_rank;
-
-
     /* initialize skips & max_skips */
     tv_ptr->skips = *skips_ptr;
     tv_ptr->max_skips = max_skips;
diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c
index 65ee03d..da6d343 100644
--- a/testpar/t_span_tree.c
+++ b/testpar/t_span_tree.c
@@ -1560,7 +1560,9 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size,
     size_t        small_ds_size;
     size_t        small_ds_slice_size;
     size_t        large_ds_size;
+#if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
     size_t        large_ds_slice_size;
+#endif
     uint32_t      expected_value;
     uint32_t    * small_ds_buf_0 = NULL;
     uint32_t    * small_ds_buf_1 = NULL;
@@ -1614,9 +1616,10 @@ lower_dim_size_comp_test__run_test(const int chunk_edge_size,
     small_ds_size       = (size_t)((mpi_size + 1) *  1 *  1 * 10 * 10);
     small_ds_slice_size = (size_t)                 ( 1 *  1 * 10 * 10);
     large_ds_size       = (size_t)((mpi_size + 1) * 10 * 10 * 10 * 10);
-    large_ds_slice_size = (size_t)                 (10 * 10 * 10 * 10);
 
 #if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG
+    large_ds_slice_size = (size_t)                 (10 * 10 * 10 * 10);
+
     if ( mpi_rank == LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK ) {
         HDfprintf(stdout, "%s:%d: small ds size / slice size = %d / %d.\n",
                   fcnName, mpi_rank,
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index c2153e5..03d7941 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -274,14 +274,13 @@ build_match_list (const char *objname1, trav_info_t *info1, const char *objname2
     int      cmp;
     trav_table_t *table = NULL;
     size_t   idx;
-    int      ret_value = 0;
 
     h5difftrace("build_match_list start\n");
     /* init */
     trav_table_init(&table);
     if (table == NULL) {
         H5TOOLS_INFO(H5E_tools_min_id_g, "Cannot create traverse table");
-        HGOTO_DONE(-1);
+        goto done;
     }
     /*
      * This is necessary for the case that given objects are group and