[svn-r12829] Description:

    Clean up more compiler warnings, esp. on Linux/64 platform.

Tested on:
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)

1 files changed, 22 insertions, 22 deletions

diff --git a/test/tskiplist.c b/test/tskiplist.c
index 5b54dbd..cea7983 100644
--- a/test/tskiplist.c
+++ b/test/tskiplist.c
@@ -69,7 +69,7 @@ test_skiplist_init(void)
     size_t u,v;         /* Local index variables */
 
     /* Initialize random number seed */
-    curr_time=time(NULL);
+    curr_time = HDtime(NULL);
     HDsrandom((unsigned long)curr_time);
 
     /* Create randomized set of numbers */
@@ -95,13 +95,13 @@ test_skiplist_init(void)
     HDmemcpy(sort_rand_num,rand_num,sizeof(int)*NUM_ELEMS);
 
     /* Sort random numbers */
-    HDqsort(sort_rand_num,NUM_ELEMS,sizeof(int),tst_sort);
+    HDqsort(sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_sort);
 
     /* Copy random values to reverse sorted array */
-    HDmemcpy(rev_sort_rand_num,rand_num,sizeof(int)*NUM_ELEMS);
+    HDmemcpy(rev_sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS);
 
     /* Sort random numbers */
-    HDqsort(rev_sort_rand_num,NUM_ELEMS,sizeof(int),tst_rev_sort);
+    HDqsort(rev_sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_rev_sort);
 } /* end test_tst_init() */
 
 /****************************************************************
@@ -120,7 +120,7 @@ test_skiplist_create(void)
     MESSAGE(6, ("Testing Creating & Closing Skip Lists\n"));
 
     /* Try creating a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5,16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Try closing the skip list */
@@ -150,7 +150,7 @@ test_skiplist_insert(void)
     MESSAGE(7, ("Testing Insertion Into Skip List\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -211,7 +211,7 @@ test_skiplist_insert_many(void)
     MESSAGE(7, ("Testing Insertion of Many Items Into Skip List\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -285,7 +285,7 @@ test_skiplist_remove(void)
     MESSAGE(7, ("Testing Removal From Skip List\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -364,7 +364,7 @@ test_skiplist_remove_many(void)
     MESSAGE(7, ("Testing Removal of Many Items From Skip List\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -464,7 +464,7 @@ test_skiplist_firstnext(void)
     MESSAGE(7, ("Testing Iterating Over Skip List With First/Next\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -556,7 +556,7 @@ test_skiplist_string(void)
     MESSAGE(7, ("Testing Skip List With String Keys\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_STR, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_STR, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -618,7 +618,7 @@ test_skiplist_iterate(void)
     MESSAGE(7, ("Testing Iterating Over Skip List\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -668,7 +668,7 @@ test_skiplist_hsize(void)
     MESSAGE(7, ("Testing Skip List With hsize_t Keys\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_HSIZE, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_HSIZE, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -723,7 +723,7 @@ test_skiplist_unsigned(void)
     MESSAGE(7, ("Testing Skip List With unsigned Keys\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -776,7 +776,7 @@ test_skiplist_lastprev(void)
     MESSAGE(7, ("Testing Iterating Over Skip List With Last/Prev\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Check that the skip list has no elements */
@@ -844,7 +844,7 @@ test_skiplist_find(void)
     MESSAGE(7, ("Testing Skip List 'Find' Operation\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */
@@ -900,7 +900,7 @@ test_skiplist_add(void)
     MESSAGE(7, ("Testing Skip List 'Add' Operation\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */
@@ -962,7 +962,7 @@ test_skiplist_destroy(void)
     MESSAGE(7, ("Testing Skip List 'Destroy' Operation\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */
@@ -998,7 +998,7 @@ test_skiplist_free(void)
     MESSAGE(7, ("Testing Skip List 'Free' Operation\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_INT, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_INT, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */
@@ -1054,7 +1054,7 @@ test_skiplist_less(void)
     MESSAGE(7, ("Testing Skip List 'Less' Operation\n"));
 
     /* Create a skip list */
-    slist=H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */
@@ -1118,7 +1118,7 @@ test_skiplist_greater(void)
     MESSAGE(7, ("Testing Skip List 'Greater' Operation\n"));
 
     /* Create a skip list */
-    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */
@@ -1181,7 +1181,7 @@ test_skiplist_remove_first(void)
     MESSAGE(7, ("Testing Skip List 'Greater' Operation\n"));
 
     /* Create a skip list */
-    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, 16);
+    slist = H5SL_create(H5SL_TYPE_UNSIGNED, 0.5, (size_t)16);
     CHECK(slist, NULL, "H5SL_create");
 
     /* Insert objects into the skip list */