Index: /trunk/psLib/psLib.kdevses
===================================================================
--- /trunk/psLib/psLib.kdevses	(revision 1760)
+++ /trunk/psLib/psLib.kdevses	(revision 1761)
@@ -2,15 +2,30 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="2" >
-  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psSysUtilsErrors.dat" >
-   <View0 line="19" Type="???" >
-    <AdditionalSettings Top="2" Width="1214" Attach="1" Height="778" Left="2" MinMaxMode="0" />
+ <DocsAndViews NumberOfDocuments="5" >
+  <Doc0 NumberOfViews="1" URL="file:/home/desonia/psLib/src/collections/psCollectionsErrors.dat" >
+   <View0 line="8" Type="???" >
+    <AdditionalSettings Top="2" Width="1229" Attach="1" Height="705" Left="2" MinMaxMode="0" />
    </View0>
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/psMemory.c" >
-   <View0 line="530" Type="???" >
-    <AdditionalSettings Top="2" Width="1214" Attach="1" Height="778" Left="2" MinMaxMode="0" />
+  <Doc1 NumberOfViews="1" URL="file:/home/desonia/psLib/src/collections/Makefile" >
+   <View0 line="62" Type="???" >
+    <AdditionalSettings Top="2" Width="1229" Attach="1" Height="705" Left="2" MinMaxMode="0" />
    </View0>
   </Doc1>
+  <Doc2 NumberOfViews="1" URL="file:/home/desonia/psLib/src/sysUtils/Makefile" >
+   <View0 line="55" Type="???" >
+    <AdditionalSettings Top="2" Width="1229" Attach="1" Height="705" Left="2" MinMaxMode="0" />
+   </View0>
+  </Doc2>
+  <Doc3 NumberOfViews="1" URL="file:/home/desonia/psLib/src/collections/psVector.c" >
+   <View0 line="39" Type="???" >
+    <AdditionalSettings Top="2" Width="1229" Attach="1" Height="705" Left="2" MinMaxMode="0" />
+   </View0>
+  </Doc3>
+  <Doc4 NumberOfViews="1" URL="file:/home/desonia/psLib/src/collections/psCollectionsErrors.h" >
+   <View0 line="0" Type="???" >
+    <AdditionalSettings Top="2" Width="1229" Attach="1" Height="705" Left="2" MinMaxMode="0" />
+   </View0>
+  </Doc4>
  </DocsAndViews>
  <pluginList>
Index: /trunk/psLib/src/collections/Makefile
===================================================================
--- /trunk/psLib/src/collections/Makefile	(revision 1760)
+++ /trunk/psLib/src/collections/Makefile	(revision 1761)
@@ -3,6 +3,6 @@
 ##  Makefile:   collections
 ##
-##  $Revision: 1.28 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-08-09 20:29:43 $
+##  $Revision: 1.29 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-09-09 21:59:03 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,4 +40,7 @@
 OBJS = $(addprefix makedir/,$(SRC_OBJS))
 
+HEADERS = $(SRC_OBJS:.o=.h)
+
+
 # Define PHONY target "all" which will make all the necessary items
 
@@ -54,5 +57,8 @@
 
 install: $(TARGET_STATIC)
-	install *.h $(includedir)
+	install $(HEADERS) $(includedir)
+
+psCollectionsErrors.h: psCollectionsErrors.dat
+	perl ../parseErrorCodes.pl --data=$? $@
 
 # Define PHONY target "distclean" which will cleanup the distribution
Index: /trunk/psLib/src/collections/psVector.c
===================================================================
--- /trunk/psLib/src/collections/psVector.c	(revision 1760)
+++ /trunk/psLib/src/collections/psVector.c	(revision 1761)
@@ -8,16 +8,12 @@
 *
 *  @author Ross Harman, MHPCC
-*
-*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 23:34:57 $
+*  @author Robert DeSonia, MHPCC
+*
+*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-09 21:59:03 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
 */
 
-/******************************************************************************/
-
-/*  INCLUDE FILES                                                             */
-
-/******************************************************************************/
 #include <string.h>                        // for memcpy
 #include <stdlib.h>
@@ -29,49 +25,10 @@
 #include "psLogMsg.h"
 #include "psCompare.h"
-
-/******************************************************************************/
-
-/*  DEFINE STATEMENTS                                                         */
-
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-
-/*  TYPE DEFINITIONS                                                          */
-
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-
-/*  GLOBAL VARIABLES                                                         */
-
-/*****************************************************************************/
-
-// None
-
-/*****************************************************************************/
-
-/*  FILE STATIC VARIABLES                                                    */
-
-/*****************************************************************************/
-
-// None
-
-/*****************************************************************************/
-
-/*  FUNCTION IMPLEMENTATION - LOCAL                                          */
-
-/*****************************************************************************/
+#include "psCollectionsErrors.h"
+
 static void vectorFree(psVector* restrict psVec);
 
-/*****************************************************************************/
-
-/* FUNCTION IMPLEMENTATION - PUBLIC                                          */
-
-/*****************************************************************************/
+// FUNCTION IMPLEMENTATION - PUBLIC
+
 psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType)
 {
Index: /trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.c	(revision 1760)
+++ /trunk/psLib/src/mathtypes/psVector.c	(revision 1761)
@@ -8,16 +8,12 @@
 *
 *  @author Ross Harman, MHPCC
-*
-*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-09 23:34:57 $
+*  @author Robert DeSonia, MHPCC
+*
+*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-09 21:59:03 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
 */
 
-/******************************************************************************/
-
-/*  INCLUDE FILES                                                             */
-
-/******************************************************************************/
 #include <string.h>                        // for memcpy
 #include <stdlib.h>
@@ -29,49 +25,10 @@
 #include "psLogMsg.h"
 #include "psCompare.h"
-
-/******************************************************************************/
-
-/*  DEFINE STATEMENTS                                                         */
-
-/******************************************************************************/
-
-// None
-
-/******************************************************************************/
-
-/*  TYPE DEFINITIONS                                                          */
-
-/******************************************************************************/
-
-// None
-
-/*****************************************************************************/
-
-/*  GLOBAL VARIABLES                                                         */
-
-/*****************************************************************************/
-
-// None
-
-/*****************************************************************************/
-
-/*  FILE STATIC VARIABLES                                                    */
-
-/*****************************************************************************/
-
-// None
-
-/*****************************************************************************/
-
-/*  FUNCTION IMPLEMENTATION - LOCAL                                          */
-
-/*****************************************************************************/
+#include "psCollectionsErrors.h"
+
 static void vectorFree(psVector* restrict psVec);
 
-/*****************************************************************************/
-
-/* FUNCTION IMPLEMENTATION - PUBLIC                                          */
-
-/*****************************************************************************/
+// FUNCTION IMPLEMENTATION - PUBLIC
+
 psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType)
 {
Index: /trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.c	(revision 1760)
+++ /trunk/psLib/src/sys/psLogMsg.c	(revision 1761)
@@ -12,6 +12,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 21:22:47 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 21:59:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -302,4 +302,5 @@
         psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, fmt);
         level = (level < 0) ? 0 : 9;
+        clevel = level + '0';
         break;
     }
@@ -327,14 +328,9 @@
         head_ptr += strlen(head_ptr);
     }
