Index: trunk/psLib/test/collections/builddir/tst_psBitSet_01.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_01.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_01.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_02.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_02.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_02.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_03.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_03.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_03.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_04.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_04.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_04.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_05.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_05.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_05.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psBitSet_06.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psBitSet_06.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psBitSet_06.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psImage.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psImage.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psImage.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psList.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psList.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psList.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psSort_01.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_01.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psSort_01.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psSort_02.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_02.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psSort_02.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psSort_03.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_03.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psSort_03.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psSort_04.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psSort_04.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psSort_04.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psVector_01.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psVector_01.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psVector_01.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psVector_02.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psVector_02.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psVector_02.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/builddir/tst_psVector_03.d
===================================================================
--- trunk/psLib/test/collections/builddir/tst_psVector_03.d	(revision 1041)
+++ trunk/psLib/test/collections/builddir/tst_psVector_03.d	(revision 1073)
@@ -3,6 +3,7 @@
   ../../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
Index: trunk/psLib/test/collections/tst_psBitSet_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_01.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psBitSet_01.c	(revision 1073)
@@ -17,6 +17,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-10 00:28:23 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -121,5 +121,5 @@
     // Test J - Free psBitSet
     printPositiveTestHeader(stdout, "psBitSet", "Free psBitSet");
-    psBitSetFree(bs);
+    psFree(bs);
     psMemCheckLeaks(0, NULL, stdout);
     psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psBitSet_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_02.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psBitSet_02.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-11 01:39:30 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63,7 +63,7 @@
     // Test C - Free psBitSets
     printPositiveTestHeader(stdout, "psBitSet", "Free psBitSets");
-    psBitSetFree(bs1);
-    psBitSetFree(bs2);
-    psBitSetFree(outbs);
+    psFree(bs1);
+    psFree(bs2);
+    psFree(outbs);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psBitSet_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_03.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psBitSet_03.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-11 01:40:45 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63,7 +63,7 @@
     // Test C - Free psBitSets
     printPositiveTestHeader(stdout, "psBitSet", "Free psBitSets");
-    psBitSetFree(bs1);
-    psBitSetFree(bs2);
-    psBitSetFree(outbs);
+    psFree(bs1);
+    psFree(bs2);
+    psFree(outbs);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psBitSet_04.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_04.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psBitSet_04.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-11 01:46:02 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63,7 +63,7 @@
     // Test C - Free psBitSets
     printPositiveTestHeader(stdout, "psBitSet", "Free psBitSets");
-    psBitSetFree(bs1);
-    psBitSetFree(bs2);
-    psBitSetFree(outbs);
+    psFree(bs1);
+    psFree(bs2);
+    psFree(outbs);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psBitSet_05.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_05.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psBitSet_05.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-10 00:28:36 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48,7 +48,7 @@
     // Test C - Free psBitSets
     printPositiveTestHeader(stdout, "psBitSet", "Free psBitSets");
-    psBitSetFree(bs1);
-    psBitSetFree(bs2);
-    psBitSetFree(outbs);
+    psFree(bs1);
+    psFree(bs2);
+    psFree(outbs);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psBitSet_06.c
===================================================================
--- trunk/psLib/test/collections/tst_psBitSet_06.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psBitSet_06.c	(revision 1073)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-10 00:28:43 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55,17 +55,9 @@
     printFooter(stdout, "psBitSet", "Create negative size bitset", true);
 
-
-    // Test D - Attempt to free null BitSet
-    printNegativeTestHeader(stdout,"psBitSet", "Attempt to free null BitSet",
-                            "Null psBitSet for inBitSet argument", 0);
-    psBitSetFree(NULL);
-    printFooter(stdout, "psBitSet", "Attempt to free null BitSet", true);
-
-
     // Test E - Free psBitSets
     printPositiveTestHeader(stdout, "psBitSet", "Free psBitSets");
