Index: trunk/psLib/test/sysUtils/tst_psAbort.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psAbort.c	(revision 2202)
+++ trunk/psLib/test/sysUtils/tst_psAbort.c	(revision 2204)
@@ -8,6 +8,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-09-07 21:26:13 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17,7 +17,7 @@
 #include "psTest.h"
 
-static int testAbort00(void);
-static int testAbort01(void);
-static int testAbort02(void);
+static psS32 testAbort00(void);
+static psS32 testAbort01(void);
+static psS32 testAbort02(void);
 
 testDescription tests[] = {
@@ -28,5 +28,5 @@
                           };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -35,8 +35,8 @@
 }
 
-static int testAbort00(void)
+static psS32 testAbort00(void)
 {
-    int   intval = 1;
-    long  longval = 2;
+    psS32   intval = 1;
+    psS64  longval = 2;
     float floatval = 3.01;
     char  charval = 'E';
@@ -54,5 +54,5 @@
 }
 
-static int testAbort01(void)
+static psS32 testAbort01(void)
 {
     // Test point #2 String values in abort message
@@ -65,5 +65,5 @@
 }
 
-static int testAbort02(void)
+static psS32 testAbort02(void)
 {
     // Test point #2 String values in abort message
Index: trunk/psLib/test/sysUtils/tst_psError.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psError.c	(revision 2202)
+++ trunk/psLib/test/sysUtils/tst_psError.c	(revision 2204)
@@ -13,6 +13,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-14 21:14:58 $
+ *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26,11 +26,11 @@
 #include "psTest.h"
 
-static int testError00(void);
-static int testError01(void);
-static int testError02(void);
-static int testError03(void);
-static int testError04(void);
-static int testError05(void);
-static int testErrorRegister(void);
+static psS32 testError00(void);
+static psS32 testError01(void);
+static psS32 testError02(void);
+static psS32 testError03(void);
+static psS32 testError04(void);
+static psS32 testError05(void);
+static psS32 testErrorRegister(void);
 
 // Function used in testError02 to verify the psErrorStackPrintV function
@@ -58,5 +58,5 @@
                           };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -65,5 +65,5 @@
 }
 
-static int testError05(void)
+static psS32 testError05(void)
 {
     psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE;
@@ -81,5 +81,5 @@
 }
 
-static int testError04(void)
+static psS32 testError04(void)
 {
     psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE;
@@ -134,5 +134,5 @@
 }
 
-static int testError03(void)
+static psS32 testError03(void)
 {
     psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE;
@@ -214,5 +214,5 @@
 }
 
-static int testError02(void)
+static psS32 testError02(void)
 {
     psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE;
@@ -228,5 +228,5 @@
 }
 
-static int testError01(void)
+static psS32 testError01(void)
 {
     psErrorCode code=PS_ERR_BAD_PARAMETER_VALUE;
@@ -277,9 +277,9 @@
 }
 