-    // The name field must be 15 characters.
     if (logName) {
         if (head_ptr > head) {
             *head_ptr++ = '|';
         }
-        if (strlen(name) > 15) {
-            maxLength -= snprintf(head_ptr, maxLength, "+%14.14s", &name[strlen(name)-14]);
-        } else {
-            maxLength -= snprintf(head_ptr, maxLength, "%15.15s", name);
-        }
+        maxLength -= snprintf(head_ptr, maxLength, "%s", name);
 
         head_ptr += strlen(head_ptr);
@@ -342,5 +338,5 @@
 
     if (head_ptr > head) {
-        *head_ptr++ = '|';
+        *head_ptr++ = '\n';
     } else if (!logMsg) {                  // no output desired
         return;
@@ -350,7 +346,13 @@
     fputs(head, logDest);
     if (logMsg) {
-        vfprintf(logDest, fmt, ap);
-        if (fmt[strlen(fmt) - 1] != '\n') {
-            fputc('\n', logDest);
+        char msg[1024];
+        char* msgPtr;
+        vsnprintf(msg,1024, fmt, ap);  // create message
+
+        // detect multiple lines in message and indent each line by 4 spaces.
+        char* line = strtok_r(msg,"\n",&msgPtr);
+        while (line != NULL) {
+            fprintf(logDest,"    %s\n",line);
+            line = strtok_r(NULL,"\n",&msgPtr);
         }
     } else {
Index: /trunk/psLib/src/sysUtils/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.c	(revision 1760)
+++ /trunk/psLib/src/sysUtils/psLogMsg.c	(revision 1761)
@@ -12,6 +12,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 21:22:47 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 21:59:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -302,4 +302,5 @@
         psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, fmt);
         level = (level < 0) ? 0 : 9;
+        clevel = level + '0';
         break;
     }
@@ -327,14 +328,9 @@
         head_ptr += strlen(head_ptr);
     }
-    // The name field must be 15 characters.
     if (logName) {
         if (head_ptr > head) {
             *head_ptr++ = '|';
         }
-        if (strlen(name) > 15) {
-            maxLength -= snprintf(head_ptr, maxLength, "+%14.14s", &name[strlen(name)-14]);
-        } else {
-            maxLength -= snprintf(head_ptr, maxLength, "%15.15s", name);
-        }
+        maxLength -= snprintf(head_ptr, maxLength, "%s", name);
 
         head_ptr += strlen(head_ptr);
@@ -342,5 +338,5 @@
 
     if (head_ptr > head) {
-        *head_ptr++ = '|';
+        *head_ptr++ = '\n';
     } else if (!logMsg) {                  // no output desired
         return;
@@ -350,7 +346,13 @@
     fputs(head, logDest);
     if (logMsg) {
-        vfprintf(logDest, fmt, ap);
-        if (fmt[strlen(fmt) - 1] != '\n') {
-            fputc('\n', logDest);
+        char msg[1024];
+        char* msgPtr;
+        vsnprintf(msg,1024, fmt, ap);  // create message
+
+        // detect multiple lines in message and indent each line by 4 spaces.
+        char* line = strtok_r(msg,"\n",&msgPtr);
+        while (line != NULL) {
+            fprintf(logDest,"    %s\n",line);
+            line = strtok_r(NULL,"\n",&msgPtr);
         }
     } else {
Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat
===================================================================
--- /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat	(revision 1760)
+++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat	(revision 1761)
@@ -25,5 +25,5 @@
 # Error Messages from psString.c:
 #
-psString_NCHAR_NEGATIVE                        Can not copy a negative number of characters (%d).
+psString_NCHAR_NEGATIVE                Can not copy a negative number of characters (%d).
 #
 # Error Messages from psTrace.c:
Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.h
===================================================================
--- /trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 1760)
+++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 1761)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 02:24:18 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 21:59:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,5 +27,5 @@
  */
 
-#define PS_ERRORNAME_DOMAIN "psLib.sysUtils"
+#define PS_ERRORNAME_DOMAIN "psLib.sysUtils."
 
 //~Start #define PS_ERRORTEXT_$1 "$2"
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1760)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stderr	(revision 1761)
@@ -1,6 +1,12 @@
-<DATE><TIME>|<HOST>|E|+dataReadHeader|Null fileName not allowed
-<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while opening file: missing.dat could not open the named file
-<DATE><TIME>|<HOST>|E|+dataReadHeader|Couldn't close FITS file. FITS error: NULL input pointer
-<DATE><TIME>|<HOST>|E|+dataReadHeader|Null extName and extNum = 0 not allowed
-<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while locating header 22: tried to move past end of file
-<DATE><TIME>|<HOST>|E|+dataReadHeader|FITS error while locating header AARGH: illegal HDU number
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    Null fileName not allowed
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    FITS error while opening file: missing.dat could not open the named file
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    Couldn't close FITS file. FITS error: NULL input pointer
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    Null extName and extNum = 0 not allowed
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    FITS error while locating header 22: tried to move past end of file
+<DATE><TIME>|<HOST>|E|psMetadataReadHeader
+    FITS error while locating header AARGH: illegal HDU number
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1760)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1761)
@@ -1,4 +1,8 @@
-<DATE><TIME>|<HOST>|E|+dataItemAllocV|Null value for name not allowed
-<DATE><TIME>|<HOST>|E|+dataItemAllocV|Invalid psMetadataType: 6
-<DATE><TIME>|<HOST>|E|+etadataAddItem|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+etadataAddItem|Null metadata item not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
+    Null value for name not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
+    Invalid psMetadataType: 6
+<DATE><TIME>|<HOST>|E|psMetadataAddItem
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataAddItem
+    Null metadata item not allowed
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1760)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 1761)
@@ -1,3 +1,6 @@
-<DATE><TIME>|<HOST>|E|+MetadataRemove|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+MetadataRemove|Couldn't find metadata item. Name: AARGH
-<DATE><TIME>|<HOST>|E|+MetadataRemove|Couldn't find metadata item in list. Index: 22
+<DATE><TIME>|<HOST>|E|psMetadataRemove
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataRemove
+    Couldn't find metadata item. Name: AARGH
+<DATE><TIME>|<HOST>|E|psMetadataRemove
+    Couldn't find metadata item in list. Index: 22
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1760)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 1761)
@@ -1,4 +1,8 @@
-<DATE><TIME>|<HOST>|E|+MetadataLookup|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+MetadataLookup|Null key name not allowed
-<DATE><TIME>|<HOST>|E|  psMetadataGet|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|  psMetadataGet|Couldn't find metadata item with given index. Index: 22
+<DATE><TIME>|<HOST>|E|psMetadataLookup
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataLookup
+    Null key name not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGet
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGet
+    Couldn't find metadata item with given index. Index: 22
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1760)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 1761)
@@ -1,6 +1,12 @@
-<DATE><TIME>|<HOST>|E|+ataSetIterator|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+etadataGetNext|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+ataGetPrevious|Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|+adataItemPrint|Null file descriptor not allowed
-<DATE><TIME>|<HOST>|E|+adataItemPrint|Null format not allowed
-<DATE><TIME>|<HOST>|E|+adataItemPrint|Null metadata not allowed
+<DATE><TIME>|<HOST>|E|psMetadataSetIterator
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGetNext
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataGetPrevious
+    Null metadata collection not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+    Null file descriptor not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+    Null format not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint
+    Null metadata not allowed
Index: /trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 1760)
+++ /trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 1761)
@@ -1,7 +1,14 @@
-<DATE><TIME>|<HOST>|E|    psISOToTime|Month must have a value from 1 to 12. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Day must have a value from 1 to 31. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Hour must have a value from 0 to 23. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Minute must have a value from 0 to 59. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Second must have a value from 0 to 59. Value: 99
-<DATE><TIME>|<HOST>|E|    psISOToTime|Millisecond must have a value from 0 to 999. Value: -999
-<DATE><TIME>|<HOST>|E|psTimevalToTime|NULL value not allowed
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Month must have a value from 1 to 12. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Day must have a value from 1 to 31. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Hour must have a value from 0 to 23. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Minute must have a value from 0 to 59. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Second must have a value from 0 to 59. Value: 99
+<DATE><TIME>|<HOST>|E|psISOToTime
+    Millisecond must have a value from 0 to 999. Value: -999
+<DATE><TIME>|<HOST>|E|psTimevalToTime
+    NULL value not allowed
Index: /trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr	(revision 1760)
+++ /trunk/psLib/test/collections/verified/tst_psBitSet_01.stderr	(revision 1761)
@@ -1,6 +1,12 @@
-<DATE><TIME>|<HOST>|E|   psBitSetTest| : Line <LINENO> - Bit position too small: -4
-<DATE><TIME>|<HOST>|E|   psBitSetTest| : Line <LINENO> - Bit position too large: 200
-<DATE><TIME>|<HOST>|E|   psBitSetTest| : Line <LINENO> - Null psBitSet for inBitSet argument
-<DATE><TIME>|<HOST>|E|    psBitSetSet| : Line <LINENO> - Bit position too small: -4
-<DATE><TIME>|<HOST>|E|    psBitSetSet| : Line <LINENO> - Bit position too large: 200
-<DATE><TIME>|<HOST>|E|    psBitSetSet| : Line <LINENO> - Null psBitSet for inBitSet argument
+<DATE><TIME>|<HOST>|E|psBitSetTest
+     : Line <LINENO> - Bit position too small: -4
+<DATE><TIME>|<HOST>|E|psBitSetTest
+     : Line <LINENO> - Bit position too large: 200
+<DATE><TIME>|<HOST>|E|psBitSetTest
+     : Line <LINENO> - Null psBitSet for inBitSet argument
+<DATE><TIME>|<HOST>|E|psBitSetSet
+     : Line <LINENO> - Bit position too small: -4
+<DATE><TIME>|<HOST>|E|psBitSetSet
+     : Line <LINENO> - Bit position too large: 200
+<DATE><TIME>|<HOST>|E|psBitSetSet
+     : Line <LINENO> - 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 1760)
+++ /trunk/psLib/test/collections/verified/tst_psBitSet_05.stderr	(revision 1761)
@@ -1,1 +1,2 @@
-<DATE><TIME>|<HOST>|E|     psBitSetOp| : Line <LINENO> - psBitSet sizes not the same
+<DATE><TIME>|<HOST>|E|psBitSetOp
+     : Line <LINENO> - 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 1760)
+++ /trunk/psLib/test/collections/verified/tst_psBitSet_06.stderr	(revision 1761)
@@ -1,2 +1,4 @@
-<DATE><TIME>|<HOST>|E|     psBitSetOp| : Line <LINENO> - Invalid psBitMask binary operation: ZZXOR
-<DATE><TIME>|<HOST>|E|  psBitSetAlloc| : Line <LINENO> - Allocation size must be > 0: size = -4
+<DATE><TIME>|<HOST>|E|psBitSetOp
+     : Line <LINENO> - Invalid psBitMask binary operation: ZZXOR
+<DATE><TIME>|<HOST>|E|psBitSetAlloc
+     : Line <LINENO> - Allocation size must be > 0: size = -4
Index: /trunk/psLib/test/collections/verified/tst_psBitSet_08.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psBitSet_08.stderr	(revision 1760)
+++ /trunk/psLib/test/collections/verified/tst_psBitSet_08.stderr	(revision 1761)
@@ -1,1 +1,2 @@
-<DATE><TIME>|<HOST>|E|    psBitSetNot| : Line <LINENO> - Null psBitSet for inBitSet argument
+<DATE><TIME>|<HOST>|E|psBitSetNot
+     : Line <LINENO> - Null psBitSet for inBitSet argument
Index: /trunk/psLib/test/collections/verified/tst_psList.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1760)
+++ /trunk/psLib/test/collections/verified/tst_psList.stderr	(revision 1761)
@@ -5,5 +5,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testListAlloc|psListAlloc shall create a psList with either 0 or 1 element.
+<DATE><TIME>|<HOST>|I|testListAlloc
+    psListAlloc shall create a psList with either 0 or 1 element.
 
 ---> TESTPOINT PASSED (psList{psListAlloc} | tst_psList.c)
