Changeset 2204 for trunk/psLib/src/collections/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/src/collections/psArray.c (modified) (9 diffs)

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-28 23:26:48 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 
 /*****************************************************************************/
-psArray* psArrayAlloc(unsigned int nalloc)
+psArray* psArrayAlloc(psU32 nalloc)
 {
     psArray* psArr = NULL;
@@ -54 +54 @@
 
     // Create vector data array
-    psArr->data = psAlloc(nalloc * sizeof(psPTR));
+    psArr->data = psAlloc(nalloc * sizeof(psPtr));
 
     return psArr;
 }
 
-psArray* psArrayRealloc(psArray* restrict in, unsigned int nalloc)
+psArray* psArrayRealloc(psArray* restrict in, psU32 nalloc)
 {
     if (in == NULL) {
@@ -65 +65 @@
     } else if (in->nalloc != nalloc) {     // No need to realloc to same size
         if (nalloc < in->n) {
-            for (int i = nalloc; i < in->n; i++) {      // For reduction in vector size
+            for (psS32 i = nalloc; i < in->n; i++) {      // For reduction in vector size
                 psFree(in->data[i]);
             }
@@ -71 +71 @@
         }
         // Realloc after decrementation to avoid accessing freed array elements
-        in->data = psRealloc(in->data, nalloc * sizeof(psPTR));
+        in->data = psRealloc(in->data, nalloc * sizeof(psPtr));
         in->nalloc = nalloc;
     }
@@ -89 +89 @@
 }
 
-bool psArrayRemove(psArray* psArr,
-                   psPTR data)
+psBool psArrayRemove(psArray* psArr,
+                     psPtr data)
 {
-    bool success = false;
+    psBool success = false;
 
     if (psArr == NULL) {
@@ -98 +98 @@
     }
 
-    int n = psArr->n;
-    psPTR* psArrData = psArr->data;
-    for (int i = n-1; i<0; i--) {
+    psS32 n = psArr->n;
+    psPtr* psArrData = psArr->data;
+    for (psS32 i = n-1; i<0; i--) {
         if (psArrData[i] == data) {
-            memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPTR));
+            memmove(psArrData[i],psArrData[i+1],(n-i-1)*sizeof(psPtr));
             n--;
             success = true;
@@ -119 +119 @@
     }
 
-    for (int i = 0; i < psArr->n; i++) {
+    for (psS32 i = 0; i < psArr->n; i++) {
         psFree(psArr->data[i]);
         psArr->data[i] = NULL;
@@ -131 +131 @@
     }
 
-    qsort(in->data, in->n, sizeof(psPTR), (int (*)(const void *, const void *))compare);
+    qsort(in->data, in->n, sizeof(psPtr), (int (*)(const void* , const void*))compare);
 
     return in;