Changeset 164 for trunk/archive/pslib/src/Utils

Timestamp:

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

Author:

rhl

Message:

Changed New/Del to Alloc/Free

Location:

trunk/archive/pslib/src/Utils

Files:

• array.c (modified) (6 diffs)
• psArray.h (modified) (9 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);

trunk/archive/pslib/src/Utils/psArray.h

@@ -14 +14 @@
     } PS_CONCAT(TYPE, Array); \
     \
-PS_CONCAT(TYPE, Array) *PS_CONCAT3(TYPE,Array,New)(int n, int s); \
+PS_CONCAT(TYPE, Array) *PS_CONCAT3(TYPE,Array,Alloc)(int n, int s); \
 PS_CONCAT(TYPE, Array) *PS_CONCAT3(TYPE,Array,Realloc)(PS_CONCAT(TYPE, Array) *arr, int n); \
-void PS_CONCAT3(TYPE,Array,Del)(PS_CONCAT(TYPE, Array) *arr)
+void PS_CONCAT3(TYPE,Array,Free)(PS_CONCAT(TYPE, Array) *arr)
 
 /*****************************************************************************/
@@ -27 +27 @@
 #define P_PS_CREATE_ARRAY_TYPE(QUAL,PREFIX,TYPE) \
 \
-QUAL PS_CONCAT(TYPE, Array) *PS_CONCAT4(PREFIX,TYPE,Array,New)(int n, /* initial dimension */\
+QUAL PS_CONCAT(TYPE, Array) *PS_CONCAT4(PREFIX,TYPE,Array,Alloc)(int n, /* initial dimension */\
                                                    int s) /* initial number of elements */ \
 { \
@@ -33 +33 @@
     \
     if (n > s) { \
-        psLogMsg(PS_STRING(TYPE) "ArrayNew", PS_LOG_ERROR, "Too few elements requested in array (%d < %d)\n", s, n); \
+        psLogMsg(PS_STRING(TYPE) "ArrayAlloc", PS_LOG_ERROR, "Too few elements requested in array (%d < %d)\n", s, n); \
         s = n; \
     } \
@@ -52 +52 @@
 { \
     if (arr == NULL) { \
-        return PS_CONCAT4(PREFIX,TYPE,Array,New)(n, n); \
+        return PS_CONCAT4(PREFIX,TYPE,Array,Alloc)(n, n); \
     } \
     \
@@ -67 +67 @@
 } \
 \
-QUAL void PS_CONCAT4(PREFIX,TYPE,Array,Del)(PS_CONCAT(TYPE,Array) *arr) \
+QUAL void PS_CONCAT4(PREFIX,TYPE,Array,Free)(PS_CONCAT(TYPE,Array) *arr) \
 { \
     if (arr == NULL) { \
@@ -88 +88 @@
     P_PS_CREATE_ARRAY_TYPE(static, my_, P_PS_CONCAT(TYPE, Ptr)) \
     \
-    PS_CONCAT(TYPE, PtrArray) *PS_CONCAT3(TYPE,PtrArray,New)(int n, int s) \
+    PS_CONCAT(TYPE, PtrArray) *PS_CONCAT3(TYPE,PtrArray,Alloc)(int n, int s) \
     { \
-        PS_CONCAT(TYPE, PtrArray) *arr = PS_CONCAT4(my_,TYPE,PtrArray,New)(n, s); \
+        PS_CONCAT(TYPE, PtrArray) *arr = PS_CONCAT4(my_,TYPE,PtrArray,Alloc)(n, s); \
         for (int i = 0; i < arr->n; i++) { \
-            arr->arr[i] = psMemIncrRefCounter,(PS_CONCAT(TYPE, New)());\
+            arr->arr[i] = psMemIncrRefCounter,(PS_CONCAT(TYPE, Alloc)());\
         } \
         \
@@ -101 +101 @@
     { \
         for (int i = n; i < arr->n; i++) { \
-            PS_CONCAT(TYPE, Del)(psMemDecrRefCounter(arr->arr[i]));\
+            PS_CONCAT(TYPE, Free)(psMemDecrRefCounter(arr->arr[i]));\
         } \
         \
@@ -107 +107 @@
     } \
     \
-    void PS_CONCAT3(TYPE,PtrArray,Del)(PS_CONCAT2(TYPE,PtrArray) *arr) \
+    void PS_CONCAT3(TYPE,PtrArray,Free)(PS_CONCAT2(TYPE,PtrArray) *arr) \
     { \
         if (arr == NULL) { return; } \
         for (int i = 0; i < arr->size; i++) { \
-            PS_CONCAT(TYPE, Del)(psMemDecrRefCounter(arr->arr[i])); \
+            PS_CONCAT(TYPE, Free)(psMemDecrRefCounter(arr->arr[i])); \
         } \
-        PS_CONCAT4(my_, TYPE, PtrArray, Del)(arr); \
+        PS_CONCAT4(my_, TYPE, PtrArray, Free)(arr); \
     }
 
@@ -129 +129 @@
 } psVoidPtrArray;
 
-psVoidPtrArray *psVoidPtrArrayNew(int n, int s);
+psVoidPtrArray *psVoidPtrArrayAlloc(int n, int s);
 psVoidPtrArray *psVoidPtrArrayRealloc(psVoidPtrArray *arr, int n);
-void psVoidPtrArrayDel(psVoidPtrArray *arr,
-                       void (*elemDel)(void *)); // destructor for array data
+void psVoidPtrArrayFree(psVoidPtrArray *arr,
+                        void (*elemFree)(void *)); // destructor for array data