Index: /trunk/psLib/test/sys/tap_psString.c
===================================================================
--- /trunk/psLib/test/sys/tap_psString.c	(revision 12511)
+++ /trunk/psLib/test/sys/tap_psString.c	(revision 12512)
@@ -20,6 +20,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-03-03 02:43:37 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-03-20 03:31:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56,6 +56,4 @@
 psS32 testNULLStrings(void);
 psS32 testStrCheck(void);
-
-static const char* const NullString = "";
 
 
@@ -311,13 +309,9 @@
     diag("testStrAppend03");
 
-    char *str=NULL;
-    int result;
-
-    str = psStringCopy(STR_0);
+    char *str =psStringCopy(STR_0);
 
     // test null-op
-    psStringAppend(&str, NullString);
-    result = strcmp(str, STR_0);
-    ok ( result == 0, "Failed test point str=[%s]\n", str);
+    psStringAppend(&str, "%s", "");
+    ok_str(str, STR_0, "Failed test point");
     psFree(str);
 
@@ -391,5 +385,5 @@
 
     // test null-op
-    psStringPrepend(&str, NullString);
+    psStringPrepend(&str, "%s", "");
     result = strcmp(str, STR_0);
     ok ( result == 0, "test point str=[%s]\n", str);
@@ -531,5 +525,5 @@
 psS32 testNULLStrings(void)
 {
-    diag("testNULLStrings");
+    diag("test""s");
 
     psString nullTest = NULL;
@@ -550,5 +544,5 @@
 
     //psStringAppend should return 0 for NULL input destination
-    outSize = psStringAppend(nullDest, NullString);
+    outSize = psStringAppend(nullDest, "%s", "");
     ok (outSize == 0,
         "psStringAppend to return 0 for NULL input destination.\n");
Index: /trunk/psLib/test/sys/tap_psTrace.c
===================================================================
--- /trunk/psLib/test/sys/tap_psTrace.c	(revision 12511)
+++ /trunk/psLib/test/sys/tap_psTrace.c	(revision 12512)
@@ -49,5 +49,5 @@
 
     //    psTraceSetDestination(stderr);
-    psTraceSetDestination(2);
+    (void)psTraceSetDestination(2);
 
     for (i=0;i<10;i++) {
@@ -89,5 +89,5 @@
 
     //    psTraceSetDestination(stderr);
-    psTraceSetDestination(2);
+    (void)psTraceSetDestination(2);
     (void)psTraceSetLevel(".A.B.C.D.E", 5);
 
@@ -107,9 +107,9 @@
     psTraceReset();
     //    psTraceSetDestination(stderr);
-    psTraceSetDestination(2);
-    psTraceSetLevel(".A.B", 2);
-    psTraceSetLevel(".A.B.C.D.E", 5);
-    psTracePrintLevels();
-    psTraceSetLevel(".A.B", 10);
+    (void)psTraceSetDestination(2);
+    (void)psTraceSetLevel(".A.B", 2);
+    (void)psTraceSetLevel(".A.B.C.D.E", 5);
+    psTracePrintLevels();
+    (void)psTraceSetLevel(".A.B", 10);
     psTracePrintLevels();
 
@@ -137,5 +137,5 @@
 
     //    psTraceSetDestination(stderr);
-    psTraceSetDestination(2);
+    (void)psTraceSetDestination(2);
 
     for (i=0;i<10;i++) {
@@ -182,12 +182,12 @@
         if (nb == 0)
             //            psTraceSetDestination(stdout);
-            psTraceSetDestination(1);
+            (void)psTraceSetDestination(1);
         if (nb == 1)
             //            psTraceSetDestination(stderr);
-            psTraceSetDestination(2);
+            (void)psTraceSetDestination(2);
         if (nb == 2)
-            psTraceSetDestination(0); //NULL
+            (void)psTraceSetDestination(0); //NULL
         if (nb == 3)
-            psTraceSetDestination(FD);
+            (void)psTraceSetDestination(FD);
 
         (void)psTraceSetLevel(".", 4);
@@ -226,5 +226,5 @@
 {
     //    psTraceSetDestination(stderr);
-    psTraceSetDestination(2);
+    (void)psTraceSetDestination(2);
 
     (void)psTraceSetLevel(".", 9);
@@ -277,5 +277,5 @@
 {
     //    psTraceSetDestination(stderr);
-    psTraceSetDestination(2);
+    (void)psTraceSetDestination(2);
 
     (void)psTraceSetLevel(".", 9);
Index: /trunk/psLib/test/types/tap_psPixels_all.c
===================================================================
--- /trunk/psLib/test/types/tap_psPixels_all.c	(revision 12511)
+++ /trunk/psLib/test/types/tap_psPixels_all.c	(revision 12512)
@@ -273,6 +273,6 @@
     }
 
-    psPixels *outPixels = NULL;
-    {
+    {
+        psPixels *outPixels = NULL;
         outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         ok ( outPixels != NULL,
@@ -281,22 +281,26 @@
     }
 
-    //Return NULL for NULL image input
-    {
-        psPixels *outPixels = psPixelsFromMask(outPixels, NULL, maskVal);
+    // Return NULL for NULL image input
+    {
+        psPixels *outPixels = NULL;
+        outPixels = psPixelsFromMask(outPixels, NULL, maskVal);
         ok ( outPixels == NULL,
              "psPixelsFromMask:     return NULL for NULL image input.");
     }
-    //Return NULL for image with wrong maskType
+
+    // Return NULL for image with wrong maskType
     *(psElemType*)&(outImage->type.type) = PS_TYPE_U32;
     {
-        psPixels *outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
+        psPixels *outPixels = NULL;
+        outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         ok ( outPixels == NULL,
              "psPixelsFromMask:     return NULL for image with wrong maskType.");
     }
 
-    //psPixelsConcatenate Tests
-    //Return NULL for NULL pixels input
-    {
-        psPixels *outPixels = psPixelsConcatenate(outPixels, NULL);
+    // psPixelsConcatenate Tests
+    // Return NULL for NULL pixels input
+    {
+        psPixels *outPixels = NULL;
+        outPixels = psPixelsConcatenate(outPixels, NULL);
         ok ( outPixels == NULL,
              "psPixelsConcatenate:  return NULL for NULL pixels input.");
@@ -306,4 +310,5 @@
     //Return copy of input pixels for NULL out pixels
     {
+        psPixels *outPixels = NULL;
         outPixels = psPixelsFromMask(outPixels, outImage, maskVal);
         outPixels = psPixelsConcatenate(outPixels, p0);
@@ -313,7 +318,8 @@
         psFree(outPixels);
     }
+
     //Return properly concatenated psPixels list
     //Set all the compare cases to cover 'comparePixelCoord' as well.
-    outPixels = psPixelsAlloc(5);
+    psPixels *outPixels = psPixelsAlloc(5);
     in.x = 1.0;
     in.y = 1.0;