Index: trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr	(revision 1018)
@@ -5,3 +5,3 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |A|main           |ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
+ <DATE> <TIME> <HOST> |A|           main|ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
Index: trunk/psLib/test/sysUtils/verified/atst_psAbort_02.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/atst_psAbort_02.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/atst_psAbort_02.stderr	(revision 1018)
@@ -5,3 +5,3 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |A|__LINE__       |NO_VALUES
+ <DATE> <TIME> <HOST> |A|       __LINE__|NO_VALUES
Index: trunk/psLib/test/sysUtils/verified/tst_psError.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 1018)
@@ -5,5 +5,5 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |E|main           |ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
+ <DATE> <TIME> <HOST> |E|           main|ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
 
 ---> TESTPOINT PASSED (psError{Multiple type values in error message} | tst_psError.c)
@@ -15,5 +15,5 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |E|__LINE__       |NO VALUES
+ <DATE> <TIME> <HOST> |E|       __LINE__|NO VALUES
 
 ---> TESTPOINT PASSED (psError{String values in error message} | tst_psError.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psLogMsg00.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg00.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg00.stderr	(revision 1018)
@@ -1,8 +1,8 @@
- <DATE> <TIME> <HOST> |A|main           |Hello World!  My level is 0 0.000000 beep beep
- <DATE> <TIME> <HOST> |E|main           |Hello World!  My level is 1 1.000000 beep beep
- <DATE> <TIME> <HOST> |W|main           |Hello World!  My level is 2 2.000000 beep beep
- <DATE> <TIME> <HOST> |I|main           |Hello World!  My level is 3 3.000000 beep beep
- <DATE> <TIME> <HOST> |A|main           |Hello World!  My level is 0 0.000000 beep beep
- <DATE> <TIME> <HOST> |E|main           |Hello World!  My level is 1 1.000000 beep beep
- <DATE> <TIME> <HOST> |W|main           |Hello World!  My level is 2 2.000000 beep beep
- <DATE> <TIME> <HOST> |I|main           |Hello World!  My level is 3 3.000000 beep beep
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0 0.000000 beep beep
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1 1.000000 beep beep
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2 2.000000 beep beep
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3 3.000000 beep beep
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0 0.000000 beep beep
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1 1.000000 beep beep
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2 2.000000 beep beep
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3 3.000000 beep beep
Index: trunk/psLib/test/sysUtils/verified/tst_psLogMsg01.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg01.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg01.stderr	(revision 1018)
@@ -1,11 +1,11 @@
- <DATE> <TIME> <HOST> |A|main           |Hello World!  My level is 0
- <DATE> <TIME> <HOST> |E|main           |Hello World!  My level is 1
- <DATE> <TIME> <HOST> |W|main           |Hello World!  My level is 2
- <DATE> <TIME> <HOST> |I|main           |Hello World!  My level is 3
- <DATE> <TIME> <HOST> |4|main           |Hello World!  My level is 4
- <DATE> <TIME> <HOST> |5|main           |Hello World!  My level is 5
- <DATE> <TIME> <HOST> |6|main           |Hello World!  My level is 6
- <DATE> <TIME> <HOST> |7|main           |Hello World!  My level is 7
- <DATE> <TIME> <HOST> |8|main           |Hello World!  My level is 8
- <DATE> <TIME> <HOST> |9|main           |Hello World!  My level is 9
- <DATE> <TIME> <HOST> |4|main           |This should  be displayed (level 4)
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |4|           main|Hello World!  My level is 4
+ <DATE> <TIME> <HOST> |5|           main|Hello World!  My level is 5
+ <DATE> <TIME> <HOST> |6|           main|Hello World!  My level is 6
+ <DATE> <TIME> <HOST> |7|           main|Hello World!  My level is 7
+ <DATE> <TIME> <HOST> |8|           main|Hello World!  My level is 8
+ <DATE> <TIME> <HOST> |9|           main|Hello World!  My level is 9
+ <DATE> <TIME> <HOST> |4|           main|This should  be displayed (level 4)
Index: trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr	(revision 1018)
@@ -1,28 +1,28 @@
-
-
-
-
- <DATE> <TIME> |
- <DATE> <TIME> |
- <DATE> <TIME> |
- <DATE> <TIME> |
- <DATE> <TIME> <HOST> |
- <DATE> <TIME> <HOST> |
- <DATE> <TIME> <HOST> |
- <DATE> <TIME> <HOST> |
-A|
-E|
-W|
-I|
-main           |
-main           |
-main           |
-main           |
-Hello World!  My level is 0
-Hello World!  My level is 1
-Hello World!  My level is 2
-Hello World!  My level is 3
- <DATE> <TIME> <HOST> |A|main           |Hello World!  My level is 0
- <DATE> <TIME> <HOST> |E|main           |Hello World!  My level is 1
- <DATE> <TIME> <HOST> |W|main           |Hello World!  My level is 2
- <DATE> <TIME> <HOST> |I|main           |Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
Index: trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stderr	(revision 1018)
@@ -1,4 +1,4 @@
- <DATE> <TIME> <HOST> |A|main           |Hello World!  My level is 0
- <DATE> <TIME> <HOST> |E|main           |Hello World!  My level is 1
- <DATE> <TIME> <HOST> |W|main           |Hello World!  My level is 2
- <DATE> <TIME> <HOST> |I|main           |Hello World!  My level is 3
+ <DATE> <TIME> <HOST> |A|           main|Hello World!  My level is 0
+ <DATE> <TIME> <HOST> |E|           main|Hello World!  My level is 1
+ <DATE> <TIME> <HOST> |W|           main|Hello World!  My level is 2
+ <DATE> <TIME> <HOST> |I|           main|Hello World!  My level is 3
Index: trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1018)
@@ -5,5 +5,5 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |I|TPCheckBufferPositive|psAlloc shall allocate memory blocks writeable by caller.
+ <DATE> <TIME> <HOST> |I|TPCheckBufferPo|psAlloc shall allocate memory blocks writeable by caller.
 
 ---> TESTPOINT PASSED (psMemory{449-TPCheckBufferPositive} | tst_psMemory.c)