@@ -15,9 +16,14 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|    testListAdd|psListAdd shall add an element to list
-<DATE><TIME>|<HOST>|I|    testListAdd|Following should error with invalid insert location
-<DATE><TIME>|<HOST>|W|      psListAdd|The given insert location (-10) for psListAdd is invalid.
-<DATE><TIME>|<HOST>|I|    testListAdd|Following should be a warning.
-<DATE><TIME>|<HOST>|W|      psListAdd|Invalid index 9 (only 6 elements in psList); assuming tail.
+<DATE><TIME>|<HOST>|I|testListAdd
+    psListAdd shall add an element to list
+<DATE><TIME>|<HOST>|I|testListAdd
+    Following should error with invalid insert location
+<DATE><TIME>|<HOST>|W|psListAdd
+    The given insert location (-10) for psListAdd is invalid.
+<DATE><TIME>|<HOST>|I|testListAdd
+    Following should be a warning.
+<DATE><TIME>|<HOST>|W|psListAdd
+    Invalid index 9 (only 6 elements in psList); assuming tail.
 
 ---> TESTPOINT PASSED (psList{psListAdd} | tst_psList.c)
@@ -29,6 +35,8 @@
 \**********************************************************************************/
 
-<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>|I|testListGet
+    Following should be an error
+<DATE><TIME>|<HOST>|E|listSetIterator
+    Unexpected null pointer for psList parameter (psList.c:<LINENO>).
 
 ---> TESTPOINT PASSED (psList{psListGet} | tst_psList.c)
@@ -40,14 +48,24 @@
 \**********************************************************************************/
 
-<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>|I| testListRemove|Next message should be an error
-<DATE><TIME>|<HOST>|E|   psListRemove|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|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|Failed to find item in given psList.
-<DATE><TIME>|<HOST>|I| testListRemove|Next message should be an error
-<DATE><TIME>|<HOST>|E|   psListRemove|Failed to find item in given psList.
+<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>|I|testListRemove
+    Next message should be an error
+<DATE><TIME>|<HOST>|E|psListRemove
+    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
+    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
+    Failed to find item in given psList.
+<DATE><TIME>|<HOST>|I|testListRemove
+    Next message should be an error
+<DATE><TIME>|<HOST>|E|psListRemove
+    Failed to find item in given psList.
 
 ---> TESTPOINT PASSED (psList{psListRemove} | tst_psList.c)
@@ -68,9 +86,14 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stListIterator| psListSetIterator/psListGetNext/psListGetPrev shall move the list cursor to the specified location
-<DATE><TIME>|<HOST>|I|+stListIterator|Following should error with 'Unexpected null pointer'
-<DATE><TIME>|<HOST>|E|listSetIterator|Unexpected null pointer for psList parameter (psList.c:<LINENO>).
-<DATE><TIME>|<HOST>|I|+stListIterator|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.
+<DATE><TIME>|<HOST>|I|testListIterator
+     psListSetIterator/psListGetNext/psListGetPrev shall move the list cursor to the specified location
+<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>|I|testListIterator
+    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.
 
 ---> TESTPOINT PASSED (psList{psListIterator} | tst_psList.c)
