Changeset 2204 for trunk/psLib/test/collections/tst_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/test/collections/tst_psList.c (modified) (49 diffs)

trunk/psLib/test/collections/tst_psList.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 02:24:59 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 
 
-static int testListAlloc(void);
-static int testListAdd(void);
-static int testListGet(void);
-static int testListRemove(void);
-static int testListConvert(void);
-static int testListIterator(void);
-static int testListFree(void);
-static int testListSort(void);
+static psS32 testListAlloc(void);
+static psS32 testListAdd(void);
+static psS32 testListGet(void);
+static psS32 testListRemove(void);
+static psS32 testListConvert(void);
+static psS32 testListIterator(void);
+static psS32 testListFree(void);
+static psS32 testListSort(void);
 
 testDescription tests[] = {
@@ -39 +39 @@
                           };
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
@@ -50 +50 @@
 }
 
-int testListAlloc(void)
+psS32 testListAlloc(void)
 {
     psList* list;
-    int ref;
+    psS32 ref;
     float* data;
 
@@ -117 +117 @@
 }
 
-int testListAdd(void)
+psS32 testListAdd(void)
 {
     psList* list = NULL;
-    int* data = NULL;
+    psS32* data = NULL;
 
     psLogMsg(__func__,PS_LOG_INFO,"psListAdd shall add an element to list");
@@ -134 +134 @@
     */
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 1;
 
@@ -161 +161 @@
 
     //  3. where is PS_LIST_HEAD or PS_LIST_TAIL
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 2;
     if ( ! psListAdd(list,PS_LIST_HEAD,data) ) {
@@ -181 +181 @@
 
     // verify that the head is the inserted data item
-    if (*(int*)list->head->data != 2) {
+    if (*(psS32*)list->head->data != 2) {
         psError(__func__,"psListAdd with PS_LIST_HEAD didn't insert at the head.");
         return 5;
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 3;
     if ( ! psListAdd(list,PS_LIST_TAIL,data) ) {
@@ -205 +205 @@
 
     // verify that the head is still the same
-    if (*(int*)list->head->data != 2) {
+    if (*(psS32*)list->head->data != 2) {
         psError(__func__,"psListAdd with PS_LIST_TAIL modified the head.");
         return 7;
@@ -211 +211 @@
 
     // verify that the tail is the data item inserted
-    if (*(int*)list->tail->data != 3) {
+    if (*(psS32*)list->tail->data != 3) {
         psError(__func__,"psListAdd with PS_LIST_TAIL didn't insert at the tail.");
         return 8;
@@ -218 +218 @@
     // 4. where is not PS_LIST_* but <0
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 4;
     psLogMsg(__func__,PS_LOG_INFO,"Following should error with invalid insert location");
@@ -239 +239 @@
 
     // 5. where is >0
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 5;
 
@@ -253 +253 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 4 || *(int*)list->head->next->data != 5) {
+    if (list->size != 4 || *(psS32*)list->head->next->data != 5) {
         printListInt(list);
         psError(__func__,"psListAdd didn't insert to position #1.");
@@ -259 +259 @@
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 6;
     if ( ! psListAdd(list,3,data) ) {
@@ -271 +271 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 5  || *(int *)list->head->next->next->next->data != 6) {
+    if (list->size != 5  || *(psS32 *)list->head->next->next->next->data != 6) {
         printListInt(list);
         psError(__func__,"psListAdd didn't insert to position #4.");
@@ -277 +277 @@
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 7;
     if ( ! psListAdd(list,2,data) ) {
@@ -289 +289 @@
     psFree(data);
     // verify that the size incremented
-    if (list->size != 6  || *(int *)list->head->next->next->data != 7) {
+    if (list->size != 6  || *(psS32 *)list->head->next->next->data != 7) {
         printListInt(list);
         psError(__func__,"psListAdd didn't insert to position #2.");
@@ -295 +295 @@
     }
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 7;
     psLogMsg(__func__,PS_LOG_INFO,"Following should be a warning.");
@@ -325 +325 @@
 void printListInt(psList* list)
 {
-    int* data = NULL;
-    bool first = true;
+    psS32* data = NULL;
+    psBool first = true;
 
     psListSetIterator(list,PS_LIST_HEAD);
@@ -333 +333 @@
     while ( data != NULL ) {
         if (!first) {
-            printf(", %d",*(int*)data);
+            printf(", %d",*(psS32*)data);
         } else {
-            printf("%d",*(int*)data);
+            printf("%d",*(psS32*)data);
             first = false;
         }
@@ -345 +345 @@
 
 
-int testListGet(void)
+psS32 testListGet(void)
 {
     psList* list = NULL;
-    int* data;
+    psS32* data;
 
     /*
@@ -371 +371 @@
 
     // create a list
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 0;
     list = psListAlloc(data);
     psFree(data);
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 1;
     psListAdd(list,PS_LIST_TAIL,data);
     psFree(data);
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 2;
     psListAdd(list,PS_LIST_TAIL,data);
     psFree(data);
 
-    data = psAlloc(sizeof(int));
+    data = psAlloc(sizeof(psS32));
     *data = 3;
     psListAdd(list,PS_LIST_TAIL,data);
@@ -392 +392 @@
 
     //  2. which>0 and which<list.n.
-    data = (int*)psListGet(list,3);
+    data = (psS32*)psListGet(list,3);
     if (data == NULL || *data != 3) {
         psError(__func__,"psListGet failed with which=3");
         return 2;
     }
-    data = (int*)psListGet(list,1);
+    data = (psS32*)psListGet(list,1);
     if (data == NULL || *data != 1) {
         psError(__func__,"psListGet failed with which=1");
@@ -404 +404 @@
 
     //  3. which>=list.n.
-    data = (int*)psListGet(list,5);
+    data = (psS32*)psListGet(list,5);
     if (data != NULL) {
         psError(__func__,"psListGet failed with which=5");
         return 4;
     }
-    data = (int*)psListGet(list,4);
+    data = (psS32*)psListGet(list,4);
     if (data != NULL) {
         psError(__func__,"psListGet failed with which=4");
@@ -416 +416 @@
 
     //  4. which=PS_LIST_HEAD
-    data = (int*)psListGet(list,PS_LIST_HEAD);
+    data = (psS32*)psListGet(list,PS_LIST_HEAD);
     if (data == NULL || *data != 0) {
         psError(__func__,"psListGet failed with which=PS_LIST_HEAD");
@@ -423 +423 @@
 
     //  5. which=PS_LIST_NEXT
-    data = (int*)psListGet(list,PS_LIST_NEXT);
+    data = (psS32*)psListGet(list,PS_LIST_NEXT);
     if (data == NULL || *data != 1) {
         psError(__func__,"psListGet failed with which=PS_LIST_NEXT");
@@ -430 +430 @@
 
     //  6. which=PS_LIST_TAIL
-    data = (int*)psListGet(list,PS_LIST_TAIL);
+    data = (psS32*)psListGet(list,PS_LIST_TAIL);
     if (data == NULL || *data != 3) {
         psError(__func__,"psListGet failed with which=PS_LIST_TAIL");
@@ -437 +437 @@
 
     //  7. which=PS_LIST_PREV
-    data = (int*)psListGet(list,PS_LIST_PREVIOUS);
+    data = (psS32*)psListGet(list,PS_LIST_PREVIOUS);
     if (data == NULL || *data != 2) {
         psError(__func__,"psListGet failed with which=PS_LIST_PREV");
@@ -448 +448 @@
 }
 
-int testListRemove(void)
+psS32 testListRemove(void)
 {
     psList* list = NULL;
-    int* data;
+    psS32* data;
 
     /*
@@ -480 +480 @@
     list = psListAlloc(NULL);
 
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         psListAdd(list,PS_LIST_TAIL,data);
@@ -682 +682 @@
 }
 
-int testListConvert(void)
+psS32 testListConvert(void)
 {
 
     psList* list = NULL;
     psArray* arr = NULL;
-    int* data;
+    psS32* data;
 
     /*
         array=psListToArray(list) shall take each element of the list, increment
-        their reference, and insert them into the returned fresh void* array.
+        their reference, and insert them into the returned fresh psPtr array.
         The list shall not be changed, except for the element reference increment.
     */
@@ -699 +699 @@
     // create a list
     list = psListAlloc(NULL);
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         psListAdd(list,PS_LIST_TAIL,data);
@@ -712 +712 @@
         return 1;
     }
-    for (int i=0;i<arr->n;i++) {
-        if (i != *(int*)arr->data[i]) {
+    for (psS32 i=0;i<arr->n;i++) {
+        if (i != *(psS32*)arr->data[i]) {
             psError(__func__,"Element %d of array is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
-        if (i != *(int*)psListGet(list,i)) {
+        if (i != *(psS32*)psListGet(list,i)) {
             psError(__func__,"Element %d of list is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
@@ -738 +738 @@
     arr = psArrayAlloc(15);
     arr->n = arr->nalloc;
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         arr->data[lcv] = data;
@@ -750 +750 @@
         return 1;
     }
-    for (int i=0;i<arr->n;i++) {
-        if (i != *(int*)arr->data[i]) {
+    for (psS32 i=0;i<arr->n;i++) {
+        if (i != *(psS32*)arr->data[i]) {
             psError(__func__,"Element %d of array is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
-        if (i != *(int*)psListGet(list,i)) {
+        if (i != *(psS32*)psListGet(list,i)) {
             psError(__func__,"Element %d of list is incorrect (%d).",
-                    i,*(int*)arr->data[i]);
+                    i,*(psS32*)arr->data[i]);
             return 1;
         }
@@ -810 +810 @@
 }
 
-int testListIterator(void)
+psS32 testListIterator(void)
 {
     psList* list = NULL;
-    int* data;
+    psS32* data;
 
     psLogMsg(__func__,PS_LOG_INFO," psListSetIterator/psListGetNext/psListGetPrev"
@@ -837 +837 @@
     // create a list
     list = psListAlloc(NULL);
-    for (int lcv=0;lcv<15;lcv++) {
-        data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data = psAlloc(sizeof(psS32));
         *data = lcv;
         psListAdd(list,PS_LIST_TAIL,data);
@@ -852 +852 @@
     // 3. set list.cursor to list.tail if where=PS_LIST_TAIL
     psListSetIterator(list,PS_LIST_TAIL);
-    if (*(int*)psListGetCurrent(list) != 14) {
+    if (*(psS32*)psListGetCurrent(list) != 14) {
         psError(__func__,"Didn't successfully move cursor to tail.");
         return 1;
@@ -859 +859 @@
     // 2. set list.cursor to list.head if where=PS_LIST_HEAD
     psListSetIterator(list,PS_LIST_HEAD);
-    if (*(int*)psListGetCurrent(list) != 0) {
+    if (*(psS32*)psListGetCurrent(list) != 0) {
         psError(__func__,"Didn't successfully move cursor to head.");
         return 2;
@@ -866 +866 @@
     // 4. set list.cursor to list.cursor->next if where=PS_LIST_NEXT
     psListSetIterator(list,PS_LIST_NEXT);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"Didn't successfully move cursor to next.");
         return 3;
     }
     psListSetIterator(list,PS_LIST_NEXT);
-    if (*(int*)psListGetCurrent(list) != 2) {
+    if (*(psS32*)psListGetCurrent(list) != 2) {
         psError(__func__,"Didn't successfully move cursor to next twice.");
         return 4;
@@ -878 +878 @@
     // 5. set list.cursor to list.cursor->prev if where=PS_LIST_PREV
     psListSetIterator(list,PS_LIST_PREVIOUS);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"Didn't successfully move cursor to previous.");
         return 5;
     }
     psListSetIterator(list,PS_LIST_PREVIOUS);
-    if (*(int*)psListGetCurrent(list) != 0) {
+    if (*(psS32*)psListGetCurrent(list) != 0) {
         psError(__func__,"Didn't successfully move cursor to previous twice.");
         return 6;
@@ -892 +892 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should error with 'Can't move to an unknown position.'");
     psListSetIterator(list,PS_LIST_UNKNOWN);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"PS_LIST_UNKNOWN moved cursor.");
         return 7;
     }
     psListSetIterator(list,PS_LIST_CURRENT);
-    if (*(int*)psListGetCurrent(list) != 1) {
+    if (*(psS32*)psListGetCurrent(list) != 1) {
         psError(__func__,"PS_LIST_CURRENT moved cursor.");
         return 8;
@@ -903 +903 @@
 
     // test psListGetPrevious/Next
-    if (*(int*)psListGetNext(list) != 2) {
+    if (*(psS32*)psListGetNext(list) != 2) {
         psError(__func__,"psListGetNext didn't move cursor to next.");
         return 9;
     }
-    if (*(int*)psListGetNext(list) != 3) {
+    if (*(psS32*)psListGetNext(list) != 3) {
         psError(__func__,"psListGetNext didn't move cursor to next.");
         return 10;
     }
-    if (*(int*)psListGetPrevious(list) != 2) {
+    if (*(psS32*)psListGetPrevious(list) != 2) {
         psError(__func__,"psListGetPrevious didn't move cursor to previous.");
         return 11;
     }
-    if (*(int*)psListGetPrevious(list) != 1) {
+    if (*(psS32*)psListGetPrevious(list) != 1) {
         psError(__func__,"psListGetPrevious didn't move cursor to previous.");
         return 12;
     }
-    if (*(int*)psListGetPrevious(list) != 0) {
+    if (*(psS32*)psListGetPrevious(list) != 0) {
         psError(__func__,"psListGetPrevious didn't move cursor to previous..");
         return 13;
@@ -939 +939 @@
 }
 
-int testListFree(void)
+psS32 testListFree(void)
 {
     float* data[15];
@@ -954 +954 @@
 
     list = psListAlloc(NULL);
-    for (int lcv=0;lcv<15;lcv++) {
-        data[lcv] = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        data[lcv] = psAlloc(sizeof(psS32));
         *data[lcv] = lcv;
         psListAdd(list,PS_LIST_TAIL,data[lcv]);
@@ -987 +987 @@
     */
 
-    for (int i=0;i<15;i++) {
+    for (psS32 i=0;i<15;i++) {
         if (psMemGetRefCounter(data[i]) != 1) {
             psError(__func__,"pslistFree didn't decrement the data item's reference counter");
@@ -998 +998 @@
 }
 
-int testListSort(void)
+psS32 testListSort(void)
 {
     psList* list;
@@ -1004 +1004 @@
     list = psListAlloc(NULL);
 
-    for (int lcv=0;lcv<15;lcv++) {
-        float* data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        float* data = psAlloc(sizeof(psS32));
         if (lcv < 7) {
             *data = 13-lcv*2;
@@ -1070 +1070 @@
     list = psListAlloc(NULL);
 
-    for (int lcv=0;lcv<15;lcv++) {
-        psU32* data = psAlloc(sizeof(int));
+    for (psS32 lcv=0;lcv<15;lcv++) {
+        psU32* data = psAlloc(sizeof(psS32));
         if (lcv < 7) {
             *data = 13-lcv*2;