@@ -15,7 +15,7 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |I|TPOutOfMemory  |Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
- <DATE> <TIME> <HOST> |I|TPOutOfMemoryExhaustedCallback|Custom MemExhaustedCallback was invoked.
- <DATE> <TIME> <HOST> |A|p_psAlloc      |Failed to allocate 4294966295 bytes at tst_psMemory.c:163
+ <DATE> <TIME> <HOST> |I|  TPOutOfMemory|Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
+ <DATE> <TIME> <HOST> |I|TPOutOfMemoryEx|Custom MemExhaustedCallback was invoked.
+ <DATE> <TIME> <HOST> |A|      p_psAlloc|Failed to allocate 4294966295 bytes at tst_psMemory.c:163
 
 ---> TESTPOINT PASSED (psMemory{450-TPOutOfMemory} | tst_psMemory.c)
@@ -27,7 +27,7 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |I|TPrealloc      |psRealloc shall increase/decrease memory buffer while preserving contents
- <DATE> <TIME> <HOST> |I|TPrealloc      |Expanding memory buffer.
- <DATE> <TIME> <HOST> |I|TPrealloc      |Shrinking memory buffer.
+ <DATE> <TIME> <HOST> |I|      TPrealloc|psRealloc shall increase/decrease memory buffer while preserving contents
+ <DATE> <TIME> <HOST> |I|      TPrealloc|Expanding memory buffer.
+ <DATE> <TIME> <HOST> |I|      TPrealloc|Shrinking memory buffer.
 
 ---> TESTPOINT PASSED (psMemory{451-TPrealloc} | tst_psMemory.c)
@@ -40,10 +40,10 @@
 
  <DATE> <TIME> <HOST> |I|TPallocCallback|call to psAlloc/psRealloc shall generate a callback if specified memory ID is allocated.