Index: /trunk/psLib/test/collections/verified/tst_psVector.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 1760)
+++ /trunk/psLib/test/collections/verified/tst_psVector.stderr	(revision 1761)
@@ -1,4 +1,8 @@
-<DATE><TIME>|<HOST>|I|           main|Following should be an error message.
-<DATE><TIME>|<HOST>|E|  psVectorAlloc|Invalid value for nalloc. nalloc: 0
-<DATE><TIME>|<HOST>|I|           main|Following should be an error message.
-<DATE><TIME>|<HOST>|E|psVectorRealloc|Null input vector
+<DATE><TIME>|<HOST>|I|main
+    Following should be an error message.
+<DATE><TIME>|<HOST>|E|psVectorAlloc
+    Invalid value for nalloc. nalloc: 0
+<DATE><TIME>|<HOST>|I|main
+    Following should be an error message.
+<DATE><TIME>|<HOST>|E|psVectorRealloc
+    Null input vector
Index: /trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr	(revision 1760)
+++ /trunk/psLib/test/collections/verified/tst_psVectorSort_03.stderr	(revision 1761)
@@ -1,2 +1,4 @@
-<DATE><TIME>|<HOST>|E|   psVectorSort| : Line <LINENO> - Input and output vector sizes are not equal: in=5 out=6
-<DATE><TIME>|<HOST>|E|   psVectorSort| : Line <LINENO> - Input and output vectors are not same type: in=1028 out=1032
+<DATE><TIME>|<HOST>|E|psVectorSort
+     : Line <LINENO> - Input and output vector sizes are not equal: in=5 out=6
+<DATE><TIME>|<HOST>|E|psVectorSort
+     : Line <LINENO> - Input and output vectors are not same type: in=1028 out=1032
Index: /trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr
===================================================================
--- /trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 1760)
+++ /trunk/psLib/test/collections/verified/tst_psVectorSort_04.stderr	(revision 1761)
@@ -1,1 +1,2 @@
-<DATE><TIME>|<HOST>|E|   psVectorSort| : Line <LINENO> - Null input vector
+<DATE><TIME>|<HOST>|E|psVectorSort
+     : Line <LINENO> - Null input vector
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrix02.stderr	(revision 1761)
@@ -1,6 +1,12 @@
-<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: Pointer to inImage is same as outImage.
-<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: inImage not PS_TYPE_F64.
-<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: inImage not square array.
-<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: outImage not PS_TYPE_F64.
-<DATE><TIME>|<HOST>|E|+atrixTranspose|Invalid operation: outImage not square array.
+<DATE><TIME>|<HOST>|E|psMatrixTranspose
+    Invalid operation: Pointer to inImage is same as outImage.
+<DATE><TIME>|<HOST>|E|psMatrixTranspose
+    Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixTranspose
+    Invalid operation: inImage not PS_TYPE_F64.
+<DATE><TIME>|<HOST>|E|psMatrixTranspose
+    Invalid operation: inImage not square array.
+<DATE><TIME>|<HOST>|E|psMatrixTranspose
+    Invalid operation: outImage not PS_TYPE_F64.
+<DATE><TIME>|<HOST>|E|psMatrixTranspose
+    Invalid operation: outImage not square array.
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrix03.stderr	(revision 1761)
@@ -1,3 +1,6 @@
-<DATE><TIME>|<HOST>|E|    psMatrixLUD|Invalid operation: inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixLUSolve|Invalid operation: inVector or its data is NULL.
-<DATE><TIME>|<HOST>|E|psMatrixLUSolve|Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixLUD
+    Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve
+    Invalid operation: inVector or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixLUSolve
+    Invalid operation: inImage or its data is NULL.
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr	(revision 1761)
@@ -1,2 +1,4 @@
-<DATE><TIME>|<HOST>|E| psMatrixInvert|Invalid operation: inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E| psMatrixInvert|Invalid operation: determinant argument is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixInvert
+    Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixInvert
+    Invalid operation: determinant argument is NULL.
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrix07.stderr	(revision 1761)
@@ -1,3 +1,6 @@
-<DATE><TIME>|<HOST>|E|+MatrixToVector|Invalid operation: inImage or its data is NULL.
-<DATE><TIME>|<HOST>|E|+MatrixToVector|Image does not have dim with 1 col or 1 row: (2 x 2).
-<DATE><TIME>|<HOST>|E|+VectorToMatrix|Invalid operation: inVector or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixToVector
+    Invalid operation: inImage or its data is NULL.
+<DATE><TIME>|<HOST>|E|psMatrixToVector
+    Image does not have dim with 1 col or 1 row: (2 x 2).
+<DATE><TIME>|<HOST>|E|psVectorToMatrix
+    Invalid operation: inVector or its data is NULL.
Index: /trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psMatrixVectorArithmetic03.stderr	(revision 1761)
@@ -1,27 +1,54 @@
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null out argument
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null in1 argument
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null in2 argument
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Null op argument
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Null out argument
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Null in argument
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Null op argument
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Line <LINENO> - Element types for arguments inconsistent: (1028, 1032, 1032)
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Element types for arguments inconsistent: (1028, 1032)
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Inconsistent element count: 2 vs 3
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Line <LINENO> - Dimensionality for arguments inconsistent: (1, 3)
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|       psNanDiv|: Divide by zero
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Minimum operation not supported for complex numbers
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Maximum operation not supported for complex numbers
-<DATE><TIME>|<HOST>|E|     psBinaryOp|: Invalid operation: yarg
-<DATE><TIME>|<HOST>|E|      psUnaryOp|: Invalid operation: yarg
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - Null out argument
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - Null in1 argument
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - Null in2 argument
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - Null op argument
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Line <LINENO> - Null out argument
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Line <LINENO> - Null in argument
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Line <LINENO> - Null op argument
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Line <LINENO> - Element types for arguments inconsistent: (1028, 1032, 1032)
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Line <LINENO> - Element types for arguments inconsistent: (1028, 1032)
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Inconsistent element count: numRows: 2 vs 3 numCols: 2 vs 3
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Inconsistent element count: 2 vs 3
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Inconsistent element count: 2 vs 3
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Line <LINENO> - Dimensionality for arguments inconsistent: (1, 3)
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psNanDiv
+    : Divide by zero
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Minimum operation not supported for complex numbers
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Maximum operation not supported for complex numbers
+<DATE><TIME>|<HOST>|E|psBinaryOp
+    : Invalid operation: yarg
+<DATE><TIME>|<HOST>|E|psUnaryOp
+    : Invalid operation: yarg
Index: /trunk/psLib/test/dataManip/verified/tst_psStats07.stdout
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psStats07.stdout	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psStats07.stdout	(revision 1761)
@@ -16,5 +16,5 @@
 \**********************************************************************************/
 
-The expected Median was 32.00; the calculated Median was 32.49
+The expected Median was 32.00; the calculated Median was 32.79
 
 ---> TESTPOINT PASSED (psVector functions{PS_STAT_ROBUST_STATS: robust Median: no vector mask} | tst_psStats07.c)
@@ -46,5 +46,5 @@
 \**********************************************************************************/
 
-The expected LQ was 30.80; the calculated LQ was 30.02
+The expected LQ was 30.80; the calculated LQ was 30.32
 
 ---> TESTPOINT PASSED (psVector functions{PS_STAT_ROBUST_STATS: lower quartile: no vector mask} | tst_psStats07.c)
@@ -56,5 +56,5 @@
 \**********************************************************************************/
 
-The expected UQ was 33.20; the calculated UQ was 34.33
+The expected UQ was 33.20; the calculated UQ was 34.45
 
 ---> TESTPOINT PASSED (psVector functions{PS_STAT_ROBUST_STATS: lower quartile: no vector mask} | tst_psStats07.c)
Index: /trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr
===================================================================
--- /trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 1760)
+++ /trunk/psLib/test/dataManip/verified/tst_psVectorFFT.stderr	(revision 1761)
@@ -23,6 +23,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+tVectorComplex|Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E|psVectorComplex|The inputs to psVectorComplex must be the same type.
+<DATE><TIME>|<HOST>|I|testVectorComplex
+    Following should be an error (type mismatch).
+<DATE><TIME>|<HOST>|E|psVectorComplex
+    The inputs to psVectorComplex must be the same type.
 
 ---> TESTPOINT PASSED (psFFT{psVectorComplex} | tst_psVectorFFT.c)
Index: /trunk/psLib/test/image/verified/tst_psImage.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 1760)
+++ /trunk/psLib/test/image/verified/tst_psImage.stderr	(revision 1761)
@@ -5,44 +5,84 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I| testImageAlloc|#546 - psImageAlloc shall allocate memory for a psImage structure
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 101h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 102h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 104h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 108h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 301h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 302h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 304h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 308h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 404h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 408h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 808h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 810h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
-<DATE><TIME>|<HOST>|I| testImageAlloc|Testing psImage with type 0h
-<DATE><TIME>|<HOST>|I| testImageAlloc|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageAlloc|Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    #546 - psImageAlloc shall allocate memory for a psImage structure
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 101h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 102h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 104h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 108h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 301h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 302h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 304h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 308h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 404h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 408h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 808h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 810h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Testing psImage with type 0h
+<DATE><TIME>|<HOST>|I|testImageAlloc
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageAlloc
+    Invalid value for number of rows or columns (numRows=0, numCols=0).
 
 ---> TESTPOINT PASSED (psImage{psImageAlloc} | tst_psImage.c)
