Changeset 1073 for trunk/psLib/test/sysUtils

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.

Location:

trunk/psLib/test/sysUtils

Files:

• builddir/atst_psAbort_01.d (modified) (1 diff)
• builddir/atst_psAbort_02.d (modified) (1 diff)
• builddir/atst_psAbort_03.d (modified) (1 diff)
• builddir/tst_psError.d (modified) (1 diff)
• builddir/tst_psHash00.d (modified) (1 diff)
• builddir/tst_psHash01.d (modified) (1 diff)
• builddir/tst_psHash02.d (modified) (1 diff)
• builddir/tst_psHash03.d (modified) (1 diff)
• builddir/tst_psHash04.d (modified) (1 diff)
• builddir/tst_psLogMsg00.d (modified) (1 diff)
• builddir/tst_psLogMsg01.d (modified) (1 diff)
• builddir/tst_psLogMsg02.d (modified) (1 diff)
• builddir/tst_psLogMsg03.d (modified) (1 diff)
• builddir/tst_psMemory.d (modified) (1 diff)
• builddir/tst_psStringCopy.d (modified) (1 diff)
• builddir/tst_psTrace00.d (modified) (1 diff)
• builddir/tst_psTrace01.d (modified) (1 diff)
• builddir/tst_psTrace02.d (modified) (1 diff)
• builddir/tst_psTrace03.d (modified) (1 diff)
• builddir/tst_psTrace04.d (modified) (1 diff)
• tst_psHash00.c (modified) (1 diff)
• tst_psHash01.c (modified) (4 diffs)
• tst_psHash02.c (modified) (4 diffs)
• tst_psHash03.c (modified) (6 diffs)
• tst_psHash04.c (modified) (6 diffs)
• verified/tst_psMemory.stderr (modified) (1 diff)

trunk/psLib/test/sysUtils/builddir/atst_psAbort_01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/atst_psAbort_02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/atst_psAbort_03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psError.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psHash00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psHash01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psHash02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psHash03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psHash04.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psLogMsg03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psMemory.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h

trunk/psLib/test/sysUtils/builddir/tst_psStringCopy.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psTrace00.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psTrace01.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psTrace02.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psTrace03.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/builddir/tst_psTrace04.d

@@ -3 +3 @@
   ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
   ../../include/psString.h ../../include/psType.h ../../include/psList.h \
-  ../../include/psVector.h ../../include/psHash.h ../../include/psImage.h \
+  ../../include/psVector.h ../../include/psHash.h \
+  ../../include/psScalar.h ../../include/psImage.h \
   ../../include/psBitSet.h ../../include/psSort.h ../../include/psStats.h \
-  ../../include/psMatrix.h ../../include/psFFT.h \
-  ../../include/psImageIO.h ../../include/psTest.h
+  ../../include/psMatrix.h ../../include/psMatrixVectorArithmetic.h \
+  ../../include/psFFT.h ../../include/psImageIO.h ../../include/psTest.h

trunk/psLib/test/sysUtils/tst_psHash00.c

@@ -53 +53 @@
                 testStatus);
 
-    psHashFree(myHashTable, NULL);
+    psFree(myHashTable);
 
-    memLeaks = psMemCheckLeaks(currentId,NULL,NULL);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);

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) {

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);

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);

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);

trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr

@@ -81 +81 @@
  <DATE> <TIME> <HOST> |I|TPmemCorruption|psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
  <DATE> <TIME> <HOST> |E|psMemCheckCorru|psMemCheckCorruption: memory block 1 is corrupted (buffer underflow)
- <DATE> <TIME> <HOST> |I|memProblemCallb|memory callback called for id 1 (psMemCheckCorruption:228).
+ <DATE> <TIME> <HOST> |I|memProblemCallb|memory callback called for id 1 (psMemCheckCorruption:226).
 
 ---> TESTPOINT PASSED (psMemory{455-TPmemCorruption} | tst_psMemory.c)