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

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-14 20:01:52 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -13 +13 @@
 
 #include <stdlib.h>
-#include <stdbool.h>
 #include <stdio.h>
 #include <pthread.h>                       // we need a mutex to make this stuff thread safe.
@@ -26 +25 @@
 #include "psCollectionsErrors.h"
 
-#define ITER_INIT_HEAD ((void *)1)         // next iteration should return head
-#define ITER_INIT_TAIL ((void *)2)         // next iteration should return tail
+#define ITER_INIT_HEAD ((psPtr )1)         // next iteration should return head
+#define ITER_INIT_TAIL ((psPtr )2)         // next iteration should return tail
 
 // private functions.
 static psListElem* listGetIterator(psList* list);
-static int listGetIteratorIndex(psList* list);
-static void listSetIterator(psList* list, int where, bool lockList);
+static psS32 listGetIteratorIndex(psList* list);
+static void listSetIterator(psList* list, psS32 where, psBool lockList);
 static void listFree(psList* list);
 
-psList* psListAlloc(void *data)
+psList* psListAlloc(psPtr data)
 {
     psList* list = psAlloc(sizeof(psList));
@@ -82 +81 @@
 }
 
-bool psListAdd(psList* list, int location, void *data)
+psBool psListAdd(psList* list, psS32 location, psPtr data)
 {
     psListElem* position;
     psListElem* elem;
-    int cursorIndex = 0;
+    psS32 cursorIndex = 0;
 
     if (list == NULL) {
@@ -168 +167 @@
  * Remove an element from a list
  */
-bool psListRemove(psList* list, int location, void *data)
+psBool psListRemove(psList* list, psS32 location, psPtr data)
 {
     psListElem* elem = NULL;    // element to remove
-    int cursorIndex = 0;
+    psS32 cursorIndex = 0;
 
     if (list == NULL) {
@@ -184 +183 @@
         // search list for the data item.
 
-        int i = 0;              // index
+        psS32 i = 0;              // index
 
         for (psListElem* ptr = list->head; ptr != NULL; ptr = ptr->next) {
@@ -247 +246 @@
 }
 
-void psListSetIterator(psList* list, int where)
+void psListSetIterator(psList* list, psS32 where)
 {
     listSetIterator(list, where, true);
 }
 
-static void listSetIterator(psList* list, int where, bool lockList)
+static void listSetIterator(psList* list, psS32 where, psBool lockList)
 {
     psListElem* cursor;
-    int position;
+    psS32 position;
 
     if (list == NULL) {
@@ -272 +271 @@
     }
 
-    if (where >= (int)list->size) {
+    if (where >= (psS32)list->size) {
         list->iter = NULL;
         if (lockList) {
@@ -323 +322 @@
             }
 
-            int position = listGetIteratorIndex(list);
+            psS32 position = listGetIteratorIndex(list);
 
             if (where < position) {
-                int diff = position - where;
-
-                for (int count = 0; count < diff; count++) {
+                psS32 diff = position - where;
+
+                for (psS32 count = 0; count < diff; count++) {
                     listSetIterator(list, PS_LIST_PREVIOUS, false);
                 }
             } else {
-                int diff = where - position;
-
-                for (int count = 0; count < diff; count++) {
+                psS32 diff = where - position;
+
+                for (psS32 count = 0; count < diff; count++) {
                     listSetIterator(list, PS_LIST_NEXT, false);
                 }
@@ -363 +362 @@
 }
 
-int listGetIteratorIndex(psList* list)
+psS32 listGetIteratorIndex(psList* list)
 {
     if (list->iter == ITER_INIT_HEAD) {
@@ -374 +373 @@
 }
 
-void *psListGet(psList* list, int location)
+psPtr psListGet(psList* list, psS32 location)
 {
     psListElem* element;
@@ -391 +390 @@
  * and now return the previous/next element of the list
  */
-void *psListGetNext(psList* list)
+psPtr psListGetNext(psList* list)
 {
     return psListGet(list, PS_LIST_NEXT);
 }
 
-void *psListGetPrevious(psList* list)
+psPtr psListGetPrevious(psList* list)
 {
     return psListGet(list, PS_LIST_PREVIOUS);
 }
 
-void *psListGetCurrent(psList* list)
+psPtr psListGetCurrent(psList* list)
 {
     return psListGet(list, PS_LIST_CURRENT);
@@ -412 +411 @@
 {
     psListElem* ptr;
-    unsigned int n;
+    psU32 n;
     psArray* restrict arr;
 
@@ -429 +428 @@
     ptr = list->head;
     n = list->size;
-    for (int i = 0; i < n; i++) {
+    for (psS32 i = 0; i < n; i++) {
         arr->data[i] = psMemIncrRefCounter(ptr->data);
         ptr = ptr->next;
@@ -439 +438 @@
 psList* psArrayToList(psArray* arr)
 {
-    unsigned int n;
+    psU32 n;
     psList* list;               // list of elements
 
@@ -448 +447 @@
     list = psListAlloc(NULL);
     n = arr->n;
-    for (int i = 0; i < n; i++) {
+    for (psS32 i = 0; i < n; i++) {
         psListAdd(list, PS_LIST_TAIL, arr->data[i]);
     }