@@ -54,37 +94,70 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure contains expected values in the row member, if the input psImage structure image contains known values.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure members nrow and ncol are equal to the input parameter nrow and ncol respectively.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member type is equal to the input psImage structure member type.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure members row0 and col0 are equal to the input parameters row0 and col0 respectively.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member parent is equal to the input psImage structure pointer image.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member Nchildren is equal to zero.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure member children is null.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the input psImage structure image only has the following members changed: 1) Nchildren is increased by one. 2) parent contains pointer psImage structure out at parent[Nchildren-1].
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameter image is null. Also verified the input psImage structure is not modified.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because input image or its pixel buffer is NULL.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program  execution doesn't stop, if the input parameters nrow and/or ncol are zero. Also verify input psImage structure is not modified.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because number of rows or columns are zero (64x0).
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because number of rows or columns are zero (0x128).
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (128,0) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (0,256) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (-1,0) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image because col0,row0 (0,-1) is not a valid pixel location.
-<DATE><TIME>|<HOST>|I|testImageSubset|Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,0:<LINENO>]).
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image outside of image boundaries (size=128x256, subset=[0:<LINENO>,128:<LINENO>]).
-<DATE><TIME>|<HOST>|I|testImageSubset|An error should follow...
-<DATE><TIME>|<HOST>|E|  psImageSubset|Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,128:<LINENO>]).
-<DATE><TIME>|<HOST>|I|testImageSubset|psImageFreeChildren shall deallocate any children images of a psImage structure
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure contains expected values in the row member, if the input psImage structure image contains known values.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure members nrow and ncol are equal to the input parameter nrow and ncol respectively.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member type is equal to the input psImage structure member type.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure members row0 and col0 are equal to the input parameters row0 and col0 respectively.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member parent is equal to the input psImage structure pointer image.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member Nchildren is equal to zero.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure member children is null.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the input psImage structure image only has the following members changed: 1) Nchildren is increased by one. 2) parent contains pointer psImage structure out at parent[Nchildren-1].
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameter image is null. Also verified the input psImage structure is not modified.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because input image or its pixel buffer is NULL.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program  execution doesn't stop, if the input parameters nrow and/or ncol are zero. Also verify input psImage structure is not modified.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because number of rows or columns are zero (64x0).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because number of rows or columns are zero (0x128).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program execution doesn't stop, if the input parameters row0 and col0 are not within the range of values of psImage structure image.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (128,0) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (0,256) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (-1,0) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image because col0,row0 (0,-1) is not a valid pixel location.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    Verify the returned psImage structure pointer is null and program execution doesn't stop if the input parameters nrow, ncol, row0 and col0 specify a range of data not within the input psImage structure image.  Also verify the input psImage structure is not modified.
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,0:<LINENO>]).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image outside of image boundaries (size=128x256, subset=[0:<LINENO>,128:<LINENO>]).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageSubset
+    Can not subset image outside of image boundaries (size=128x256, subset=[64:<LINENO>,128:<LINENO>]).
+<DATE><TIME>|<HOST>|I|testImageSubset
+    psImageFreeChildren shall deallocate any children images of a psImage structure
 
 ---> TESTPOINT PASSED (psImage{psImageSubset} | tst_psImage.c)
@@ -96,14 +169,24 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psU8
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psU16
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psU32
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psS8
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psS16
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psS32
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psF32
-<DATE><TIME>|<HOST>|I|  testImageCopy|Image Copy Test for psF64
-<DATE><TIME>|<HOST>|I|  testImageCopy|An error should follow...
-<DATE><TIME>|<HOST>|E|    psImageCopy|Can not copy image because input image or its pixel buffer is NULL.
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psU8
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psU16
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psU32
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psS8
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psS16
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psS32
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psF32
+<DATE><TIME>|<HOST>|I|testImageCopy
+    Image Copy Test for psF64
+<DATE><TIME>|<HOST>|I|testImageCopy
+    An error should follow...
+<DATE><TIME>|<HOST>|E|psImageCopy
+    Can not copy image because input image or its pixel buffer is NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageCopy} | tst_psImage.c)
Index: /trunk/psLib/test/image/verified/tst_psImageExtraction.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 1760)
+++ /trunk/psLib/test/image/verified/tst_psImageExtraction.stderr	(revision 1761)
@@ -5,22 +5,40 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|Input image can not be NULL.
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The stat options didn't specify a single supported statistic type.
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|Invalid direction flag (5)
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified region contains no data (0x0)
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (2001,100 to 2001,100) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (200,1001 to 200,1001) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (200,100 to 2199,100) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The specified image region (200,100 to 200,1099) is outside of image area (0,0 to 1999,999).
-<DATE><TIME>|<HOST>|I| testImageSlice|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageSlice|The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    Input image can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    Invalid direction flag (5)
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified region contains no data (0x0)
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (2001,100 to 2001,100) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (200,1001 to 200,1001) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (200,100 to 2199,100) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The specified image region (200,100 to 200,1099) is outside of image area (0,0 to 1999,999).
+<DATE><TIME>|<HOST>|I|testImageSlice
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageSlice
+    The stat options didn't specify a single supported statistic type.
 
 ---> TESTPOINT PASSED (psImage{psImageSlice} | tst_psImageExtraction.c)
Index: /trunk/psLib/test/image/verified/tst_psImageFFT.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 1760)
+++ /trunk/psLib/test/image/verified/tst_psImageFFT.stderr	(revision 1761)
@@ -23,8 +23,12 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stImageComplex|Following should be an error (type mismatch).
-<DATE><TIME>|<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same type.
-<DATE><TIME>|<HOST>|I|+stImageComplex|Following should be an error (size mismatch).
-<DATE><TIME>|<HOST>|E| psImageComplex|The inputs to psImageComplex must be the same dimensions.
+<DATE><TIME>|<HOST>|I|testImageComplex
+    Following should be an error (type mismatch).
+<DATE><TIME>|<HOST>|E|psImageComplex
+    The inputs to psImageComplex must be the same type.
+<DATE><TIME>|<HOST>|I|testImageComplex
+    Following should be an error (size mismatch).
+<DATE><TIME>|<HOST>|E|psImageComplex
+    The inputs to psImageComplex must be the same dimensions.
 
 ---> TESTPOINT PASSED (psFFT{psImageComplex} | tst_psImageFFT.c)
Index: /trunk/psLib/test/image/verified/tst_psImageManip.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 1760)
+++ /trunk/psLib/test/image/verified/tst_psImageManip.stderr	(revision 1761)
@@ -5,17 +5,30 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testImageClip|psImageClip shall limit the minimum and maximum data value within a psImage structure
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of F64 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of F32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of S32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of S16 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of S8 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of U32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of U16 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of U8 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of C32 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Testing clipping of C64 imagery
-<DATE><TIME>|<HOST>|I|  testImageClip|Following should be an error (max<min)
-<DATE><TIME>|<HOST>|E|    psImageClip|psImageClip can not be invoked with max < min.
+<DATE><TIME>|<HOST>|I|testImageClip
+    psImageClip shall limit the minimum and maximum data value within a psImage structure
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of F64 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of F32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of S32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of S16 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of S8 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of U32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of U16 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of U8 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of C32 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Testing clipping of C64 imagery
+<DATE><TIME>|<HOST>|I|testImageClip
+    Following should be an error (max<min)
+<DATE><TIME>|<HOST>|E|psImageClip
+    psImageClip can not be invoked with max < min.
 
 ---> TESTPOINT PASSED (psImage{psImageClip} | tst_psImageManip.c)
@@ -27,5 +40,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stImageClipNAN|psImageClipNaN shall modified pixel values of NaN with a specified value
+<DATE><TIME>|<HOST>|I|testImageClipNAN
+    psImageClipNaN shall modified pixel values of NaN with a specified value
 
 ---> TESTPOINT PASSED (psImage{psImageClipNAN} | tst_psImageManip.c)