- <DATE> <TIME> <HOST> |I|memAllocateCallback|block 2 was (re)allocated
- <DATE> <TIME> <HOST> |I|memAllocateCallback|block 3 was (re)allocated
+ <DATE> <TIME> <HOST> |I|memAllocateCall|block 2 was (re)allocated
+ <DATE> <TIME> <HOST> |I|memAllocateCall|block 3 was (re)allocated
  <DATE> <TIME> <HOST> |I|memFreeCallback|block 2 was freed
  <DATE> <TIME> <HOST> |I|memFreeCallback|block 3 was freed
- <DATE> <TIME> <HOST> |I|memAllocateCallback|block 4 was (re)allocated
- <DATE> <TIME> <HOST> |I|memAllocateCallback|block 4 was (re)allocated
+ <DATE> <TIME> <HOST> |I|memAllocateCall|block 4 was (re)allocated
+ <DATE> <TIME> <HOST> |I|memAllocateCall|block 4 was (re)allocated
  <DATE> <TIME> <HOST> |I|memFreeCallback|block 4 was freed
 
@@ -56,14 +56,14 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |I|TPcheckLeaks   |psMemCheckLeaks shall return the number of blocks above an ID that are still allocated
- <DATE> <TIME> <HOST> |I|TPcheckLeaks   |following psMemCheckLeaks call should produce one instance.
+ <DATE> <TIME> <HOST> |I|   TPcheckLeaks|psMemCheckLeaks shall return the number of blocks above an ID that are still allocated
+ <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce one instance.
                    file:line ID
          tst_psMemory.c:313  1
- <DATE> <TIME> <HOST> |I|TPcheckLeaks   |Testing psMemCheckLeaks again with a different leak location
- <DATE> <TIME> <HOST> |I|TPcheckLeaks   |following psMemCheckLeaks call should produce one error.
+ <DATE> <TIME> <HOST> |I|   TPcheckLeaks|Testing psMemCheckLeaks again with a different leak location
+ <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce one error.
                    file:line ID
          tst_psMemory.c:343  11
- <DATE> <TIME> <HOST> |I|TPcheckLeaks   |Testing psMemCheckLeaks again with multiple leak locations.
- <DATE> <TIME> <HOST> |I|TPcheckLeaks   |following psMemCheckLeaks call should produce two errors.
+ <DATE> <TIME> <HOST> |I|   TPcheckLeaks|Testing psMemCheckLeaks again with multiple leak locations.
+ <DATE> <TIME> <HOST> |I|   TPcheckLeaks|following psMemCheckLeaks call should produce two errors.
                    file:line ID
          tst_psMemory.c:371  16
@@ -80,6 +80,6 @@
  <DATE> <TIME> <HOST> |I|TPmemCorruption|psMemCheckCorruption shall detect memory corruptions
  <DATE> <TIME> <HOST> |I|TPmemCorruption|psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
- <DATE> <TIME> <HOST> |E|psMemCheckCorruption|psMemCheckCorruption: memory block 1 is corrupted (buffer underflow)
- <DATE> <TIME> <HOST> |I|memProblemCallback|memory callback called for id 1 (psMemCheckCorruption:228).
+ <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).
 
 ---> TESTPOINT PASSED (psMemory{455-TPmemCorruption} | tst_psMemory.c)
@@ -91,6 +91,6 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |I|TPFreeReferencedMemory|memory reference count shall be incrementable/decrementable
- <DATE> <TIME> <HOST> |I|TPFreeReferencedMemory|psFree shall be just decrement a multiple refererenced pointer.
+ <DATE> <TIME> <HOST> |I|TPFreeReference|memory reference count shall be incrementable/decrementable
+ <DATE> <TIME> <HOST> |I|TPFreeReference|psFree shall be just decrement a multiple refererenced pointer.
 
 ---> TESTPOINT PASSED (psMemory{456-TPFreeReferencedMemory} | tst_psMemory.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1007)
+++ trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1018)
@@ -50,5 +50,5 @@
 \----------------------------------------------------------------------------------/
 
- <DATE> <TIME> <HOST> |E|psString.c     |psStringNCopy with negative count specified -5
+ <DATE> <TIME> <HOST> |E|     psString.c|psStringNCopy with negative count specified -5
 
 ---> TESTPOINT PASSED (psStringNCopy{Copy string with negative size} | tst_psStringCopy.c)