-    psBitSetFree(bs1);
-    psBitSetFree(bs2);
-    psBitSetFree(outbs);
+    psFree(bs1);
+    psFree(bs2);
+    psFree(outbs);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psList.c
===================================================================
--- trunk/psLib/test/collections/tst_psList.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psList.c	(revision 1073)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-14 23:03:43 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -78,5 +78,5 @@
     }
 
-    psListFree(list,NULL);
+    psFree(list);
 
     list = psListAlloc(data);
@@ -108,5 +108,7 @@
 
 
-    psListFree(list,PS_FREE);
+    psFree(list);
+
+    psFree(data);
 
     return 0;
@@ -283,5 +285,5 @@
     }
 
-    psListFree(list, PS_FREE);
+    psFree(list);
 
     return 0;
@@ -339,16 +341,20 @@
     *data = 0;
     list = psListAlloc(data);
+    psFree(data);
 
     data = psAlloc(sizeof(int));
     *data = 1;
     list = psListAdd(list,data,PS_LIST_TAIL);
+    psFree(data);
 
     data = psAlloc(sizeof(int));
     *data = 2;
     list = psListAdd(list,data,PS_LIST_TAIL);
+    psFree(data);
 
     data = psAlloc(sizeof(int));
     *data = 3;
     list = psListAdd(list,data,PS_LIST_TAIL);
+    psFree(data);
 
     //  2. which>0 and which<list.n.
@@ -404,5 +410,5 @@
     }
 
-    psListFree(list,PS_FREE);
+    psFree(list);
 
     return 0;
@@ -637,5 +643,5 @@
     }
 
-    psListFree(list,PS_FREE);
+    psFree(list);
 
     return 0;
@@ -691,6 +697,6 @@
     }
 
-    psVectorFree(vec);
-    psListFree(list,PS_FREE);
+    psFree(vec);
+    psFree(list);
 
     // test vector -> dlist
@@ -729,6 +735,6 @@
     }
 
-    psVectorFree(vec);
-    psListFree(list,PS_FREE);
+    psFree(vec);
+    psFree(list);
 
     // now, make sure if input vector/list is NULL, output is NULL
@@ -755,6 +761,6 @@
         return 1;
     }
-    psVectorFree(vec);
-    psListFree(list,PS_FREE);
+    psFree(vec);
+    psFree(list);
 
     list = psListAlloc(NULL);
@@ -765,6 +771,6 @@
         return 1;
     }
-    psVectorFree(vec);
-    psListFree(list,PS_FREE);
+    psFree(vec);
+    psFree(list);
 
     return 0;
@@ -895,5 +901,5 @@
     }
 
-    psListFree(list,PS_FREE);
+    psFree(list);
 
     return 0;
@@ -938,5 +944,5 @@
     */
 
