Index: /trunk/psLib/test/collections/tst_psList.c
===================================================================
--- /trunk/psLib/test/collections/tst_psList.c	(revision 952)
+++ /trunk/psLib/test/collections/tst_psList.c	(revision 953)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-09 20:56:23 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-09 21:20:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -47,5 +47,4 @@
 int testListAlloc(void)
 {
-    int currentId = psMemGetId();
     psList* list;
     int ref;
@@ -108,10 +107,4 @@
     psListFree(list,PS_FREE);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -119,5 +112,4 @@
 int testListAdd(void)
 {
-    int currentId = psMemGetId();
     psList* list = NULL;
     int* data = NULL;
@@ -289,10 +281,4 @@
 
     psListFree(list, PS_FREE);
-
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
 
     return 0;
@@ -323,5 +309,4 @@
 int testListGet(void)
 {
-    int currentId = psMemGetId();
     psList* list = NULL;
     int* data;
@@ -418,10 +403,4 @@
     psListFree(list,PS_FREE);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -429,5 +408,4 @@
 int testListRemove(void)
 {
-    int currentId = psMemGetId();
     psList* list = NULL;
     int* data;
@@ -658,10 +636,4 @@
     psListFree(list,PS_FREE);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 
@@ -671,5 +643,4 @@
 {
 
-    int currentId = psMemGetId();
     psList* list = NULL;
     psVector* vec = NULL;
@@ -720,10 +691,4 @@
     psListFree(list,PS_FREE);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     // test vector -> dlist
 
@@ -800,10 +765,4 @@
     psListFree(list,PS_FREE);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -811,5 +770,4 @@
 int testListIterator(void)
 {
-    int currentId = psMemGetId();
     psList* list = NULL;
     int* data;
@@ -936,10 +894,18 @@
     psListFree(list,PS_FREE);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
+
+int testListFree(void)
+{
+
+    /*
+    Call psDlistAlloc to create a doubly linked list. Create several data items and add them to the list.
+    Verify    items are within the list. Verify the data item's reference counter are incremented after adding
+    to    the list.    Call psDlistFree with NULL specified as the elemFree function. Verify the list is
+    deallocated but    not the data    items. Verify the data item's reference counters are decremented by one
+    compared to when added    to the list.
+    */
+
+    return 0;
+}
Index: /trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 952)
+++ /trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 953)
@@ -30,5 +30,5 @@
 
  <DATE> <TIME> <HOST> |I|testListGet    |Following should be an error
- <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:274).
+ <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:264).
 
 ---> TESTPOINT PASSED (psList{489-testListGet} | tst_psList.c)
@@ -47,7 +47,7 @@
  <DATE> <TIME> <HOST> |E|psListRemove   |Couldn't position to given index (-2) to remove element from list.
  <DATE> <TIME> <HOST> |I|testListRemove |Next message should be an error
- <DATE> <TIME> <HOST> |E|psListRemove   |Failed to find 0x0 on psList 0x6d7f10 in psListRemove.
+ <DATE> <TIME> <HOST> |E|psListRemove   |Failed to find 0x0 on psList 0x6d7f30 in psListRemove.
  <DATE> <TIME> <HOST> |I|testListRemove |Next message should be an error
- <DATE> <TIME> <HOST> |E|psListRemove   |Failed to find 0x6d8820 on psList 0x6d7f10 in psListRemove.
+ <DATE> <TIME> <HOST> |E|psListRemove   |Failed to find 0x6d8840 on psList 0x6d7f30 in psListRemove.
 
 ---> TESTPOINT PASSED (psList{490-testListRemove} | tst_psList.c)
@@ -70,5 +70,5 @@
  <DATE> <TIME> <HOST> |I|testListIterator| psListSetIterator/psListGetNext/psListGetPrev shall move the list cursor to the specified location
  <DATE> <TIME> <HOST> |I|testListIterator|Following should error with 'Unexpected null pointer'
- <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:274).
+ <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:264).
  <DATE> <TIME> <HOST> |I|testListIterator|Following should error with 'Can't move to an unknown position.'
  <DATE> <TIME> <HOST> |E|listSetIterator|Can't move to an unknown position.  Not moving the iterator position.
Index: /trunk/psLib/test/image/tst_psImage.c
===================================================================
--- /trunk/psLib/test/image/tst_psImage.c	(revision 952)
+++ /trunk/psLib/test/image/tst_psImage.c	(revision 953)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-09 20:34:34 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-09 21:20:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48,5 +48,4 @@
 int testImageAlloc(void)
 {
-    int currentId = psMemGetId();
     psImage* image = NULL;
     unsigned int sizes = 6;
@@ -224,10 +223,4 @@
             // children is freed.
             psImageFree(image);
-            if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-                psError(__func__,"Memory Leaks Detected");
-                return 64;
-            }
-            psMemCheckCorruption(1);
-
         }
     }
@@ -235,9 +228,4 @@
     // #548: Verify program execution doesn't stop, if the input psImage structure pointer is null.
     psImageFree(NULL);
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
 
     // #548: Verify no memory leaks or corruption are detected after a valid psImage structure with multiple
@@ -249,10 +237,4 @@
     psImageFree(image);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -261,5 +243,4 @@
 int testImageSubset(void)
 {
-    int currentId = psMemGetId();
     psImage preSubsetStruct;
     psImage* original;
@@ -519,12 +500,4 @@
     psImageFree(original);
 
-    // Verify no memory leaks or corruption are detected for a psImage structure
-    // Verify no memory leaks or corruption are detected for a psImage structure
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psError(__func__,"Memory Leaks Detected");
-        return 64;
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -537,5 +510,4 @@
     unsigned int c = 128;
     unsigned int r = 256;
-    int currentId = psMemGetId();
 
     img = psImageAlloc(c,r,PS_TYPE_F32);
@@ -627,9 +599,4 @@
     psImageFree(img2);
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psAbort(__func__,"Memory Leaks!");
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -642,5 +609,4 @@
     psF32 min;
     psF32 max;
-    int currentId = psMemGetId();
     int numClipped = 0;
     int retVal;
@@ -740,9 +706,4 @@
     }
 
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psAbort(__func__,"Memory Leaks!");
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }
@@ -753,5 +714,4 @@
     unsigned int c = 128;
     unsigned int r = 256;
-    int currentId = psMemGetId();
     int numClipped = 0;
     int retVal;
@@ -825,10 +785,4 @@
     }
 
-
-    if (psMemCheckLeaks(currentId,NULL,stderr) != 0) {
-        psAbort(__func__,"Memory Leaks!");
-    }
-    psMemCheckCorruption(1);
-
     return 0;
 }