Index: /trunk/psLib/test/sysUtils/verified/tst_psError.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 2279)
+++ /trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 2280)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|testError00
+<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
     ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
-<DATE><TIME>|<HOST>|E|__LINE__
+<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
     NO VALUES
-<DATE><TIME>|<HOST>|E|
+<DATE><TIME>|<HOST>|E|testError00 (tst_psError.c:<LINENO>)
 
 ---> TESTPOINT PASSED (psError{psError()} | tst_psError.c)
@@ -19,29 +19,25 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|test1A
+<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     Error code = 262
-ERROR STACK PRINT Test1A -> test1A: parameter is out-of-range
+ERROR STACK PRINT Test1A -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
      Error code = 262
-<DATE><TIME>|<HOST>|E|
+<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     Error code = 263
-ERROR STACK PRINT Test1B -> : parameter is of unsupported type
+ERROR STACK PRINT Test1B -> testError01 (tst_psError.c:<LINENO>): parameter is of unsupported type
      Error code = 263
-<DATE><TIME>|<HOST>|E|
-    Error code = 264
-ERROR STACK PRINT Test1C -> : parameter is null
-     Error code = 264
-<DATE><TIME>|<HOST>|E|test1D
+<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     Error code = -1
-ERROR STACK PRINT Test1D -> test1D: (null)
+ERROR STACK PRINT Test1D -> testError01 (tst_psError.c:<LINENO>): (null)
      Error code = -1
-<DATE><TIME>|<HOST>|E|test1E
+<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     Error code = 262
-ERROR STACK PRINT Test1E -> test1D: (null)
+ERROR STACK PRINT Test1E -> testError01 (tst_psError.c:<LINENO>): (null)
      Error code = -1
- -> test1E: parameter is out-of-range
+ -> testError01 (tst_psError.c:<LINENO>): parameter is out-of-range
      Error code = 262
-<DATE><TIME>|<HOST>|E|test1F
+<DATE><TIME>|<HOST>|E|testError01 (tst_psError.c:<LINENO>)
     Errno code = 9
-ERROR STACK PRINT Test1F -> test1F: Bad file descriptor
+ERROR STACK PRINT Test1F -> testError01 (tst_psError.c:<LINENO>): Bad file descriptor
      Errno code = 9
 
@@ -54,7 +50,7 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|test2A
+<DATE><TIME>|<HOST>|E|testError02 (tst_psError.c:<LINENO>)
     Error code = 262
-ERROR STACK PRINT Test2A -> test2A: parameter is out-of-range
+ERROR STACK PRINT Test2A -> testError02 (tst_psError.c:<LINENO>): parameter is out-of-range
      Error code = 262
 
@@ -67,9 +63,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|test3A
+<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
     Error code = 262
-<DATE><TIME>|<HOST>|E|test3A
+<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
     Error code = 263
-<DATE><TIME>|<HOST>|E|test3A
+<DATE><TIME>|<HOST>|E|testError03 (tst_psError.c:<LINENO>)
     Error code = 264
 
@@ -82,9 +78,9 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|test4A
+<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
     Error code = 262
-<DATE><TIME>|<HOST>|E|test4A
+<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
     Error code = 263
-<DATE><TIME>|<HOST>|E|test4A
+<DATE><TIME>|<HOST>|E|testError04 (tst_psError.c:<LINENO>)
     Error code = 264
 
@@ -110,5 +106,5 @@
 <DATE><TIME>|<HOST>|I|testErrorRegister
     Following should be an error.
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.psErrorRegister
+<DATE><TIME>|<HOST>|E|psErrorRegister (psErrorCodes.c:<LINENO>)
     Specified psErrorDescription pointer can not be NULL.
 
Index: /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 2279)
+++ /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 2280)
@@ -118,5 +118,5 @@
 <DATE><TIME>|<HOST>|I|TPmemCorruption
     psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.checkMemBlock
+<DATE><TIME>|<HOST>|E|checkMemBlock (psMemory.c:<LINENO>)
     Memory block 1 is corrupted; buffer underflow detected.
 <DATE><TIME>|<HOST>|I|memProblemCallback
@@ -146,5 +146,5 @@
 <DATE><TIME>|<HOST>|I|TPmultipleFree
     Next should be an error about multiple freeing.
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.psFree
+<DATE><TIME>|<HOST>|E|p_psFree (psMemory.c:<LINENO>)
     Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
 
Index: /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 2279)
+++ /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 2280)
@@ -50,5 +50,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|psLib.sysUtils.psStringNCopy
+<DATE><TIME>|<HOST>|E|psStringNCopy (psString.c:<LINENO>)
     Can not copy a negative number of characters (-5).