Changeset 1073 for trunk/psLib/test/sysUtils/tst_psHash01.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_psHash01.c (modified) (4 diffs)

trunk/psLib/test/sysUtils/tst_psHash01.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);
 }
 
@@ -34 +37 @@
     int testStatus      = true;
     int currentId = psMemGetId();
+    ID* id = NULL;
     int memLeaks        = 0;
 
@@ -41 +45 @@
 
     myHashTable = psHashAlloc(NUM_HASH_TABLE_BUCKETS);
-    psHashInsert(myHashTable, "ENTRY00", IdAlloc("IDA"),
-                 (void (*)(void *))IdFree);
-    psHashInsert(myHashTable, "ENTRY01", IdAlloc("IDB"),
-                 (void (*)(void *))IdFree);
-    psHashInsert(myHashTable, "ENTRY02", IdAlloc("IDC"),
-                 (void (*)(void *))IdFree);
-    psHashInsert(myHashTable, "ENTRY03", IdAlloc("IDD"),
-                 (void (*)(void *))IdFree);
-    psHashFree(myHashTable, (void (*)(void *))IdFree);
+    id = IdAlloc("IDA");
+    psHashInsert(myHashTable, "ENTRY00", id);
+    psFree(id);
+    id = IdAlloc("IDB");
+    psHashInsert(myHashTable, "ENTRY01", id);
+    psFree(id);
+    id = IdAlloc("IDC");
+    psHashInsert(myHashTable, "ENTRY02", id);
+    psFree(id);
+    id = IdAlloc("IDD");
+    psHashInsert(myHashTable, "ENTRY03", id);
+    psFree(id);
+    psFree(myHashTable);
 
     if (imGlobal != 4) {