[svn-r24994] Purpose: Removed some warnings

Description:
    Turned on warnings and removed some of those.
Platforms tested:
    Linux/ppc64 (ostrich)
    Linux/32 2.6 (jam)
    SunOS 5.11 (emu)

4 files changed, 26 insertions, 6 deletions

diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 6824403..d1ced1d 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -312,10 +312,14 @@ test_datasize(FileAccPropList &fapl)
 	// Get the dimension sizes.
 	hsize_t dims[2];
 	int n_dims = space.getSimpleExtentDims(dims);
+	if (n_dims < 0)
+	{
+	    throw Exception("test_compression", "DataSpace::getSimpleExtentDims() failed");
+	}
 
 	// Calculate the supposed size.  Size of each value is int (4), from
 	// test_simple_io.
-	int expected_size = 4 * dims[0] * dims[1];
+	size_t expected_size = 4 * dims[0] * dims[1];
 
 	// getInMemDataSize() returns the in memory size of the data.
 	size_t ds_size = dset.getInMemDataSize();
diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h
index bea08d3..8625213 100644
--- a/c++/test/h5cpputil.h
+++ b/c++/test/h5cpputil.h
@@ -115,6 +115,19 @@ template <class Type1, class Type2>
     }
 }
 
+template <class Type1, class Type2>
+    void CHECK(Type1 x, Type2 value, const char* msg, int line, const char* file_name)
+{
+    if (x == value)
+    {
+	cerr << endl;
+        cerr << "*** Function " << msg << " FAILED at line " << line << endl;
+	IncTestNumErrs();
+	throw TestFailedException(file_name, msg);
+    }
+}
+
+
 /* Prototypes for the test routines */
 #ifdef __cplusplus
 extern "C" {
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index aa412d9..9abdd83 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -292,7 +292,8 @@ static void test_attr_getname()
 	HDmemset(fattr1_name, 0, buf_size+1);
 	ssize_t name_size = 0; // actual length of attribute name
 	name_size = fattr1.getName(fattr1_name, buf_size+1);
-	verify_val(name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__);
+	CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
+	verify_val((size_t)name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__);
 	verify_val((const char*)fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
 	delete []fattr1_name;
 
@@ -303,7 +304,8 @@ static void test_attr_getname()
 	fattr1_name = new char[buf_size+1];
 	HDmemset(fattr1_name, 0, buf_size+1);
 	name_size = fattr1.getName(fattr1_name, buf_size+1);
-	verify_val(name_size, FATTR1_NAME.length(), "Attribute::getName", __LINE__, __FILE__);
+	CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
+	verify_val((size_t)name_size, FATTR1_NAME.size(), "Attribute::getName", __LINE__, __FILE__);
 	verify_val((const char*)fattr1_name, (const char*)short_name, "Attribute::getName", __LINE__, __FILE__);
 	delete []fattr1_name;
 
@@ -312,6 +314,7 @@ static void test_attr_getname()
 	fattr1_name = new char[buf_size+1];
 	HDmemset(fattr1_name, 0, buf_size+1);
 	name_size = fattr1.getName(fattr1_name, buf_size+1);
+	CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
 	verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
 	delete []fattr1_name;
 
@@ -609,7 +612,7 @@ static void test_attr_compound_read()
     size_t      size;   // Attribute datatype size as stored in file
     size_t      offset; // Attribute datatype field offset
     struct attr4_struct read_data4[ATTR4_DIM1][ATTR4_DIM2]; // Buffer for reading 4th attribute
-    int     i,j;
+    hsize_t i,j;
 
     // Output message about test being performed
     SUBTEST("Basic Attribute Functions");
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 3258253..156f438 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -793,7 +793,7 @@ static void test_compound_set_size()
 
 	// Verify setSize() actually set size
 	size_t new_size = dtype.getSize();
-	verify_val(new_size, 33, "DataType::getSize", __LINE__, __FILE__);
+	verify_val(new_size, (size_t)33, "DataType::getSize", __LINE__, __FILE__);
 
 	// Shrink the type, and verify that it became packed
 	dtype.setSize((size_t)32);
@@ -802,7 +802,7 @@ static void test_compound_set_size()
 
 	// Verify setSize() actually set size again
 	new_size = dtype.getSize();
-	verify_val(new_size, 32, "DataType::getSize", __LINE__, __FILE__);
+	verify_val(new_size, (size_t)32, "DataType::getSize", __LINE__, __FILE__);
 
 	/* Close types and file */
 	dtype_tmp.close();