Changeset 1073 for trunk/psLib/test/sysUtils/tst_psHash03.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_psHash03.c (modified) (6 diffs)

trunk/psLib/test/sysUtils/tst_psHash03.c

@@ -19 +19 @@
 }
 ID;
+static void IdFree(ID *id);
 
 // NOTE: This is my own little routine I used in debugging a memory
@@ -48 +49 @@
 
     id = psAlloc(sizeof(ID));
+    p_psMemSetDeallocator(id,(psFreeFcn)IdFree);
 
     id->name = psStringCopy(name);
@@ -58 +60 @@
     imGlobal++;
     psFree(id->name);
-    psFree(id);
 }
 
@@ -82 +83 @@
     i = 0;
     while (myKeys[i] != NULL) {
-        psHashInsert(myHashTable, myKeys[i], IdAlloc(myData[i]),
-                     (void (*)(void *))IdFree);
+        psHashInsert(myHashTable, myKeys[i], IdAlloc(myData[i]));
         i++;
     }
@@ -101 +101 @@
     i = 0;
     while (myKeys[i] != NULL) {
-        id = psHashRemove(myHashTable, myKeys[i], (void (*)(void *))IdFree);
+        id = psHashRemove(myHashTable, myKeys[i]);
         // The psHashRemove() procedure removes the entry from the hash
         // table, but does not delete the data.  The following is necessary
         // to delete the data as well (which is returned from the call).
-        IdFree(id);
+        psFree(id);
         id = psHashLookup(myHashTable, myKeys[i]);
         if (id != NULL) {
@@ -119 +119 @@
                 testStatus);
 
-    psHashFree(myHashTable, (void (*)(void *))IdFree);
-    memLeaks = psMemCheckLeaks(currentId,NULL,NULL);
+    psFree(myHashTable);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stdout);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);