[svn-r5352]

Purpose:
    clean up warnings on windows
Description:
Solution:
Platforms tested:
linux 2.2.18, windows 2000

4 files changed, 10 insertions, 11 deletions

diff --git a/test/big.c b/test/big.c
index 9c0114b..710358d 100644
--- a/test/big.c
+++ b/test/big.c
@@ -83,7 +83,7 @@ is_sparse(void)
     if (lseek(fd, (off_t)(1024*1024), SEEK_SET)!=1024*1024) return 0;
     if (5!=write(fd, "hello", 5)) return 0;
     if (close(fd)<0) return 0;
-    if (stat("x.h5", &sb)<0) return 0;
+    if (HDstat("x.h5", &sb)<0) return 0;
     if (unlink("x.h5")<0) return 0;
 #ifdef H5_HAVE_STAT_ST_BLOCKS
     return ((unsigned long)sb.st_blocks*512 < (unsigned long)sb.st_size);
diff --git a/test/h5test.c b/test/h5test.c
index 2e18527..8750e32 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -395,7 +395,7 @@ h5_fixname(const char *base_name, hid_t fapl, char *fullname, size_t size)
                  * handled below. */
                 h5_stat_t buf;
 
-                if (stat(fullname, &buf) < 0)
+                if (HDstat(fullname, &buf) < 0)
                     /* The directory doesn't exist just yet */
                     if (HDmkdir(fullname, 0755) < 0 && errno != EEXIST)
                         /* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory.
diff --git a/test/th5s.c b/test/th5s.c
index f56a6b9..454e373 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -101,7 +101,8 @@ test_h5s_basic(void)
     sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
     CHECK(sid1, FAIL, "H5Screate_simple");
 
-    n = H5Sget_simple_extent_npoints(sid1);
+   
+    H5_ASSIGN_OVERFLOW(n,H5Sget_simple_extent_npoints(sid1),hsize_t,size_t);
     CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
     VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3,
 	   "H5Sget_simple_extent_npoints");
@@ -118,7 +119,7 @@ test_h5s_basic(void)
     sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2);
     CHECK(sid2, FAIL, "H5Screate_simple");
 
-    n = H5Sget_simple_extent_npoints(sid2);
+    H5_ASSIGN_OVERFLOW(n,H5Sget_simple_extent_npoints(sid2),hsize_t,size_t);    
     CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
     VERIFY(n, SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4,
 	   "H5Sget_simple_extent_npoints");
@@ -219,8 +220,7 @@ test_h5s_scalar_write(void)
     /* Create scalar dataspace */
     sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
     CHECK(sid1, FAIL, "H5Screate_simple");
-
-    n = H5Sget_simple_extent_npoints(sid1);
+    H5_ASSIGN_OVERFLOW(n,H5Sget_simple_extent_npoints(sid1),hsize_t,size_t);    
     CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
     VERIFY(n, 1, "H5Sget_simple_extent_npoints");
 
@@ -286,7 +286,7 @@ test_h5s_scalar_read(void)
     sid1=H5Dget_space(dataset);
     CHECK(sid1, FAIL, "H5Dget_space");
 
-    n = H5Sget_simple_extent_npoints(sid1);
+    H5_ASSIGN_OVERFLOW(n,H5Sget_simple_extent_npoints(sid1),hsize_t,size_t);    
     CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
     VERIFY(n, 1, "H5Sget_simple_extent_npoints");
 
@@ -363,7 +363,7 @@ test_h5s_compound_scalar_write(void)
     sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
     CHECK(sid1, FAIL, "H5Screate_simple");
 
-    n = H5Sget_simple_extent_npoints(sid1);
+    H5_ASSIGN_OVERFLOW(n,H5Sget_simple_extent_npoints(sid1),hsize_t,size_t);    
     CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
     VERIFY(n, 1, "H5Sget_simple_extent_npoints");
 
@@ -427,7 +427,7 @@ test_h5s_compound_scalar_read(void)
     sid1=H5Dget_space(dataset);
     CHECK(sid1, FAIL, "H5Dget_space");
 
-    n = H5Sget_simple_extent_npoints(sid1);
+    H5_ASSIGN_OVERFLOW(n,H5Sget_simple_extent_npoints(sid1),hsize_t,size_t);    
     CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
     VERIFY(n, 1, "H5Sget_simple_extent_npoints");
 
diff --git a/test/tvlstr.c b/test/tvlstr.c
index ff01fa1..b796248 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -235,10 +235,9 @@ test_vlstrings_basic(void)
 static void test_vlstring_type(void)
 {
     hid_t               fid;           /* HDF5 File IDs                */
-    hid_t		tid_vlstr, str;
+    hid_t		tid_vlstr;
     H5T_cset_t		cset;
     H5T_str_t		pad;
-    size_t		size;
     herr_t              ret;
 
     /* Output message about test being performed */