Index: trunk/psLib/test/sysUtils/tst_psMemory.c
===================================================================
--- trunk/psLib/test/sysUtils/tst_psMemory.c	(revision 4435)
+++ trunk/psLib/test/sysUtils/tst_psMemory.c	(revision 4444)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 03:32:42 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-01 03:57:42 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,10 +30,10 @@
 static psS32 TPrealloc( void );
 static psS32 TPallocCallback( void );
-static psMemId memAllocateCallback( const psMemBlock *ptr );
+static psMemId memAllocCallback( const psMemBlock *ptr );
 static psMemId memFreeCallback( const psMemBlock *ptr );
 static psS32 TPcheckLeaks( void );
 static psS32 TPmemCorruption( void );
 static psS32 TPmultipleFree( void );
-void memProblemCallback( const psMemBlock *ptr, const char *file, psS32 lineno );
+void memProblemCallback( psMemBlock *ptr, const char *filename, unsigned int lineno );
 
 static psS32 problemCallbackCalled = 0;
@@ -289,8 +289,8 @@
     allocCallbackCalled = 0;
     freeCallbackCalled = 0;
-    psMemAllocateCallbackSet( memAllocateCallback );
+    psMemAllocCallbackSet( memAllocCallback );
     psMemFreeCallbackSet( memFreeCallback );
 
-    psMemAllocateCallbackSetID( currentId + 1 );
+    psMemAllocCallbackSetID( currentId + 1 );
     psMemFreeCallbackSetID( currentId + 1 );
 
@@ -320,5 +320,5 @@
     mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) );
 
-    psMemAllocateCallbackSetID( mark );
+    psMemAllocCallbackSetID( mark );
 
     mem1 = ( psS32* ) psRealloc( mem1, initialSize * 2 * sizeof( psS32 ) );
@@ -489,5 +489,5 @@
 }
 
-void memProblemCallback( const psMemBlock *ptr, const char *file, psS32 lineno )
+void memProblemCallback( psMemBlock *ptr, const char *file, unsigned int lineno )
 {
     psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %lld (%s:%d).",
@@ -497,5 +497,5 @@
 }
 
-psMemId memAllocateCallback( const psMemBlock *ptr )
+psMemId memAllocCallback( const psMemBlock *ptr )
 {
     psLogMsg( __func__, PS_LOG_INFO, "block %lld was (re)allocated", ptr->id );
Index: trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr
===================================================================
--- trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 4435)
+++ trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr	(revision 4444)
@@ -63,7 +63,7 @@
 <DATE><TIME>|<HOST>|I|TPallocCallback
     call to psAlloc/psRealloc shall generate a callback if specified memory ID is allocated.
-<DATE><TIME>|<HOST>|I|memAllocateCallback
+<DATE><TIME>|<HOST>|I|memAllocCallback
     block 2 was (re)allocated
-<DATE><TIME>|<HOST>|I|memAllocateCallback
+<DATE><TIME>|<HOST>|I|memAllocCallback
     block 3 was (re)allocated
 <DATE><TIME>|<HOST>|I|memFreeCallback
@@ -71,7 +71,7 @@
 <DATE><TIME>|<HOST>|I|memFreeCallback
     block 3 was freed
-<DATE><TIME>|<HOST>|I|memAllocateCallback
+<DATE><TIME>|<HOST>|I|memAllocCallback
     block 4 was (re)allocated
-<DATE><TIME>|<HOST>|I|memAllocateCallback
+<DATE><TIME>|<HOST>|I|memAllocCallback
     block 4 was (re)allocated
 <DATE><TIME>|<HOST>|I|memFreeCallback