Index: trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr	(revision 1198)
@@ -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 1196)
+++ trunk/psLib/test/sysUtils/verified/atst_psAbort_02.stderr	(revision 1198)
@@ -5,3 +5,3 @@
 \**********************************************************************************/
 
- <DATE> <TIME> <HOST> |A|       __LINE__|NO_VALUES
+ <DATE> <TIME> |<HOST>|A|       __LINE__|NO_VALUES
Index: trunk/psLib/test/sysUtils/verified/atst_psAbort_03.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/atst_psAbort_03.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/atst_psAbort_03.stderr	(revision 1198)
@@ -5,3 +5,3 @@
 \**********************************************************************************/
 
- <DATE> <TIME> <HOST> |A|               |
+ <DATE> <TIME> |<HOST>|A|               |
Index: trunk/psLib/test/sysUtils/verified/tst_psError.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 1198)
@@ -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)
@@ -25,5 +25,5 @@
 \**********************************************************************************/
 
- <DATE> <TIME> <HOST> |E|               |
+ <DATE> <TIME> |<HOST>|E|               |
 
 ---> TESTPOINT PASSED (psError{Empty strings in error message} | tst_psError.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psLogMsg00.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg00.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg00.stderr	(revision 1198)
@@ -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 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg01.stderr	(revision 1198)
@@ -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 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg02.stderr	(revision 1198)
@@ -1,7 +1,7 @@
 ------------- psLogSetFormat() -------------
- <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
 ------------- psLogSetFormat(NULL) -------------
 ------------- psLogSetFormat(T) -------------
@@ -11,8 +11,8 @@
  <DATE> <TIME> |
 ------------- psLogSetFormat(H) -------------
-shire               |
-shire               |
-shire               |
-shire               |
+<HOST>|
+<HOST>|
+<HOST>|
+<HOST>|
 ------------- psLogSetFormat(L) -------------
 A|
@@ -31,12 +31,12 @@
 Hello World!  My level is 3
 ------------- psLogSetFormat(THLNM) -------------
- <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| Under 15 chars|Hello World!
- <DATE> <TIME> <HOST> |A|This string is |Hello World!
- <DATE> <TIME> <HOST> |A|           main|Line #1
- <DATE> <TIME> <HOST> |A|           main|Line #2
- <DATE> <TIME> <HOST> |A|           main|Line #3
- <DATE> <TIME> <HOST> |A|           main|Line #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| Under 15 chars|Hello World!
+ <DATE> <TIME> |<HOST>|A|This string is |Hello World!
+ <DATE> <TIME> |<HOST>|A|           main|Line #1
+ <DATE> <TIME> |<HOST>|A|           main|Line #2
+ <DATE> <TIME> |<HOST>|A|           main|Line #3
+ <DATE> <TIME> |<HOST>|A|           main|Line #4
Index: trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stderr	(revision 1198)
@@ -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_psLogMsg03.stdout
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stdout	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psLogMsg03.stdout	(revision 1198)
@@ -8,14 +8,14 @@
 ------------- psLogSetDestination(PS_LOG_TO_STDERR) -------------
 ------------- psLogSetDestination(PS_LOG_TO_STDOUT) -------------
- <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
 --------------- psLogSetDestination(file:log.txt) ---------------
 --------------------- The Contents of log.txt -------------------
- <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
 
 ---> TESTPOINT PASSED (psLogMsg functions{psLogSetDestination()} | tst_psLogMsg03.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1198)
@@ -5,5 +5,5 @@
 \**********************************************************************************/
 
- <DATE> <TIME> <HOST> |I|TPCheckBufferPo|psAlloc shall allocate memory blocks writeable by caller.
+ <DATE> <TIME> |<HOST>|I|TPCheckBufferPo|psAlloc shall allocate memory blocks writeable by caller.
 
 ---> TESTPOINT PASSED (psMemory{checkBufferPositive} | 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|TPOutOfMemoryEx|Custom MemExhaustedCallback was invoked.
- <DATE> <TIME> <HOST> |A|      p_psAlloc|Failed to allocate 4294966295 bytes at tst_psMemory.c:208
+ <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:208
 
 ---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
@@ -27,6 +27,6 @@
 \**********************************************************************************/
 
- <DATE> <TIME> <HOST> |I|TPReallocOutOfM|Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
- <DATE> <TIME> <HOST> |A|    p_psRealloc|Failed to reallocate -1001 bytes at tst_psMemory.c:173
+ <DATE> <TIME> |<HOST>|I|TPReallocOutOfM|Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
+ <DATE> <TIME> |<HOST>|A|    p_psRealloc|Failed to reallocate -1001 bytes at tst_psMemory.c:173
 
 ---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
@@ -38,7 +38,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{psRealloc} | tst_psMemory.c)
@@ -50,12 +50,12 @@
 \**********************************************************************************/
 
- <DATE> <TIME> <HOST> |I|TPallocCallback|call to psAlloc/psRealloc shall generate a callback if specified memory ID is 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|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
+ <DATE> <TIME> |<HOST>|I|TPallocCallback|call to psAlloc/psRealloc shall generate a callback if specified memory ID is 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|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
 
 ---> TESTPOINT PASSED (psMemory{allocCallback} | tst_psMemory.c)
@@ -67,14 +67,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:358  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:388  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:416  16
@@ -89,8 +89,8 @@
 \**********************************************************************************/
 
- <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|psMemCheckCorru|psMemCheckCorruption: memory block 1 is corrupted (buffer underflow)
- <DATE> <TIME> <HOST> |I|memProblemCallb|memory callback called for id 1 (psMemCheckCorruption:220).
+ <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|psMemCheckCorru|psMemCheckCorruption: memory block 1 is corrupted (buffer underflow)
+ <DATE> <TIME> |<HOST>|I|memProblemCallb|memory callback called for id 1 (psMemCheckCorruption:220).
 
 ---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
@@ -102,6 +102,6 @@
 \**********************************************************************************/
 
- <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.
+ <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{freeReferencedMemory} | tst_psMemory.c)
Index: trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1196)
+++ trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1198)
@@ -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)