Changeset 164 for trunk/archive/pslib/src/Utils/array.c

Timestamp:

Mar 9, 2004, 2:34:28 PM (22 years ago)

Author:

rhl

Message:

Changed New/Del to Alloc/Free

File:

• trunk/archive/pslib/src/Utils/array.c (modified) (6 diffs)

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

@@ -10 +10 @@
 P_PS_CREATE_ARRAY_TYPE(static, my_, psVoidPtr);
 
-psVoidPtrArray *psVoidPtrArrayNew(int n, int s)
+psVoidPtrArray *psVoidPtrArrayAlloc(int n, int s)
 {
-    return my_psVoidPtrArrayNew(n, s);
+    return my_psVoidPtrArrayAlloc(n, s);
 }
 
@@ -20 +20 @@
 }
 
-void psVoidPtrArrayDel(psVoidPtrArray *arr,
-                       void (*elemDel)(void *)) // destructor for data on array
+void psVoidPtrArrayFree(psVoidPtrArray *arr,
+                        void (*elemFree)(void *)) // destructor for data on array
 {
     if (arr == NULL) {
@@ -28 +28 @@
         
     for (int i = 0; i < arr->n; i++) {
-        if (elemDel == NULL) {
+        if (elemFree == NULL) {
             psMemDecrRefCounter(arr->arr[i]);
         } else {
-            elemDel(psMemDecrRefCounter(arr->arr[i]));
+            elemFree(psMemDecrRefCounter(arr->arr[i]));
         }
     }
-    my_psVoidPtrArrayDel(arr);
+    my_psVoidPtrArrayFree(arr);
 }
 
@@ -44 +44 @@
 } psXY;
 
-psXY *psXYNew(void)
+psXY *psXYAlloc(void)
 {
     return psAlloc(sizeof(psXY));
 }
 
-void psXYDel(psXY *xy)
+void psXYFree(psXY *xy)
 {
     psFree(xy);
@@ -62 +62 @@
 int main(void)
 {
-    psXYArray *t = psXYArrayNew(10, 15);
-    psXYPtrArray *pt = psXYPtrArrayNew(10, 10);
+    psXYArray *t = psXYArrayAlloc(10, 15);
+    psXYPtrArray *pt = psXYPtrArrayAlloc(10, 10);
 
     for (int i = 0; i < t->n; i++) {
@@ -78 +78 @@
     printf("\n");
     
-    psXYArrayDel(t);
+    psXYArrayFree(t);
 
     psXY *xy = psMemDecrRefCounter(pt->arr[0]);
     pt->arr[0] = NULL;
-    psXYDel(xy);    
+    psXYFree(xy);    
     
-    psXYPtrArrayDel(pt);
+    psXYPtrArrayFree(pt);
 
     psMemCheckLeaks(0, NULL, stderr);