@@ -37,31 +51,58 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+pComplexRegion|psImageClipNaN shall modified pixel values of NaN with a specified value
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Testing clipping at 409.6+256i to 682.667+512i for psC32
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Testing clipping at 409.6+256i to 682.667+512i for psC64
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Can not perform clip on NULL image
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the real image space.
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the imaginary image space.
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|psImageClipComplexRegion can not be invoked with max < min in the real image space.
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (-6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (-0-6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmin (0+6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (-6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (6.80565e+38+0i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (-0-6.80565e+38i) is outside of image's psC32 pixel range
-<DATE><TIME>|<HOST>|I|+pComplexRegion|Following should be an error:
-<DATE><TIME>|<HOST>|E|+pComplexRegion|Specified vmax (0+6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    psImageClipNaN shall modified pixel values of NaN with a specified value
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Testing clipping at 409.6+256i to 682.667+512i for psC32
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Testing clipping at 409.6+256i to 682.667+512i for psC64
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Can not perform clip on NULL image
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    psImageClipComplexRegion can not be invoked with max < min in the real image space.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    psImageClipComplexRegion can not be invoked with max < min in the imaginary image space.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    psImageClipComplexRegion can not be invoked with max < min in the real image space.
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (-6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (-0-6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmin (0+6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (-6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (6.80565e+38+0i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (-0-6.80565e+38i) is outside of image's psC32 pixel range
+<DATE><TIME>|<HOST>|I|testImageClipComplexRegion
+    Following should be an error:
+<DATE><TIME>|<HOST>|E|psImageClipComplexRegion
+    Specified vmax (0+6.80565e+38i) is outside of image's psC32 pixel range
 
 ---> TESTPOINT PASSED (psImage{psImageClipComplexRegion} | tst_psImageManip.c)
@@ -73,10 +114,16 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as overlay isn't within image boundaries
-<DATE><TIME>|<HOST>|E|+OverlaySection|Overlay image (32,64 -> 159,319) is partially outside of the input image (128 x 256).
-<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as overlay is NULL
-<DATE><TIME>|<HOST>|E|+OverlaySection|one of the input images was NULL.
-<DATE><TIME>|<HOST>|I|+stImageOverlay|Following should error as image input is NULL
-<DATE><TIME>|<HOST>|E|+OverlaySection|one of the input images was NULL.
+<DATE><TIME>|<HOST>|I|testImageOverlay
+    Following should error as overlay isn't within image boundaries
+<DATE><TIME>|<HOST>|E|psImageOverlaySection
+    Overlay image (32,64 -> 159,319) is partially outside of the input image (128 x 256).
+<DATE><TIME>|<HOST>|I|testImageOverlay
+    Following should error as overlay is NULL
+<DATE><TIME>|<HOST>|E|psImageOverlaySection
+    one of the input images was NULL.
+<DATE><TIME>|<HOST>|I|testImageOverlay
+    Following should error as image input is NULL
+<DATE><TIME>|<HOST>|E|psImageOverlaySection
+    one of the input images was NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageOverlay} | tst_psImageManip.c)
@@ -88,15 +135,26 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|   psImageRebin|Input image is NULL.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The scale must be positive.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stats input can not be NULL.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
-<DATE><TIME>|<HOST>|I| testImageRebin|Following should be an error.
-<DATE><TIME>|<HOST>|E|   psImageRebin|The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    Input image is NULL.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The scale must be positive.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stats input can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stat options didn't specify a single supported statistic type.
+<DATE><TIME>|<HOST>|I|testImageRebin
+    Following should be an error.
+<DATE><TIME>|<HOST>|E|psImageRebin
+    The stat options didn't specify a single supported statistic type.
 
 ---> TESTPOINT PASSED (psImage{psImageRebin} | tst_psImageManip.c)
@@ -108,6 +166,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  testImageRoll|Following should generate an error.
-<DATE><TIME>|<HOST>|E|    psImageRoll|Input image can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageRoll
+    Following should generate an error.
+<DATE><TIME>|<HOST>|E|psImageRoll
+    Input image can not be NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageRoll} | tst_psImageManip.c)
@@ -119,6 +179,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|testImageRotate|Following should be an error
-<DATE><TIME>|<HOST>|E|  psImageRotate|The input image was NULL.
+<DATE><TIME>|<HOST>|I|testImageRotate
+    Following should be an error
+<DATE><TIME>|<HOST>|E|psImageRotate
+    The input image was NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageRotate} | tst_psImageManip.c)
@@ -130,23 +192,42 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,-16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32,-16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32,-16.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,16.4.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 0,-16.4.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.7,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.7,0.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.6,16.2.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of 32.6,-16.2.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.6,16.2.
-<DATE><TIME>|<HOST>|I|+ImageShiftCase|Testing psImageShift with a 64x128 image for a shift of -32.6,-16.2.
-<DATE><TIME>|<HOST>|I| testImageShift|Following should be an error...
-<DATE><TIME>|<HOST>|E|   psImageShift|Input image can not be NULL.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,-16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32,16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32,-16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32,16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32,-16.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,16.4.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 0,-16.4.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32.7,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32.7,0.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32.6,16.2.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of 32.6,-16.2.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32.6,16.2.
+<DATE><TIME>|<HOST>|I|testImageShiftCase
+    Testing psImageShift with a 64x128 image for a shift of -32.6,-16.2.
+<DATE><TIME>|<HOST>|I|testImageShift
+    Following should be an error...
+<DATE><TIME>|<HOST>|E|psImageShift
+    Input image can not be NULL.
 
 ---> TESTPOINT PASSED (psImage{psImageShift} | tst_psImageManip.c)
Index: /trunk/psLib/test/image/verified/tst_psImageStats01.stderr
===================================================================
--- /trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 1760)
+++ /trunk/psLib/test/image/verified/tst_psImageStats01.stderr	(revision 1761)
@@ -1,3 +1,6 @@
-<DATE><TIME>|<HOST>|E|   psImageStats|The input image can not be NULL.
-<DATE><TIME>|<HOST>|E|   psImageStats|The input psStats struct can not be NULL.
-<DATE><TIME>|<HOST>|E|   psImageStats|No statistic option/operation was specified.
+<DATE><TIME>|<HOST>|E|psImageStats
+    The input image can not be NULL.
+<DATE><TIME>|<HOST>|E|psImageStats
+    The input psStats struct can not be NULL.
+<DATE><TIME>|<HOST>|E|psImageStats
+    No statistic option/operation was specified.
Index: /trunk/psLib/test/sysUtils/verified/tst_psAbort.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psAbort.stderr	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psAbort.stderr	(revision 1761)
@@ -5,5 +5,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|    testAbort00|ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
+<DATE><TIME>|<HOST>|A|testAbort00
+    ALL TYPES intval = 1 longval = 2 floatval = 3.010000 charval = E strval = E R R O R
 
 ---> TESTPOINT PASSED (psAbort{Multiple type values in abort message} | tst_psAbort.c)
@@ -15,5 +16,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|       __LINE__|NO_VALUES
+<DATE><TIME>|<HOST>|A|__LINE__
+    NO_VALUES
 
 ---> TESTPOINT PASSED (psAbort{String values in abort message} | tst_psAbort.c)
@@ -25,5 +27,5 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|               |
+<DATE><TIME>|<HOST>|A|
 
 ---> TESTPOINT PASSED (psAbort{Empty strings in abort message} | tst_psAbort.c)
Index: /trunk/psLib/test/sysUtils/verified/tst_psError.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psError.stderr	(revision 1761)
@@ -5,5 +5,6 @@
 \**********************************************************************************/
 
-<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 +16,6 @@
 \**********************************************************************************/
 
-<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 +27,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_psLogMsg.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stderr	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stderr	(revision 1761)
@@ -5,8 +5,12 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|   testLogMsg00|Hello World!  My level is 0 0.000000 beep beep
-<DATE><TIME>|<HOST>|E|   testLogMsg00|Hello World!  My level is 1 1.000000 beep beep
-<DATE><TIME>|<HOST>|W|   testLogMsg00|Hello World!  My level is 2 2.000000 beep beep
-<DATE><TIME>|<HOST>|I|   testLogMsg00|Hello World!  My level is 3 3.000000 beep beep
+<DATE><TIME>|<HOST>|A|testLogMsg00
+    Hello World!  My level is 0 0.000000 beep beep
+<DATE><TIME>|<HOST>|E|testLogMsg00
+    Hello World!  My level is 1 1.000000 beep beep
+<DATE><TIME>|<HOST>|W|testLogMsg00
+    Hello World!  My level is 2 2.000000 beep beep
+<DATE><TIME>|<HOST>|I|testLogMsg00
+    Hello World!  My level is 3 3.000000 beep beep
 
 ---> TESTPOINT PASSED (psLogMsg{default log levels, printf-style strings} | tst_psLogMsg.c)
@@ -18,8 +22,12 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|   testLogMsg01|Hello World!  My level is 0 0.000000 beep beep
-<DATE><TIME>|<HOST>|E|   testLogMsg01|Hello World!  My level is 1 1.000000 beep beep
-<DATE><TIME>|<HOST>|W|   testLogMsg01|Hello World!  My level is 2 2.000000 beep beep
-<DATE><TIME>|<HOST>|I|   testLogMsg01|Hello World!  My level is 3 3.000000 beep beep
+<DATE><TIME>|<HOST>|A|testLogMsg01
+    Hello World!  My level is 0 0.000000 beep beep
+<DATE><TIME>|<HOST>|E|testLogMsg01
+    Hello World!  My level is 1 1.000000 beep beep
+<DATE><TIME>|<HOST>|W|testLogMsg01
+    Hello World!  My level is 2 2.000000 beep beep
+<DATE><TIME>|<HOST>|I|testLogMsg01
+    Hello World!  My level is 3 3.000000 beep beep
 
 ---> TESTPOINT PASSED (psLogMsg{default log levels, psVLogMsg()} | tst_psLogMsg.c)
@@ -31,15 +39,26 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|   testLogMsg02|Hello World!  My level is 0
-<DATE><TIME>|<HOST>|E|   testLogMsg02|Hello World!  My level is 1
-<DATE><TIME>|<HOST>|W|   testLogMsg02|Hello World!  My level is 2
-<DATE><TIME>|<HOST>|I|   testLogMsg02|Hello World!  My level is 3
-<DATE><TIME>|<HOST>|4|   testLogMsg02|Hello World!  My level is 4
-<DATE><TIME>|<HOST>|5|   testLogMsg02|Hello World!  My level is 5
-<DATE><TIME>|<HOST>|6|   testLogMsg02|Hello World!  My level is 6
-<DATE><TIME>|<HOST>|7|   testLogMsg02|Hello World!  My level is 7
-<DATE><TIME>|<HOST>|8|   testLogMsg02|Hello World!  My level is 8
-<DATE><TIME>|<HOST>|9|   testLogMsg02|Hello World!  My level is 9
-<DATE><TIME>|<HOST>|4|   testLogMsg02|This should  be displayed (level 4)
+<DATE><TIME>|<HOST>|A|testLogMsg02
+    Hello World!  My level is 0
+<DATE><TIME>|<HOST>|E|testLogMsg02
+    Hello World!  My level is 1
+<DATE><TIME>|<HOST>|W|testLogMsg02
+    Hello World!  My level is 2
+<DATE><TIME>|<HOST>|I|testLogMsg02
+    Hello World!  My level is 3
+<DATE><TIME>|<HOST>|4|testLogMsg02
+    Hello World!  My level is 4
+<DATE><TIME>|<HOST>|5|testLogMsg02
+    Hello World!  My level is 5
+<DATE><TIME>|<HOST>|6|testLogMsg02
+    Hello World!  My level is 6
+<DATE><TIME>|<HOST>|7|testLogMsg02
+    Hello World!  My level is 7
+<DATE><TIME>|<HOST>|8|testLogMsg02
+    Hello World!  My level is 8
+<DATE><TIME>|<HOST>|9|testLogMsg02
+    Hello World!  My level is 9
+<DATE><TIME>|<HOST>|4|testLogMsg02
+    This should  be displayed (level 4)
 
 ---> TESTPOINT PASSED (psLogMsg{psLogSetLevel()} | tst_psLogMsg.c)
@@ -52,39 +71,59 @@
 
 ------------- psLogSetFormat() -------------
-<DATE><TIME>|<HOST>|A|   testLogMsg03|Hello World!  My level is 0
-<DATE><TIME>|<HOST>|E|   testLogMsg03|Hello World!  My level is 1
-<DATE><TIME>|<HOST>|W|   testLogMsg03|Hello World!  My level is 2
-<DATE><TIME>|<HOST>|I|   testLogMsg03|Hello World!  My level is 3
+<DATE><TIME>|<HOST>|A|testLogMsg03
+    Hello World!  My level is 0
+<DATE><TIME>|<HOST>|E|testLogMsg03
+    Hello World!  My level is 1
+<DATE><TIME>|<HOST>|W|testLogMsg03
+    Hello World!  My level is 2
+<DATE><TIME>|<HOST>|I|testLogMsg03
+    Hello World!  My level is 3
 ------------- psLogSetFormat(NULL) -------------
 ------------- psLogSetFormat(T) -------------
-<DATE><TIME>|
-<DATE><TIME>|
-<DATE><TIME>|
-<DATE><TIME>|
+<DATE><TIME>
+
+<DATE><TIME>
+
+<DATE><TIME>
+
+<DATE><TIME>
+
 ------------- psLogSetFormat(H) -------------
-<HOST>|
-<HOST>|
-<HOST>|
-<HOST>|
+<HOST>
+<HOST>
+<HOST>
+<HOST>
 ------------- psLogSetFormat(L) -------------
-A|
-E|
-W|
-I|
+A
+
+E
+
+W
+
+I
+
 ------------- psLogSetFormat(N) -------------
-   testLogMsg03|
-   testLogMsg03|
-   testLogMsg03|
-   testLogMsg03|
+testLogMsg03
+
+testLogMsg03
+
+testLogMsg03
+
+testLogMsg03
+
 ------------- psLogSetFormat(M) -------------
-Hello World!  My level is 0
-Hello World!  My level is 1
-Hello World!  My level is 2
-Hello World!  My level is 3
+    Hello World!  My level is 0
+    Hello World!  My level is 1
+    Hello World!  My level is 2
+    Hello World!  My level is 3
 ------------- psLogSetFormat(THLNM) -------------
-<DATE><TIME>|<HOST>|A|   testLogMsg03|Hello World!  My level is 0
-<DATE><TIME>|<HOST>|E|   testLogMsg03|Hello World!  My level is 1
-<DATE><TIME>|<HOST>|W|   testLogMsg03|Hello World!  My level is 2
-<DATE><TIME>|<HOST>|I|   testLogMsg03|Hello World!  My level is 3
+<DATE><TIME>|<HOST>|A|testLogMsg03
+    Hello World!  My level is 0
+<DATE><TIME>|<HOST>|E|testLogMsg03
+    Hello World!  My level is 1
+<DATE><TIME>|<HOST>|W|testLogMsg03
+    Hello World!  My level is 2
+<DATE><TIME>|<HOST>|I|testLogMsg03
+    Hello World!  My level is 3
 
 ---> TESTPOINT PASSED (psLogMsg{psLogSetFormat()} | tst_psLogMsg.c)
@@ -96,10 +135,16 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A| Under 15 chars|Hello World!
-<DATE><TIME>|<HOST>|A|+ than 15 chars|Hello World!
-<DATE><TIME>|<HOST>|A|   testLogMsg04|Line #1
-<DATE><TIME>|<HOST>|A|   testLogMsg04|Line #2
-<DATE><TIME>|<HOST>|A|   testLogMsg04|Line #3
-<DATE><TIME>|<HOST>|A|   testLogMsg04|Line #4
+<DATE><TIME>|<HOST>|A|Under 15 chars
+    Hello World!
+<DATE><TIME>|<HOST>|A|This string is more than 15 chars
+    Hello World!
+<DATE><TIME>|<HOST>|A|testLogMsg04
+    Line #1
+<DATE><TIME>|<HOST>|A|testLogMsg04
+    Line #2
+<DATE><TIME>|<HOST>|A|testLogMsg04
+    Line #3
+<DATE><TIME>|<HOST>|A|testLogMsg04
+    Line #4
 
 ---> TESTPOINT PASSED (psLogMsg{Output Format} | tst_psLogMsg.c)
@@ -111,8 +156,12 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|A|   testLogMsg05|Hello World!  My level is 0
-<DATE><TIME>|<HOST>|E|   testLogMsg05|Hello World!  My level is 1
-<DATE><TIME>|<HOST>|W|   testLogMsg05|Hello World!  My level is 2
-<DATE><TIME>|<HOST>|I|   testLogMsg05|Hello World!  My level is 3
+<DATE><TIME>|<HOST>|A|testLogMsg05
+    Hello World!  My level is 0
+<DATE><TIME>|<HOST>|E|testLogMsg05
+    Hello World!  My level is 1
+<DATE><TIME>|<HOST>|W|testLogMsg05
+    Hello World!  My level is 2
+<DATE><TIME>|<HOST>|I|testLogMsg05
+    Hello World!  My level is 3
 
 ---> TESTPOINT PASSED (psLogMsg{psLogSetDestination()} | tst_psLogMsg.c)
Index: /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stdout	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psLogMsg.stdout	(revision 1761)
@@ -2,13 +2,21 @@
 ------------- psLogSetDestination(PS_LOG_TO_STDERR) -------------
 ------------- psLogSetDestination(PS_LOG_TO_STDOUT) -------------
-<DATE><TIME>|<HOST>|A|   testLogMsg05|Hello World!  My level is 0
-<DATE><TIME>|<HOST>|E|   testLogMsg05|Hello World!  My level is 1
-<DATE><TIME>|<HOST>|W|   testLogMsg05|Hello World!  My level is 2
-<DATE><TIME>|<HOST>|I|   testLogMsg05|Hello World!  My level is 3
+<DATE><TIME>|<HOST>|A|testLogMsg05
+    Hello World!  My level is 0
+<DATE><TIME>|<HOST>|E|testLogMsg05
+    Hello World!  My level is 1
+<DATE><TIME>|<HOST>|W|testLogMsg05
+    Hello World!  My level is 2
+<DATE><TIME>|<HOST>|I|testLogMsg05
+    Hello World!  My level is 3
 --------------- psLogSetDestination(file:log.txt) ---------------
 --------------------- The Contents of log.txt -------------------
-<DATE><TIME>|<HOST>|A|   testLogMsg05|Hello World!  My level is 0
-<DATE><TIME>|<HOST>|E|   testLogMsg05|Hello World!  My level is 1
-<DATE><TIME>|<HOST>|W|   testLogMsg05|Hello World!  My level is 2
-<DATE><TIME>|<HOST>|I|   testLogMsg05|Hello World!  My level is 3
+<DATE><TIME>|<HOST>|A|testLogMsg05
+    Hello World!  My level is 0
+<DATE><TIME>|<HOST>|E|testLogMsg05
+    Hello World!  My level is 1
+<DATE><TIME>|<HOST>|W|testLogMsg05
+    Hello World!  My level is 2
+<DATE><TIME>|<HOST>|I|testLogMsg05
+    Hello World!  My level is 3
 --------------- psLogSetDestination(file:/eva/log.txt) ----------
Index: /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 1761)
@@ -5,5 +5,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+BufferPositive|psAlloc shall allocate memory blocks writeable by caller.
+<DATE><TIME>|<HOST>|I|TPCheckBufferPositive
+    psAlloc shall allocate memory blocks writeable by caller.
 
 ---> TESTPOINT PASSED (psMemory{checkBufferPositive} | tst_psMemory.c)
@@ -15,7 +16,10 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|  TPOutOfMemory|Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
-<DATE><TIME>|<HOST>|I|+austedCallback|Custom MemExhaustedCallback was invoked.
-<DATE><TIME>|<HOST>|A|      p_psAlloc|Failed to allocate <N> bytes at tst_psMemory.c:<LINENO>
+<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 <N> bytes at tst_psMemory.c:<LINENO>
 
 ---> TESTPOINT PASSED (psMemory{outOfMemory} | tst_psMemory.c)
@@ -27,6 +31,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+locOutOfMemory|Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
-<DATE><TIME>|<HOST>|A|    p_psRealloc|Failed to reallocate <N> bytes at tst_psMemory.c:<LINENO>
+<DATE><TIME>|<HOST>|I|TPReallocOutOfMemory
+    Upon requesting more memory than is available, psRealloc shall call the psMemExhaustedCallback.
+<DATE><TIME>|<HOST>|A|p_psRealloc
+    Failed to reallocate <N> bytes at tst_psMemory.c:<LINENO>
 
 ---> TESTPOINT PASSED (psMemory{reallocOutOfMemory} | tst_psMemory.c)
@@ -38,7 +44,10 @@
 \**********************************************************************************/
 
-<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 +59,20 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|TPallocCallback|call to psAlloc/psRealloc shall generate a callback if specified memory ID is allocated.
-<DATE><TIME>|<HOST>|I|+locateCallback|block 2 was (re)allocated
-<DATE><TIME>|<HOST>|I|+locateCallback|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|+locateCallback|block 4 was (re)allocated
-<DATE><TIME>|<HOST>|I|+locateCallback|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|memAllocateCallback
+    block 2 was (re)allocated
+<DATE><TIME>|<HOST>|I|memAllocateCallback
+    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|memFreeCallback
+    block 4 was freed
 
 ---> TESTPOINT PASSED (psMemory{allocCallback} | tst_psMemory.c)
@@ -67,14 +84,20 @@
 \**********************************************************************************/
 
-<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:<LINENO>  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:<LINENO>  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:<LINENO>  16
@@ -89,8 +112,12 @@
 \**********************************************************************************/
 
-<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|+scheckMemBlock|Memory block 1 is corrupted; buffer underflow detected.
-<DATE><TIME>|<HOST>|I|+roblemCallback|memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
+<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|psLib.sysUtils.checkMemBlock
+    Memory block 1 is corrupted; buffer underflow detected.
+<DATE><TIME>|<HOST>|I|memProblemCallback
+    memory callback called for id 1 (psMemCheckCorruption:<LINENO>).
 
 ---> TESTPOINT PASSED (psMemory{psMemCorruption} | tst_psMemory.c)
@@ -102,6 +129,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I|+ferencedMemory|memory reference count shall be incrementable/decrementable
-<DATE><TIME>|<HOST>|I|+ferencedMemory|psFree shall be just decrement a multiple refererenced pointer.
+<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.
 
 ---> TESTPOINT PASSED (psMemory{freeReferencedMemory} | tst_psMemory.c)
@@ -113,6 +142,8 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|I| TPmultipleFree|Next should be an error about multiple freeing.
-<DATE><TIME>|<HOST>|E|+sysUtilspsFree|Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
+<DATE><TIME>|<HOST>|I|TPmultipleFree
+    Next should be an error about multiple freeing.
+<DATE><TIME>|<HOST>|E|psLib.sysUtils.psFree
+    Block 1, allocated at tst_psMemory.c:<LINENO>, freed multiple times at tst_psMemory.c:<LINENO>.
 
 ---> TESTPOINT PASSED (psMemory{multipleFree} | tst_psMemory.c)
Index: /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psStringCopy.stderr	(revision 1761)
@@ -50,5 +50,6 @@
 \**********************************************************************************/
 
-<DATE><TIME>|<HOST>|E|+spsStringNCopy|Can not copy a negative number of characters (-5).
+<DATE><TIME>|<HOST>|E|psLib.sysUtils.psStringNCopy
+    Can not copy a negative number of characters (-5).
 
 ---> TESTPOINT PASSED (psString{Copy string with negative size} | tst_psStringCopy.c)
Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr	(revision 1761)
@@ -87,4 +87,13 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{optional leading dot and psTracePrintLevels()}     *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{optional leading dot and psTracePrintLevels()} | tst_psTrace.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
 *            TestPoint: psTrace{Testing psTraceReset}                              *
 *             TestType: Positive                                                   *
@@ -94,2 +103,11 @@
 ---> TESTPOINT PASSED (psTrace{Testing psTraceReset} | tst_psTrace.c)
 
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psTrace.c                                              *
+*            TestPoint: psTrace{Testing }                                          *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psTrace{Testing } | tst_psTrace.c)
+
Index: /trunk/psLib/test/sysUtils/verified/tst_psTrace.stdout
===================================================================
--- /trunk/psLib/test/sysUtils/verified/tst_psTrace.stdout	(revision 1760)
+++ /trunk/psLib/test/sysUtils/verified/tst_psTrace.stdout	(revision 1761)
@@ -5,2 +5,13 @@
      (1) This message should be displayed (beefface)
      (2) This message should be displayed (beefface)
+.                    9
+ a                   8
+  a                  4
+  b                  3
+ b                   7
+  a                  2
+  b                  1
+ c                   5
+  a                  5
+  b                  3
+  c                  5