Changeset 2204 for trunk/psLib/test/collections/tst_psArray.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/collections/tst_psArray.c (modified) (9 diffs)

trunk/psLib/test/collections/tst_psArray.c

@@ -12 +12 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-09-28 23:26:49 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 typedef struct
 {
-    int x;
+    psS32 x;
     float y;
 }
@@ -32 +32 @@
 
 
-int main(int argc,
-         char* argv[])
+psS32 main(psS32 argc,
+           char* argv[])
 {
     // Create array of pointers
@@ -51 +51 @@
     // Test B - Add data to void pointer array
     printPositiveTestHeader(stdout, "psArray", "Add data to void pointer array");
-    for(int i = 0; i < 5; i++) {
+    for(psS32 i = 0; i < 5; i++) {
         testStruct *ts = psAlloc(sizeof(testStruct));
         ts->x = 10*i;
@@ -60 +60 @@
     }
 
-    for(int i = 0; i < 5; i++) {
+    for(psS32 i = 0; i < 5; i++) {
         testStruct *ts = (testStruct*)psArr->data[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
@@ -85 +85 @@
     psArr = psArrayRealloc(psArr,10);
     printf("Adding more elements to void pointer array...\n");
-    for(int i = 5; i < 10; i++) {
+    for(psS32 i = 5; i < 10; i++) {
         testStruct *ts = psAlloc(sizeof(testStruct));
         ts->x = 10*i;
@@ -94 +94 @@
         psMemIncrRefCounter(ts);
     }
-    for(int i = 0; i < 10; i++) {
+    for(psS32 i = 0; i < 10; i++) {
         testStruct *ts = (testStruct*)psArr->data[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
@@ -118 +118 @@
     printPositiveTestHeader(stdout,"psArray","Reallocate void pointer array smaller");
     psArr = psArrayRealloc(psArr,3);
-    for(int i = 0; i < 3; i++) {
+    for(psS32 i = 0; i < 3; i++) {
         testStruct *ts = (testStruct*)psArr->data[i];
         printf("ts[%d].x = %d ts[%d].y = %.2f\n", i, ts->x, i, ts->y);
@@ -142 +142 @@
     printPositiveTestHeader(stdout, "psArray", "Free void pointer array");
     psFree(psArr);
-    for(int i = 0; i < 10; i++) {
+    for(psS32 i = 0; i < 10; i++) {
         psFree(mySt[i]);
     }
     psMemCheckLeaks(0, NULL, stdout);
-    int nBad = psMemCheckCorruption(0);
+    psS32 nBad = psMemCheckCorruption(0);
     if(nBad) {
         printf("ERROR: Found %d bad memory blocks\n", nBad);