Changeset 1073 for trunk/psLib/test/sysUtils/tst_psHash02.c

Timestamp:

Jun 23, 2004, 1:00:17 PM (22 years ago)

Author:

desonia

Message:

Changed the means of deallocation of memory. ps_Alloc now registers an optional free function to handle any additional processing of a memory object.

File:

• trunk/psLib/test/sysUtils/tst_psHash02.c (modified) (4 diffs)

trunk/psLib/test/sysUtils/tst_psHash02.c

@@ -19 +19 @@
 }
 ID;
+static void IdFree(ID *id);
+
 static ID *IdAlloc(const char *name)
 {
     ID *id = psAlloc(sizeof(ID));
+    p_psMemSetDeallocator(id,(psFreeFcn)IdFree);
     id->name = psStringCopy(name);
 
@@ -31 +34 @@
     imGlobal++;
     psFree(id->name);
-    psFree(id);
 }
 
@@ -52 +54 @@
     i = 0;
     while (myKeys[i] != NULL) {
-        psHashInsert(myHashTable, myKeys[i], IdAlloc(myData[i]),
-                     (void (*)(void *))IdFree);
+        id = IdAlloc(myData[i]);
+        psHashInsert(myHashTable, myKeys[i], id);
+        psFree(id);
         i++;
     }
@@ -78 +81 @@
 
     //    psHashFree(myHashTable, NULL);
-    psHashFree(myHashTable, (void (*)(void *))IdFree);
+    psFree(myHashTable);
 
     memLeaks = psMemCheckLeaks(currentId,NULL,NULL);