[svn-r26458] Purpose: Fix warnings HDFFV-8658

Description:
    Fixed many type conversion warnings and unused variables.
Platforms tested:
    Linux/64 (platypus)
    Linux/32 2.6 (jam)
    SunOS 5.11 (emu)

1 files changed, 7 insertions, 5 deletions

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index fc0ea3a..e5c8bf0 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -56,11 +56,14 @@ const H5std_string	DSET_TCONV_NAME	("tconv");
 const H5std_string	DSET_COMPRESS_NAME("compressed");
 const H5std_string	DSET_BOGUS_NAME	("bogus");
 
+/* Temporary filter IDs used for testing */
 const int H5Z_FILTER_BOGUS = 305;
 
-// Local prototypes
+#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead
 static size_t filter_bogus(unsigned int flags, size_t cd_nelmts,
     const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf);
+#endif
+static size_t filter_bogus(size_t nbytes);
 
 /*-------------------------------------------------------------------------
  * Function:	test_create
@@ -458,13 +461,12 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
  *-------------------------------------------------------------------------
  */
 static size_t
-/*bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
-      const unsigned int UNUSED cd_values[], size_t nbytes,
-      size_t UNUSED *buf_size, void UNUSED **buf)
-BMR: removed UNUSED for now until asking Q. or R. to pass compilation*/
+#if 0 // UNUSED variables caused warning, so duplicated below with NULL instead
 filter_bogus(unsigned int flags, size_t cd_nelmts,
       const unsigned int cd_values[], size_t nbytes,
       size_t *buf_size, void **buf)
+#endif
+filter_bogus(size_t nbytes)
 {
     return nbytes;
 }