[svn-r8783] Purpose:

    Code cleanup

Description:
    Clean up almost all warnings from Windows builds.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

3 files changed, 6 insertions, 5 deletions

diff --git a/test/dsets.c b/test/dsets.c
index 09587f5..af96dc5 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -801,7 +801,7 @@ test_conv_buffer(hid_t fid)
 		cf->a[j][k][l] = 10*(j+1) + l + k;
 
     for (j = 0; j < DIM2; j++)
-	cf->b[j] = 100.*(j+1) + 0.01*j;
+	cf->b[j] = (float)(100.*(j+1) + 0.01*j);
 	
     for (j = 0; j < DIM3; j++)
 	cf->c[j] = 100.*(j+1) + 0.02*j;
@@ -3060,9 +3060,10 @@ test_set_local(hid_t fapl)
     h5_fixname(FILENAME[5], fapl, filename, sizeof filename);
     
     /* Initialize the integer & floating-point dataset */
-    for (i = n = 0; i < DSET_DIM1; i++)
+    n=0.0;
+    for (i = 0; i < DSET_DIM1; i++)
 	for (j = 0; j < DSET_DIM2; j++) {
-	    points[i][j] = n++;
+	    points[i][j] = (int)n++;
 	    points_dbl[i][j] = (double)1.5*n++;
 	}
 
diff --git a/test/h5test.c b/test/h5test.c
index d344e0b..7c69e70 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -773,7 +773,7 @@ h5_get_file_size(const char *filename)
 
     /* Get the file's statistics */
     if (HDstat(filename, &sb)>=0)
-        return(sb.st_size);
+        return((off_t)sb.st_size);
 
     return(0);
 } /* end get_file_size() */
diff --git a/test/ntypes.c b/test/ntypes.c
index 0e767a7..f4d3337 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -1577,7 +1577,7 @@ test_vl_dtype(hid_t file)
             tmp=malloc(t2->len*sizeof(unsigned int));
             memcpy(tmp, t2->p, t2->len*H5Tget_size(nat_super_type));
 
-            if (H5Tconvert(nat_super_type, H5T_NATIVE_UINT, (hsize_t)t2->len, tmp, NULL, H5P_DEFAULT))
+            if (H5Tconvert(nat_super_type, H5T_NATIVE_UINT, t2->len, tmp, NULL, H5P_DEFAULT))
                 TEST_ERROR;
 
             for(k=0; k<t2->len; k++) {