Index: trunk/psLib/test/sysUtils/tst_psString.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psString.c	(revision 1977)
+++ trunk/psLib/test/sysUtils/tst_psString.c	(revision 2204)
@@ -17,6 +17,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-06 01:59:08 $
+ *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,11 +28,11 @@
 #include "psTest.h"
 
-static int testStringCopy00(void);
-static int testStringCopy01(void);
-static int testStringCopy02(void);
-static int testStringCopy03(void);
-static int testStringCopy04(void);
-static int testStringCopy05(void);
-static int testStringCopy06(void);
+static psS32 testStringCopy00(void);
+static psS32 testStringCopy01(void);
+static psS32 testStringCopy02(void);
+static psS32 testStringCopy03(void);
+static psS32 testStringCopy04(void);
+static psS32 testStringCopy05(void);
+static psS32 testStringCopy06(void);
 
 testDescription tests[] = {
@@ -47,5 +47,5 @@
                           };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -55,30 +55,30 @@
 
 /*
-int main( int argc,
+psS32 main( psS32 argc,
           char * argv[] )
 {
-    bool  tpResult = false;
+    psBool  tpResult = false;
     char  stringval[20] = "E R R O R";
     char  stringval1[20] = "e r r o r";
     char  *stringvalnocopy = "F A I L";
     char  *substringval = "e r r";
-    int   substringlen = 6;
+    psS32   substringlen = 6;
     char  *emptyval = "";
-    int   tpFails = 0;
-    char  *strResult;
-    int   increaseSize = 5;
-    int   negativeSize = -5;
-    int   result = 0;
-    int   result1 = 0;
-    int   memBlockAllocated = 0;
+    psS32   tpFails = 0;
+    char  *strResult;
+    psS32   increaseSize = 5;
+    psS32   negativeSize = -5;
+    psS32   result = 0;
+    psS32   result1 = 0;
+    psS32   memBlockAllocated = 0;
     psMemBlock ***memBlockPtr = NULL;
  
 */
 
-static int testStringCopy00(void)
-{
-    char  stringval[20] = "E R R O R";
-    int   result = 0;
-    int   result1 = 0;
+static psS32 testStringCopy00(void)
+{
+    char  stringval[20] = "E R R O R";
+    psS32   result = 0;
+    psS32   result1 = 0;
     char  *strResult;
 
@@ -107,8 +107,8 @@
 }
 
-static int testStringCopy01(void)
+static psS32 testStringCopy01(void)
 {
     char  *emptyval = "";
-    int   result = 0;
+    psS32   result = 0;
     char  *strResult;
 
@@ -130,11 +130,11 @@
 }
 
-static int testStringCopy02(void)
-{
-    int   result = 0;
-    int   result1 = 0;
+static psS32 testStringCopy02(void)
+{
+    psS32   result = 0;
+    psS32   result1 = 0;
     char  *strResult;
     char  stringval1[20] = "e r r o r";
-    int   substringlen = 5;
+    psS32   substringlen = 5;
     char  *substringval = "e r r";
 
@@ -161,8 +161,8 @@
 }
 
-static int testStringCopy03(void)
-{
-    int   result = 0;
-    int   result1 = 0;
+static psS32 testStringCopy03(void)
+{
+    psS32   result = 0;
+    psS32   result1 = 0;
     char  *strResult;
     char  *stringvalnocopy = "F A I L";
@@ -185,11 +185,11 @@
 }
 
-static int testStringCopy04(void)
-{
-    int   result = 0;
-    int   result1 = 0;
-    char  *strResult;
-    char  stringval[20] = "E R R O R";
-    int   increaseSize = 5;
+static psS32 testStringCopy04(void)
+{
+    psS32   result = 0;
+    psS32   result1 = 0;
+    char  *strResult;
+    char  stringval[20] = "E R R O R";
+    psS32   increaseSize = 5;
 
     // Test point #5 Copy string to larger string - psStringNCopy
@@ -205,5 +205,5 @@
                 strResult, stringval);
         fprintf(stderr,"                     strlne result = %d expected %d\n",result1,
-                (int)strlen(stringval));
+                (psS32)strlen(stringval));
         return 1;
     }
@@ -214,9 +214,9 @@
 }
 
-static int testStringCopy05(void)
-{
-    char  *strResult;
-    char  stringval[20] = "E R R O R";
-    int   negativeSize = -5;
+static psS32 testStringCopy05(void)
+{
+    char  *strResult;
+    char  stringval[20] = "E R R O R";
+    psS32   negativeSize = -5;
 
     // Test point #6 Copy string with negative size - psStringNCopy
@@ -224,5 +224,5 @@
     if ( strResult != NULL ) {
         fprintf(stderr,"Failed test point #6 return value = %ld expected NULL\n",
-                (unsigned long)strResult);
+                (psU64)strResult);
         return 1;
     }
@@ -232,9 +232,9 @@
 }
 
-static int testStringCopy06(void)
-{
-    char  *strResult;
-    char  stringval[20] = "E R R O R";
-    int   result = 0;
+static psS32 testStringCopy06(void)
+{
+    char  *strResult;
+    char  stringval[20] = "E R R O R";
+    psS32   result = 0;
 
     // Test point #7 Verify creation of string literal - PS_STRING