-static int testError00(void)
-{
-
-    int  intval=1;
-    long longval = 2;
+static psS32 testError00(void)
+{
+
+    psS32  intval=1;
+    psS64 longval = 2;
     float floatval = 3.01;
     char  charval = 'E';
@@ -300,8 +300,8 @@
 }
 
-static int testErrorRegister(void)
-{
-
-    int numErr = 4;
+static psS32 testErrorRegister(void)
+{
+
+    psS32 numErr = 4;
     psErrorDescription errDesc[] = { {PS_ERR_N_ERR_CLASSES+1,"first"},
                                      {PS_ERR_N_ERR_CLASSES+2,"second"},
@@ -314,5 +314,5 @@
     psErrorRegister(errDesc,numErr);
 
-    for (int i = 0; i < numErr; i++) {
+    for (psS32 i = 0; i < numErr; i++) {
         const char* desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+1+i);
         if (desc == NULL) {
Index: trunk/psLib/test/sysUtils/tst_psLogMsg.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psLogMsg.c	(revision 2202)
+++ trunk/psLib/test/sysUtils/tst_psLogMsg.c	(revision 2204)
@@ -8,10 +8,10 @@
 #include "psTest.h"
 
-static int testLogMsg00();
-static int testLogMsg01();
-static int testLogMsg02();
-static int testLogMsg03();
-static int testLogMsg04();
-static int testLogMsg05();
+static psS32 testLogMsg00();
+static psS32 testLogMsg01();
+static psS32 testLogMsg02();
+static psS32 testLogMsg03();
+static psS32 testLogMsg04();
+static psS32 testLogMsg05();
 
 testDescription tests[] = {
@@ -39,5 +39,5 @@
                           };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -48,5 +48,5 @@
 
 static void myLogMsg(const char *name,
-                     int level,
+                     psS32 level,
                      const char *fmt,
                      ...)
@@ -60,7 +60,7 @@
 }
 
-static int testLogMsg00()
-{
-    int i = 0;
+static psS32 testLogMsg00()
+{
+    psS32 i = 0;
 
     // Send a log messages for levels 0:9.  Only the first four messages
@@ -74,7 +74,7 @@
 }
 
-static int testLogMsg01()
-{
-    int i = 0;
+static psS32 testLogMsg01()
+{
+    psS32 i = 0;
 
     // Send a log messages for levels 0:9.  Only the first four messages
@@ -88,10 +88,10 @@
 }
 
-static int testLogMsg02()
+static psS32 testLogMsg02()
 {
 
     psLogSetLevel(9);
     // Send a log messages for levels 0:9.
-    for (int i=0;i<10;i++) {
+    for (psS32 i=0;i<10;i++) {
         psLogMsg(__func__, i, "Hello World!  My level is %d\n", i);
     }
@@ -105,7 +105,7 @@
 }
 
-static int testLogMsg03()
-{
-    int i;
+static psS32 testLogMsg03()
+{
+    psS32 i;
 
     fprintf(stderr,"------------- psLogSetFormat() -------------\n");
@@ -161,5 +161,5 @@
 
 
-int testLogMsg04()
+psS32 testLogMsg04()
 {
     psLogMsg("Under 15 chars", 0, "Hello World!\n");
@@ -173,7 +173,7 @@
 }
 
-int testLogMsg05()
-{
-    int i = 0;
+psS32 testLogMsg05()
+{
+    psS32 i = 0;
     FILE* file;
     char line[256];
Index: trunk/psLib/test/sysUtils/tst_psMemory.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psMemory.c	(revision 2202)
+++ trunk/psLib/test/sysUtils/tst_psMemory.c	(revision 2204)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-14 23:55:47 $
+*  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26,22 +26,22 @@
 #include "pslib.h"
 
-static int TPFreeReferencedMemory( void );
-static int TPOutOfMemory( void );
-static int TPReallocOutOfMemory( void );
-static void* TPOutOfMemoryExhaustedCallback( size_t size );
-static int TPCheckBufferPositive( void );
-static int TPrealloc( void );
-static int TPallocCallback( void );
+static psS32 TPFreeReferencedMemory( void );
+static psS32 TPOutOfMemory( void );
+static psS32 TPReallocOutOfMemory( void );
+static psPtr TPOutOfMemoryExhaustedCallback( size_t size );
+static psS32 TPCheckBufferPositive( void );
+static psS32 TPrealloc( void );
+static psS32 TPallocCallback( void );
 static psMemoryId memAllocateCallback( const psMemBlock *ptr );
 static psMemoryId memFreeCallback( const psMemBlock *ptr );
-static int TPcheckLeaks( void );
-static int TPmemCorruption( void );
-static int TPmultipleFree( void );
-void memProblemCallback( const psMemBlock *ptr, const char *file, int lineno );
-
-static int problemCallbackCalled = 0;
-static int allocCallbackCalled = 0;
-static int freeCallbackCalled = 0;
-static int exhaustedCallbackCalled = 0;
+static psS32 TPcheckLeaks( void );
+static psS32 TPmemCorruption( void );
+static psS32 TPmultipleFree( void );
+void memProblemCallback( const psMemBlock *ptr, const char *file, psS32 lineno );
+
+static psS32 problemCallbackCalled = 0;
+static psS32 allocCallbackCalled = 0;
+static psS32 freeCallbackCalled = 0;
+static psS32 exhaustedCallbackCalled = 0;
 
 testDescription tests[] = {
@@ -81,5 +81,5 @@
                           };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -89,13 +89,13 @@
 
 // Testpoint #449, psAlloc shall allocate memory blocks writeable by caller.
-int TPCheckBufferPositive( void )
-{
-    int * mem;
-    const int size = 100;
-    int failed = 0;
+psS32 TPCheckBufferPositive( void )
+{
+    psS32 * mem;
+    const psS32 size = 100;
+    psS32 failed = 0;
 
     psLogMsg( __func__, PS_LOG_INFO, "psAlloc shall allocate memory blocks writeable by caller.\n" );
 
-    mem = ( int* ) psAlloc( size * sizeof( int ) );
+    mem = ( psS32* ) psAlloc( size * sizeof( psS32 ) );
     if ( mem == NULL ) {
         psError( __FILE__, "psAlloc returned a NULL value in %s!", __func__ );
@@ -103,9 +103,9 @@
     }
 
-    for ( int index = 0;index < size;index++ ) {
+    for ( psS32 index = 0;index < size;index++ ) {
         mem[ index ] = index;
     }
 
-    for ( int index = 0;index < size;index++ ) {
+    for ( psS32 index = 0;index < size;index++ ) {
         if ( mem[ index ] != index ) {
             failed++;
@@ -118,13 +118,13 @@
 }
 
-int TPFreeReferencedMemory( void )
+psS32 TPFreeReferencedMemory( void )
 {
     // create memory
-    int * mem;
-    int ref = 0;
+    psS32 * mem;
+    psS32 ref = 0;
 
     psLogMsg( __func__, PS_LOG_INFO, "memory reference count shall be incrementable/decrementable" );
 
-    mem = ( int* ) psAlloc( 100 * sizeof( int ) );
+    mem = ( psS32* ) psAlloc( 100 * sizeof( psS32 ) );
 
     ref = psMemGetRefCounter( mem );
@@ -170,10 +170,10 @@
 // Bug/Task #562 regression test.  Upon requesting more memory than is available, psRealloc shall call
 // the psMemExhaustedCallback.
-int TPReallocOutOfMemory( void )
-{
-    int * mem[ 100 ];
+psS32 TPReallocOutOfMemory( void )
+{
+    psS32 * mem[ 100 ];
     psMemExhaustedCallback cb;
 
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
         mem[ lcv ] = NULL;
     }
@@ -186,10 +186,10 @@
     cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback );
 
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
-        mem[ lcv ] = ( int* ) psAlloc( 10 );
-    }
-
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
-        mem[ lcv ] = ( int* ) psRealloc( mem[ lcv ], SIZE_MAX/2 - 1000 );
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
+        mem[ lcv ] = ( psS32* ) psAlloc( 10 );
+    }
+
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
+        mem[ lcv ] = ( psS32* ) psRealloc( mem[ lcv ], SIZE_MAX/2 - 1000 );
     }
 
@@ -201,5 +201,5 @@
     }
 
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
         psFree( mem[ lcv ] );
     }
@@ -209,10 +209,10 @@
 // Testpoint #450,  Upon requesting more memory than is available, psalloc shall call
 // the psMemExhaustedCallback.
-int TPOutOfMemory( void )
-{
-    int * mem[ 100 ];
+psS32 TPOutOfMemory( void )
+{
+    psS32 * mem[ 100 ];
     psMemExhaustedCallback cb;
 
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
         mem[ lcv ] = NULL;
     }
@@ -225,6 +225,6 @@
     cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback );
 
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
-        mem[ lcv ] = ( int* ) psAlloc( SIZE_MAX/2 - 1000 );
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
+        mem[ lcv ] = ( psS32* ) psAlloc( SIZE_MAX/2 - 1000 );
     }
 
@@ -236,5 +236,5 @@
     }
 
-    for ( int lcv = 0; lcv < 100; lcv++ ) {
+    for ( psS32 lcv = 0; lcv < 100; lcv++ ) {
         psFree( mem[ lcv ] );
     }
@@ -244,10 +244,10 @@
 
 // Testpoint #451,  psRealloc shall increase/decrease memory buffer while preserving contents
-int TPrealloc( void )
-{
-    int * mem1;
-    int* mem2;
-    int* mem3;
-    const int initialSize = 100;
+psS32 TPrealloc( void )
+{
+    psS32 * mem1;
+    psS32* mem2;
+    psS32* mem3;
+    const psS32 initialSize = 100;
 
     psLogMsg( __func__, PS_LOG_INFO, "psRealloc shall increase/decrease memory buffer while "
@@ -255,8 +255,8 @@
 
     // allocate buffer with known values.
-    mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) );
-    mem2 = ( int* ) psAlloc( initialSize * sizeof( int ) );
-    mem3 = ( int* ) psAlloc( initialSize * sizeof( int ) );
-    for ( int lcv = 0;lcv < initialSize;lcv++ ) {
+    mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
+    mem2 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
+    mem3 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
+    for ( psS32 lcv = 0;lcv < initialSize;lcv++ ) {
         mem1[ lcv ] = mem2[ lcv ] = mem3[ lcv ] = lcv;
     }
@@ -266,10 +266,10 @@
 
     // realloc to 2x
-    mem1 = ( int* ) psRealloc( mem1, 2 * initialSize * sizeof( int ) );
-    mem2 = ( int* ) psRealloc( mem2, 2 * initialSize * sizeof( int ) );
-    mem3 = ( int* ) psRealloc( mem3, 2 * initialSize * sizeof( int ) );
+    mem1 = ( psS32* ) psRealloc( mem1, 2 * initialSize * sizeof( psS32 ) );
+    mem2 = ( psS32* ) psRealloc( mem2, 2 * initialSize * sizeof( psS32 ) );
+    mem3 = ( psS32* ) psRealloc( mem3, 2 * initialSize * sizeof( psS32 ) );
 
     // check values of initial block
-    for ( int i = 0;i < initialSize;i++ ) {
+    for ( psS32 i = 0;i < initialSize;i++ ) {
         if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) {
             psError( __FILE__, "Realloc didn't preserve the contents with expanding buffer in %s.",
@@ -283,10 +283,10 @@
 
     // realloc to 1/2 initial value.
-    mem1 = ( int* ) psRealloc( mem1, ( initialSize / 2 ) * sizeof( int ) );
-    mem2 = ( int* ) psRealloc( mem2, ( initialSize / 2 ) * sizeof( int ) );
-    mem3 = ( int* ) psRealloc( mem3, ( initialSize / 2 ) * sizeof( int ) );
+    mem1 = ( psS32* ) psRealloc( mem1, ( initialSize / 2 ) * sizeof( psS32 ) );
+    mem2 = ( psS32* ) psRealloc( mem2, ( initialSize / 2 ) * sizeof( psS32 ) );
+    mem3 = ( psS32* ) psRealloc( mem3, ( initialSize / 2 ) * sizeof( psS32 ) );
 
     // check values of initial block
-    for ( int i = 0;i < initialSize / 2;i++ ) {
+    for ( psS32 i = 0;i < initialSize / 2;i++ ) {
         if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) {
             psError( __FILE__, "Realloc didn't preserve the contents with shrinking buffer in %s.",
@@ -303,12 +303,12 @@
 }
 
-int TPallocCallback( void )
-{
-    int * mem1;
-    int* mem2;
-    int* mem3;
-    int currentId = psMemGetId();
-    const int initialSize = 100;
-    int mark;
+psS32 TPallocCallback( void )
+{
+    psS32 * mem1;
+    psS32* mem2;
+    psS32* mem3;
+    psS32 currentId = psMemGetId();
+    const psS32 initialSize = 100;
+    psS32 mark;
 
     allocCallbackCalled = 0;
@@ -324,7 +324,7 @@
 
     // allocate buffer with known values.
-    mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) );
-    mem2 = ( int* ) psAlloc( initialSize * sizeof( int ) );
-    mem3 = ( int* ) psAlloc( initialSize * sizeof( int ) );
+    mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
+    mem2 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
+    mem3 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
 
     psFree( mem1 );
@@ -343,9 +343,9 @@
     mark = psMemGetId();
 
-    mem1 = ( int* ) psAlloc( initialSize * sizeof( int ) );
+    mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
 
     psMemAllocateCallbackSetID( mark );
 
-    mem1 = ( int* ) psRealloc( mem1, initialSize * 2 * sizeof( int ) );
+    mem1 = ( psS32* ) psRealloc( mem1, initialSize * 2 * sizeof( psS32 ) );
 
     psFree( mem1 );
@@ -361,13 +361,13 @@
 }
 
-int TPcheckLeaks( void )
-{
-    const int numBuffers = 5;
-    int* buffers[ 5 ];
-    int lcv;
-    int currentId = psMemGetId();
+psS32 TPcheckLeaks( void )
+{
+    const psS32 numBuffers = 5;
+    psS32* buffers[ 5 ];
+    psS32 lcv;
+    psS32 currentId = psMemGetId();
     psMemBlock** blks;
-    int nLeaks = 0;
-    int lineMark = 0;
+    psS32 nLeaks = 0;
+    psS32 lineMark = 0;
 
     psLogMsg( __func__, PS_LOG_INFO, "psMemCheckLeaks shall return the number of blocks above an ID "
@@ -376,5 +376,5 @@
     for ( lcv = 0;lcv < numBuffers;lcv++ ) {
         lineMark = __LINE__ + 1;
-        buffers[ lcv ] = psAlloc( sizeof( int ) );
+        buffers[ lcv ] = psAlloc( sizeof( psS32 ) );
     }
 
@@ -406,5 +406,5 @@
     for ( lcv = 0;lcv < numBuffers;lcv++ ) {
         lineMark = __LINE__ + 1;
-        buffers[ lcv ] = psAlloc( sizeof( int ) );
+        buffers[ lcv ] = psAlloc( sizeof( psS32 ) );
     }
 
@@ -434,5 +434,5 @@
     for ( lcv = 0;lcv < numBuffers;lcv++ ) {
         lineMark = __LINE__ + 1;
-        buffers[ lcv ] = psAlloc( sizeof( int ) );
+        buffers[ lcv ] = psAlloc( sizeof( psS32 ) );
     }
 
@@ -464,14 +464,14 @@
 }
 
-int TPmemCorruption( void )
-{
-    int * buffer = NULL;
-    int oldValue = 0;
-    int corruptions = 0;
+psS32 TPmemCorruption( void )
+{
+    psS32 * buffer = NULL;
+    psS32 oldValue = 0;
+    psS32 corruptions = 0;
     psMemProblemCallback cb;
 
     psLogMsg( __func__, PS_LOG_INFO, "psMemCheckCorruption shall detect memory corruptions" );
 
-    buffer = psAlloc( sizeof( int ) );
+    buffer = psAlloc( sizeof( psS32 ) );
 
     // cause memory corruption via buffer underflow
@@ -514,5 +514,5 @@
 }
 
-void memProblemCallback( const psMemBlock *ptr, const char *file, int lineno )
+void memProblemCallback( const psMemBlock *ptr, const char *file, psS32 lineno )
 {
     psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %d (%s:%d).",
@@ -536,5 +536,5 @@
 }
 
-void* TPOutOfMemoryExhaustedCallback( size_t size )
+psPtr TPOutOfMemoryExhaustedCallback( size_t size )
 {
     psLogMsg( __func__, PS_LOG_INFO, "Custom MemExhaustedCallback was invoked." );
@@ -543,8 +543,8 @@
 }
 
-int TPmultipleFree( void )
-{
-
-    void * buffer = psAlloc( 1024 );
+psS32 TPmultipleFree( void )
+{
+
+    psPtr  buffer = psAlloc( 1024 );
 
     psFree( buffer );
Index: trunk/psLib/test/sysUtils/tst_psString.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psString.c	(revision 2202)
+++ 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
Index: trunk/psLib/test/sysUtils/tst_psStringCopy.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psStringCopy.c	(revision 2202)
+++ trunk/psLib/test/sysUtils/tst_psStringCopy.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
Index: trunk/psLib/test/sysUtils/tst_psTrace.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psTrace.c	(revision 2202)
+++ trunk/psLib/test/sysUtils/tst_psTrace.c	(revision 2204)
@@ -10,13 +10,13 @@
 
 
-static int testTrace00(void);
-static int testTrace01(void);
-static int testTrace02(void);
-static int testTrace03(void);
-static int testTrace04(void);
-static int testTrace05(void);
-static int testTrace05a(void);
-static int testTrace06(void);
-static int testTrace08(void);
+static psS32 testTrace00(void);
+static psS32 testTrace01(void);
+static psS32 testTrace02(void);
+static psS32 testTrace03(void);
+static psS32 testTrace04(void);
+static psS32 testTrace05(void);
+static psS32 testTrace05a(void);
+static psS32 testTrace06(void);
+static psS32 testTrace08(void);
 
 testDescription tests[] = {
@@ -37,5 +37,5 @@
                            };
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {
     psLogSetLevel( PS_LOG_INFO );
@@ -44,8 +44,8 @@
 }
 
-static int testTrace00(void)
-{
-    int i;
-    int lev = 0;
+static psS32 testTrace00(void)
+{
+    psS32 i;
+    psS32 lev = 0;
 
     psTraceSetDestination(stderr);
@@ -94,5 +94,5 @@
 }
 
-static int testTrace01(void)
+static psS32 testTrace01(void)
 {
     psTraceSetDestination(stderr);
@@ -104,5 +104,5 @@
 }
 
-static int testTrace02(void)
+static psS32 testTrace02(void)
 {
     psTraceReset();
@@ -133,8 +133,8 @@
 }
 
-static int testTrace03(void)
-{
-    int i = 0;
-    int lev = 0;
+static psS32 testTrace03(void)
+{
+    psS32 i = 0;
+    psS32 lev = 0;
 
     psTraceSetDestination(stderr);
@@ -176,8 +176,8 @@
 
 
-static int testTrace04(void)
+static psS32 testTrace04(void)
 {
     FILE *fp;
-    int nb = 0;
+    psS32 nb = 0;
 
     fp = fopen("tst_psTrace02_OUT", "w");
@@ -221,5 +221,5 @@
 }
 
-static int testTrace05(void)
+static psS32 testTrace05(void)
 {
     psTraceSetDestination(stderr);
@@ -247,5 +247,5 @@
 }
 
-static int testTrace05a(void)
+static psS32 testTrace05a(void)
 {
     (void)psTraceSetLevel(".", 9);
@@ -271,5 +271,5 @@
 }
 
-static int testTrace06(void)
+static psS32 testTrace06(void)
 {
     psTraceSetDestination(stderr);
@@ -311,5 +311,5 @@
 
 // Ensure that the leading dot in the component names are optional.
-static int testTrace08(void)
+static psS32 testTrace08(void)
 {
     psTraceReset();
Index: trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr	(revision 2202)
+++ trunk/psLib/test/sysUtils/verified/tst_psTrace.stderr	(revision 2204)
@@ -25,5 +25,5 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psTrace.c                                              *
-*            TestPoint: psTrace{psTraceSetLevel(): test static inheritance}        *
+*            TestPoint: psTrace{psTraceSetLevel(): test static/dynamic inheritance} *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
@@ -42,5 +42,5 @@
      E               5
 
----> TESTPOINT PASSED (psTrace{psTraceSetLevel(): test static inheritance} | tst_psTrace.c)
+---> TESTPOINT PASSED (psTrace{psTraceSetLevel(): test static/dynamic inheritance} | tst_psTrace.c)
 
 /***************************** TESTPOINT ******************************************\