Changeset 707 for trunk/archive/pslib/src/Utils/dlist.c

Timestamp:

May 17, 2004, 7:53:16 AM (22 years ago)

Author:

rhl

Message:

Updated to match APIs in include/*.h

File:

• trunk/archive/pslib/src/Utils/dlist.c (modified) (3 diffs)

trunk/archive/pslib/src/Utils/dlist.c

@@ -307 +307 @@
  * Convert a psDlist to/from a psVoidPtrArray
  */
-psVoidPtrArray *psDlistToArray(psDlist *restrict dlist)
+psVector *psDlistToArray(psDlist *restrict dlist)
 {
     if (dlist == NULL) {
@@ -313 +313 @@
     }
     
-    psVoidPtrArray *restrict arr = psVoidPtrArrayAlloc(dlist->n);
+    psVector *restrict arr = psVectorAlloc(dlist->n, PS_TYPE_OTHER);
 
     psDlistElem *ptr = dlist->head;
     for (int i = 0, n = dlist->n; i < n; i++) {
-        arr->arr[i] = ptr->data;
+        arr->arr.arr_v[i] = ptr->data;
 
         ptr->data = NULL;
@@ -328 +328 @@
 }
 
-psDlist *psArrayToDlist(psVoidPtrArray *arr)
+psDlist *psArrayToDlist(psVector *arr)
 {
     psDlist *list = psDlistAlloc(NULL); // list of elements
 
+    assert (arr != NULL);
+    if (arr->n > 0) {
+       assert (arr->type.dimen == PS_DIMEN_VECTOR && arr->type.type == PS_TYPE_OTHER);
+    }
+    
     for (int i = 0, n = arr->n; i < n; i++) {
         psDlistAppend(list,
-                      psMemDecrRefCounter(arr->arr[i])); // it's already Incr
-        arr->arr[i] = NULL;
-    }
-
-    psVoidPtrArrayFree(arr, NULL);
+                      psMemDecrRefCounter(arr->arr.arr_v[i])); // it\'s already Incr
+        arr->arr.arr_v[i] = NULL;
+    }
+
+    psVectorFree(arr, NULL);
 
     return list;