Index: trunk/psLib/test/collections/verified/tst_psBitSet.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psBitSet.stderr	(revision 2273)
+++ trunk/psLib/test/collections/verified/tst_psBitSet.stderr	(revision 2281)
@@ -9,5 +9,5 @@
 <DATE><TIME>|<HOST>|I|testBitSet01a
     Following is an error.
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetAlloc
+<DATE><TIME>|<HOST>|E|psBitSetAlloc (psBitSet.c:<LINENO>)
     The number of bit in a psBitSet (-4) must be greater than zero.
 
@@ -32,13 +32,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetSet
+<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
     The specified bit position (-4) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetSet
+<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
     The specified bit position (200) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01b
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetSet
+<DATE><TIME>|<HOST>|E|psBitSetSet (psBitSet.c:<LINENO>)
     Can not operate on a NULL psBitSet.
 
@@ -56,13 +56,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetTest
+<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
     The specified bit position (-4) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetTest
+<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
     The specified bit position (200) is invalid.  Position must be between 0 and 23.
 <DATE><TIME>|<HOST>|I|testBitSet01c
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetTest
+<DATE><TIME>|<HOST>|E|psBitSetTest (psBitSet.c:<LINENO>)
     Can not operate on a NULL psBitSet.
 
@@ -77,13 +77,13 @@
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following should be an error
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetOp
+<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
     The psBitSet operand must be the same size.
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following is an error.
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetOp
+<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
     Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
 <DATE><TIME>|<HOST>|I|testBitSet06
     Following is an error.
-<DATE><TIME>|<HOST>|E|psLib.collections.psBitSetOp
+<DATE><TIME>|<HOST>|E|psBitSetOp (psBitSet.c:<LINENO>)
     Specified operator, FOO, is invalid.  Valid operators are AND, OR, and XOR.
 
Index: trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 2273)
+++ trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 2281)
@@ -37,6 +37,6 @@
 <DATE><TIME>|<HOST>|I|testListGet
     Following should be an error
-<DATE><TIME>|<HOST>|E|listSetIterator
-    Unexpected null pointer for psList parameter (psList.c:<LINENO>).
+<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
+    Unexpected null pointer for psList parameter.
 
 ---> TESTPOINT PASSED (psList{psListGet} | tst_psList.c)
@@ -50,21 +50,21 @@
 <DATE><TIME>|<HOST>|I|testListRemove
     Following should be an error
-<DATE><TIME>|<HOST>|E|psListRemove
-    list parameter found to be NULL in psListRemove
+<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
+    list parameter found to be NULL.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove
+<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
     Couldn't position to given index (-4) to remove element from list.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove
+<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
     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
+<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
     Failed to find item in given psList.
 <DATE><TIME>|<HOST>|I|testListRemove
     Next message should be an error
-<DATE><TIME>|<HOST>|E|psListRemove
+<DATE><TIME>|<HOST>|E|psListRemove (psList.c:<LINENO>)
     Failed to find item in given psList.
 
@@ -90,9 +90,9 @@
 <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:<LINENO>).
+<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
+    Unexpected null pointer for psList parameter.
 <DATE><TIME>|<HOST>|I|testListIterator
     Following should error with 'Can't move to an unknown position.'
-<DATE><TIME>|<HOST>|E|listSetIterator
+<DATE><TIME>|<HOST>|E|listSetIterator (psList.c:<LINENO>)
     Can't move to an unknown position.  Not moving the iterator position.
 
Index: trunk/psLib/test/collections/verified/tst_psVector.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 2273)
+++ trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 2281)
@@ -3,4 +3,4 @@
 <DATE><TIME>|<HOST>|I|main
     Following should be an error message.
-<DATE><TIME>|<HOST>|E|psLib.collections.psVectorRealloc
+<DATE><TIME>|<HOST>|E|psVectorRealloc (psVector.c:<LINENO>)
     psVectorRealloc must a given a non-NULL psVector to resize.  Desired datatype unknown.
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr	(revision 2273)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_02.stderr	(revision 2281)
@@ -1,2 +1,2 @@
-<DATE><TIME>|<HOST>|E|psLib.collections.psVectorSortIndex
+<DATE><TIME>|<HOST>|E|psVectorSortIndex (psVector.c:<LINENO>)
     Input psVector is an unsupported type (0).
Index: trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr
===================================================================
--- trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 2273)
+++ trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 2281)
@@ -1,2 +1,2 @@
-<DATE><TIME>|<HOST>|E|psLib.collections.psVectorSort
+<DATE><TIME>|<HOST>|E|psVectorSort (psVector.c:<LINENO>)
     psVectorSort can not sort a NULL psVector.