[svn-r13855] Purpose: Fixing minor warnings

Description:
    Removed unused names, mostly.

Platforms tested:
    SunOS 5.8 64-bit (sol)
    Linux 2.6 (kagiso) w/PGI

5 files changed, 3 insertions, 57 deletions

diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp
index a7bdeae..9051bf4 100644
--- a/c++/test/tfilter.cpp
+++ b/c++/test/tfilter.cpp
@@ -51,12 +51,13 @@
 #define FILTER_CHUNK_DIM2 25
 
 // will do this function later or use it as guideline - BMR - 2007/01/26
-static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl, 
+/*static herr_t test_filter_internal(hid_t fid, const char *name, hid_t dcpl, 
 		int if_fletcher32, int corrupted, hsize_t *dset_size)
 {
     cerr << "do nothing right now" << endl;
     return(0);
 }
+*/
 
 /* Temporary filter IDs used for testing */
 #define H5Z_FILTER_BOGUS        305
@@ -74,15 +75,6 @@ const H5Z_class_t H5Z_BOGUS[1] = {{
 #ifndef H5_WANT_H5_V1_4_COMPAT
 static herr_t can_apply_bogus(hid_t dcpl_id, hid_t type_id, hid_t space_id);
 
-/* This message derives from H5Z */
-const H5Z_class_t H5Z_CAN_APPLY_TEST[1] = {{
-    H5Z_FILTER_BOGUS,           /* Filter id number             */
-    "bogus",                    /* Filter name for debugging    */
-    can_apply_bogus,            /* The "can apply" callback     */
-    NULL,                       /* The "set local" callback     */
-    filter_bogus,               /* The actual filter function   */
-}};
-
 /*-------------------------------------------------------------------------
  * Function:    can_apply_bogus
  *
@@ -302,7 +294,6 @@ void test_filters(void)
     hid_t       fapl_id;
     fapl_id = h5_fileaccess(); // in h5test.c, returns a file access template
 
-    int         nerrors=0;      // keep track of number of failures occurr
     try
     {
         // Use the file access template id to create a file access prop. list
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index 61bfd8a..42ee6a2 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -74,7 +74,6 @@ unsigned space3_data=65;
 
 /* Scalar dataset with compound datatype */
 const H5std_string SPACE4_NAME("Scalar2");
-const int SPACE4_RANK = 0;
 const H5std_string SPACE4_FIELDNAME1("c1");
 const H5std_string SPACE4_FIELDNAME2("u");
 const H5std_string SPACE4_FIELDNAME3("f");
@@ -140,7 +139,7 @@ test_h5s_basic(void)
 	verify_val(rank, SPACE1_RANK, "DataSpace::getSimpleExtentNdims", __LINE__, __FILE__);
 
 	// Retrieves dimension size of dataspace sid1 and verify it
-	int ndims;		// Number of dimensions
+	int ndims;              // Number of dimensions
 	hsize_t	tdims[4];	// Dimension array to test with
 	ndims = sid1.getSimpleExtentDims( tdims );
 	verify_val(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0,
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index dea2691..b508ca7 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -59,17 +59,9 @@ const int SPACE1_DIM1 = 4;
 
 // 2-D dataset with fixed dimensions
 const H5std_string      SPACE2_NAME("Space2");
-const int SPACE2_RANK = 2;
-const int SPACE2_DIM1 = 10;
-const int SPACE2_DIM2 = 10;
 
 // Larger 1-D dataset with fixed dimensions
 const H5std_string      SPACE3_NAME("Space3");
-const int SPACE3_RANK = 1;
-const int SPACE3_DIM1 = 100;
-
-// Element selection information
-const int POINT1_NPOINTS = 10;
 
 // Compound datatype
 typedef struct s1_t {
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 25a1832..06ed367 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -106,13 +106,10 @@ static int noverflows_g = 0;
 #endif
 
 // Skip overflow tests if non-zero
-static int skip_overflow_tests_g = 0;
 
 // Don't use hardware conversions if set
-static int without_hardware_g = 0;
 
 // Count opaque conversions
-static int num_opaque_conversions_g = 0;
 
 /*
  * Although we check whether a floating point overflow generates a SIGFPE and
@@ -132,33 +129,6 @@ static int num_opaque_conversions_g = 0;
 
 
 /*-------------------------------------------------------------------------
- * Function:	fpe_handler
- *
- * Purpose:	Exit with 255
- *
- * Return:	void
- *
- * Programmer:	Robb Matzke
- *              Monday, July  6, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static void
-fpe_handler(int UNUSED signo)
-{
-    SKIPPED();
-    puts("    Test skipped due to SIGFPE.");
-#ifndef HANDLE_SIGFPE
-    puts("    Remaining tests could not be run.");
-    puts("    Please turn off SIGFPE on overflows and try again.");
-#endif
-    exit(255);
-}
-
-
-/*-------------------------------------------------------------------------
  * Function:	overflow_handler
  *
  * Purpose:	Gets called for all data type conversion overflows.
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index a93c5ef..b4a2667 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -51,11 +51,6 @@ const H5std_string      DATAFILE2("tvlstr2.h5");
 const int SPACE1_RANK = 1;
 const hsize_t SPACE1_DIM1 = 4;
 
-// 2-D dataset with fixed dimensions
-const int SPACE2_RANK = 2;
-const hsize_t SPACE2_DIM1 = 10;
-const hsize_t SPACE2_DIM2 = 10;
-
 const H5std_string      VLSTR_TYPE("vl_string_type");
 
 // Definitions for the VL re-writing test
@@ -505,7 +500,6 @@ test_compact_vlstring(void)
 **
 ****************************************************************/
 // String for testing attributes
-static const char *string_att = "This is the string for the attribute";
 static char *string_att_write=NULL;
 
 // Info for a string attribute