-    psListFree(list,NULL);
+    psFree(list);
 
     /*
Index: trunk/psLib/test/collections/tst_psSort_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psSort_01.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psSort_01.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-10 23:14:22 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -71,6 +71,6 @@
     // Test D - Free float vectors
     printPositiveTestHeader(stdout,"psSort", "Free float vectors");
-    psVectorFree(in);
-    psVectorFree(out);
+    psFree(in);
+    psFree(out);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psSort_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psSort_02.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psSort_02.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-02 23:29:29 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -55,6 +55,6 @@
     // Test C - Free vectors
     printPositiveTestHeader(stdout,"psSort", "Free vectors");
-    psVectorFree(in);
-    psVectorFree(out);
+    psFree(in);
+    psFree(out);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psSort_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psSort_03.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psSort_03.c	(revision 1073)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-02 23:29:29 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49,6 +49,6 @@
     // Test C - Free float vectors
     printPositiveTestHeader(stdout,"psSort", "Free float vectors");
-    psVectorFree(in);
-    psVectorFree(out);
+    psFree(in);
+    psFree(out);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psSort_04.c
===================================================================
--- trunk/psLib/test/collections/tst_psSort_04.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psSort_04.c	(revision 1073)
@@ -9,6 +9,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-10 23:14:22 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -33,5 +33,5 @@
     // Test B - Free vectors
     printPositiveTestHeader(stdout, "psSort", "Free vectors");
-    psVectorFree(goodOut);
+    psFree(goodOut);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psVector_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psVector_01.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psVector_01.c	(revision 1073)
@@ -14,6 +14,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-10 01:50:43 $
+ *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -79,5 +79,5 @@
     // Test E - Free S32 vector
     printPositiveTestHeader(stdout, "psVector", "Free S32 vector");
-    psVectorFree(psVec);
+    psFree(psVec);
     psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
Index: trunk/psLib/test/collections/tst_psVector_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psVector_02.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psVector_02.c	(revision 1073)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-02 23:29:29 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -102,6 +102,6 @@
     // Test E - Free void pointer vector
     printPositiveTestHeader(stdout, "psVector", "Free void pointer vector");
-    psVectorElementFree(psVec, NULL);
-    psVectorFree(psVec);
+    psVectorElementFree(psVec);
+    psFree(psVec);
     for(int i = 0; i < 10; i++) {
         psFree(mySt[i]);
Index: trunk/psLib/test/collections/tst_psVector_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psVector_03.c	(revision 1041)
+++ trunk/psLib/test/collections/tst_psVector_03.c	(revision 1073)
@@ -12,6 +12,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-06-04 19:51:49 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-06-23 23:00:15 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,10 +28,4 @@
 }
 testStruct;
-
-static void freeData(void *data)
-{
-    psFree(data);
-}
-
 
 int main(int argc,
@@ -59,5 +53,4 @@
         psVec->data.PTR[i] = ts;
         psVec->n++;
-        psMemIncrRefCounter(ts);
     }
 
@@ -82,5 +75,4 @@
         psVec->data.PTR[i] = ts;
         psVec->n++;
-        psMemIncrRefCounter(ts);
     }
     for(int i = 0; i < 10; i++) {
@@ -92,8 +84,7 @@
     printFooter(stdout, "psVector", "Reallocate void pointer vector bigger", true);
 
-
     // Test D - Reallocate void pointer vector smaller
     printPositiveTestHeader(stdout,"psVector","Reallocate void pointer vector smaller");
-    psVec = psVectorRealloc(3, psVec);
+    psVec = psVectorRealloc(3, psVec); // this also frees the elements trimmed
     for(int i = 0; i < 3; i++) {
         testStruct *ts = (testStruct*)psVec->data.PTR[i];
@@ -109,12 +100,9 @@
 
     // Free void pointer array struct and its 3 internal elements
-    psVectorElementFree(psVec, freeData);
-    psVectorFree(psVec);
+    psFree(psVec);
 
-    // Free 7 elements manually that were lost after array was reallocated smaller
-    for(int i = 3; i < 10; i++) {
-        psFree(mySt[i]);
+    if (psMemCheckLeaks(0, NULL, stdout) != 0) {
+        psAbort(__func__,"memory leaks");
     }
-    psMemCheckLeaks(0, NULL, stdout);
     int nBad = psMemCheckCorruption(0);
     if(nBad) {
Index: trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr	(revision 1073)
@@ -1,6 +1,6 @@
- <DATE> <TIME> <HOST> |E|   psBitSetTest| : Line 140 - Bit position too small: -4
- <DATE> <TIME> <HOST> |E|   psBitSetTest| : Line 143 - Bit position too large: 200
- <DATE> <TIME> <HOST> |E|   psBitSetTest| : Line 137 - Null psBitSet for inBitSet argument
- <DATE> <TIME> <HOST> |E|    psBitSetSet| : Line 118 - Bit position too small: -4
- <DATE> <TIME> <HOST> |E|    psBitSetSet| : Line 121 - Bit position too large: 200
- <DATE> <TIME> <HOST> |E|    psBitSetSet| : Line 115 - Null psBitSet for inBitSet argument
+ <DATE> <TIME> <HOST> |E|   psBitSetTest| : Line 142 - Bit position too small: -4
+ <DATE> <TIME> <HOST> |E|   psBitSetTest| : Line 145 - Bit position too large: 200
+ <DATE> <TIME> <HOST> |E|   psBitSetTest| : Line 139 - Null psBitSet for inBitSet argument
+ <DATE> <TIME> <HOST> |E|    psBitSetSet| : Line 120 - Bit position too small: -4
+ <DATE> <TIME> <HOST> |E|    psBitSetSet| : Line 123 - Bit position too large: 200
+ <DATE> <TIME> <HOST> |E|    psBitSetSet| : Line 117 - Null psBitSet for inBitSet argument
Index: trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr	(revision 1073)
@@ -1,1 +1,1 @@
- <DATE> <TIME> <HOST> |E|     psBitSetOp| : Line 187 - psBitSet sizes not the same
+ <DATE> <TIME> <HOST> |E|     psBitSetOp| : Line 189 - psBitSet sizes not the same
Index: trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr	(revision 1073)
@@ -1,3 +1,2 @@
- <DATE> <TIME> <HOST> |E|     psBitSetOp| : Line 214 - Invalid psBitMask binary operation: ZZXOR
- <DATE> <TIME> <HOST> |E|  psBitSetAlloc| : Line 84 - Allocation size must be > 0: size = -4
- <DATE> <TIME> <HOST> |E|   psBitSetFree| : Line 103 - Null psBitSet for inBitSet argument
+ <DATE> <TIME> <HOST> |E|     psBitSetOp| : Line 216 - Invalid psBitMask binary operation: ZZXOR
+ <DATE> <TIME> <HOST> |E|  psBitSetAlloc| : Line 86 - Allocation size must be > 0: size = -4
Index: trunk/psLib/test/collections/verified/tst_psBitSet_06.stdout
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet_06.stdout	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psBitSet_06.stdout	(revision 1073)
@@ -35,15 +35,4 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psBitSet_06.c                                          *
-*            TestPoint: psBitSet{Attempt to free null BitSet}                      *
-*             TestType: Negative                                                   *
-*    ExpectedErrorText: Null psBitSet for inBitSet argument                        *
-*  ExpectedStatusValue: 0                                                          *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psBitSet{Attempt to free null BitSet} | tst_psBitSet_06.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psBitSet_06.c                                          *
 *            TestPoint: psBitSet{Free psBitSets}                                   *
 *             TestType: Positive                                                   *
Index: trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1073)
@@ -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:264).
+ <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:262).
 
 ---> TESTPOINT PASSED (psList{489-testListGet} | tst_psList.c)
@@ -70,5 +70,5 @@
  <DATE> <TIME> <HOST> |I|testListIterato| psListSetIterator/psListGetNext/psListGetPrev shall move the list cursor to the specified location
  <DATE> <TIME> <HOST> |I|testListIterato|Following should error with 'Unexpected null pointer'
- <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:264).
+ <DATE> <TIME> <HOST> |E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:262).
  <DATE> <TIME> <HOST> |I|testListIterato|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/collections/verified/tst_psSort_03.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psSort_03.stderr	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psSort_03.stderr	(revision 1073)
@@ -1,1 +1,1 @@
- <DATE> <TIME> <HOST> |E|         psSort| : Line 136 - Input and output vector sizes are not equal: in=5 out=6
+ <DATE> <TIME> <HOST> |E|         psSort| : Line 137 - Input and output vector sizes are not equal: in=5 out=6
Index: trunk/psLib/test/collections/verified/tst_psSort_04.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psSort_04.stderr	(revision 1041)
+++ trunk/psLib/test/collections/verified/tst_psSort_04.stderr	(revision 1073)
@@ -1,1 +1,1 @@
- <DATE> <TIME> <HOST> |E|         psSort| : Line 118 - Null input vector
+ <DATE> <TIME> <HOST> |E|         psSort| : Line 119 - Null input vector