[svn-r28636] merge from trunk.

9 files changed, 11 insertions, 11 deletions

diff --git a/tools/misc/vds/UC_1.h b/tools/misc/vds/UC_1.h
index 29df72b..24299d4 100644
--- a/tools/misc/vds/UC_1.h
+++ b/tools/misc/vds/UC_1.h
@@ -136,7 +136,7 @@ static char UC_1_SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
 static char UC_1_VDS_DSET_NAME[NAME_LEN]    = "vds_dset";
 
 /* Fill values */
-static hsize_t UC_1_FILL_VALUES[UC_1_N_SOURCES] = {
+static int UC_1_FILL_VALUES[UC_1_N_SOURCES] = {
     -1,
     -2,
     -3,
diff --git a/tools/misc/vds/UC_1_one_dim_gen.c b/tools/misc/vds/UC_1_one_dim_gen.c
index a78268b..ee56622 100644
--- a/tools/misc/vds/UC_1_one_dim_gen.c
+++ b/tools/misc/vds/UC_1_one_dim_gen.c
@@ -29,7 +29,7 @@
 
 
 int
-main(int argc, char *argv[])
+main(void)
 {
     hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
     hid_t src_dcplid    = -1;   /* source dataset property list ID          */
diff --git a/tools/misc/vds/UC_2.h b/tools/misc/vds/UC_2.h
index 3e4e4fd..8b9f19a 100644
--- a/tools/misc/vds/UC_2.h
+++ b/tools/misc/vds/UC_2.h
@@ -138,7 +138,7 @@ static char UC_2_FILE_NAMES[UC_2_N_SOURCES][NAME_LEN] = {
 #define UC_2_VDS_DSET_NAME      "vds_dset"
 
 /* Fill values */
-static hsize_t UC_2_FILL_VALUES[UC_2_N_SOURCES] = {
+static int UC_2_FILL_VALUES[UC_2_N_SOURCES] = {
     -1,
     -2,
     -3,
diff --git a/tools/misc/vds/UC_2_two_dims_gen.c b/tools/misc/vds/UC_2_two_dims_gen.c
index b5fd319..c3dfa65 100644
--- a/tools/misc/vds/UC_2_two_dims_gen.c
+++ b/tools/misc/vds/UC_2_two_dims_gen.c
@@ -28,7 +28,7 @@
 #include "UC_2.h"
 
 int
-main(int argc, char *argv[])
+main(void)
 {
     hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
     hid_t src_dcplid    = -1;   /* source dataset property list ID          */
diff --git a/tools/misc/vds/UC_3_gaps_gen.c b/tools/misc/vds/UC_3_gaps_gen.c
index 1f150c1..7cb208b 100644
--- a/tools/misc/vds/UC_3_gaps_gen.c
+++ b/tools/misc/vds/UC_3_gaps_gen.c
@@ -28,7 +28,7 @@
 #include "UC_3.h"
 
 /* Create the VDS that uses use case 1 files */
-herr_t
+static herr_t
 create_3_1_vds(void)
 {
     hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
@@ -135,7 +135,7 @@ error:
 } /* end create_3_1_vds() */
 
 /* Create the VDS that uses use case 2 files */
-herr_t
+static herr_t
 create_3_2_vds(void)
 {
     hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
@@ -236,7 +236,7 @@ error:
 } /* end create_3_2_vds() */
 
 int
-main(int argc, char *argv[])
+main(void)
 {
 
     if(create_3_1_vds() < 0)
diff --git a/tools/misc/vds/UC_4.h b/tools/misc/vds/UC_4.h
index ce74e63..bfcafed 100644
--- a/tools/misc/vds/UC_4.h
+++ b/tools/misc/vds/UC_4.h
@@ -74,7 +74,7 @@ static char UC_4_SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
 static char UC_4_VDS_DSET_NAME[NAME_LEN]    = "vds_dset";
 
 /* Fill values */
-static hsize_t UC_4_FILL_VALUES[UC_4_N_SOURCES] = {
+static int UC_4_FILL_VALUES[UC_4_N_SOURCES] = {
     -1,
     -2,
     -3
diff --git a/tools/misc/vds/UC_4_printf_gen.c b/tools/misc/vds/UC_4_printf_gen.c
index c8e111a..c0bb6b5 100644
--- a/tools/misc/vds/UC_4_printf_gen.c
+++ b/tools/misc/vds/UC_4_printf_gen.c
@@ -27,7 +27,7 @@
 #include "UC_4.h"
 
 int
-main(int argc, char *argv[])
+main(void)
 {
     hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
     hid_t src_dcplid    = -1;   /* source dataset property list ID          */
diff --git a/tools/misc/vds/UC_5.h b/tools/misc/vds/UC_5.h
index b22b177..96b2af3 100644
--- a/tools/misc/vds/UC_5.h
+++ b/tools/misc/vds/UC_5.h
@@ -72,7 +72,7 @@ static char UC_5_SOURCE_DSET_PATH[NAME_LEN] = "/source_dset";
 static char UC_5_VDS_DSET_NAME[NAME_LEN]    = "vds_dset";
 
 /* Fill values */
-static hsize_t UC_5_FILL_VALUES[UC_5_N_SOURCES] = {
+static int UC_5_FILL_VALUES[UC_5_N_SOURCES] = {
     -1,
     -2,
     -3
diff --git a/tools/misc/vds/UC_5_stride_gen.c b/tools/misc/vds/UC_5_stride_gen.c
index 984aadc..9fa4908 100644
--- a/tools/misc/vds/UC_5_stride_gen.c
+++ b/tools/misc/vds/UC_5_stride_gen.c
@@ -27,7 +27,7 @@
 #include "UC_5.h"
 
 int
-main(int argc, char *argv[])
+main(void)
 {
     hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
     hid_t src_dcplid    = -1;   /* source dataset property list ID          */