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

trunk/psLib/test/sysUtils/tst_psHash04.c

@@ -14 +14 @@
 }
 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);
 
@@ -26 +30 @@
     imGlobal++;
     psFree(id->name);
-    psFree(id);
 }
 
@@ -40 +43 @@
     psList *myLinkList = NULL;
     psListElem *tmp = NULL;
+    ID* id = NULL;
 
     printPositiveTestHeader(stdout,
@@ -48 +52 @@
     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++;
     }
@@ -59 +64 @@
     }
 
-    psListFree(myLinkList, NULL);
+    psFree(myLinkList);
 
     printFooter(stdout,
@@ -66 +71 @@
                 testStatus);
 
-    psHashFree(myHashTable, (void (*)(void *))IdFree);
+    psFree(myHashTable);
 
-    memLeaks = psMemCheckLeaks(currentId,NULL,NULL);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);