Index: /trunk/psLib/test/sysUtils/tst_psMemory.c
===================================================================
--- /trunk/psLib/test/sysUtils/tst_psMemory.c	(revision 646)
+++ /trunk/psLib/test/sysUtils/tst_psMemory.c	(revision 647)
@@ -6,6 +6,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-11 20:52:33 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-12 19:04:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32,6 +32,6 @@
 static int TPrealloc(void);
 static int TPallocCallback(void);
-static long memAllocateCallback(const psMemBlock *ptr);
-static long memFreeCallback(const psMemBlock *ptr);
+static psMemoryId memAllocateCallback(const psMemBlock *ptr);
+static psMemoryId memFreeCallback(const psMemBlock *ptr);
 int TPcheckLeaks(void);
 int TPmemCorruption(void);
@@ -41,10 +41,9 @@
 static int allocCallbackCalled = 0;
 static int freeCallbackCalled = 0;
-
-bool TPOutOfMemoryExhaustedCallbackCalled = false;
+static int exhaustedCallbackCalled = 0;
 
 testDescription tests[] = {
                               {TPCheckBufferPositive,"449-TPCheckBufferPositive",0},
-                              {TPOutOfMemory,"450-TPOutOfMemory",0},
+                              {TPOutOfMemory,"450-TPOutOfMemory",6},
                               {TPrealloc,"451-TPrealloc",0},
                               {TPallocCallback,"452/453-TPallocCallback",0},
@@ -58,5 +57,4 @@
 {
     psSetLogLevel(PS_LOG_INFO);
-
     if (! runTestSuite(stderr,"psMemory",tests)) {
         psAbort(__FILE__,"One or more tests failed");
@@ -168,13 +166,13 @@
              "the psMemExhaustedCallback.\n");
 
-    TPOutOfMemoryExhaustedCallbackCalled = false;
+    exhaustedCallbackCalled = 0;
 
     cb = psMemExhaustedCallbackSet(TPOutOfMemoryExhaustedCallback);
 
-    mem = (int*) psAlloc(INT_MAX);
+    mem = (int*) psAlloc(LONG_MAX);
 
     psMemExhaustedCallbackSet(cb);
 
-    if (!TPOutOfMemoryExhaustedCallbackCalled) {
+    if (exhaustedCallbackCalled == 0) {
         psError(__FILE__,"Called psAlloc with HUGE memory requirement and survived in %s!",__func__);
         return 1;
@@ -187,13 +185,4 @@
 
     return 0;
-}
-
-
-
-void* TPOutOfMemoryExhaustedCallback(size_t size)
-{
-    psLogMsg(__func__,PS_LOG_INFO,"Custom MemExhaustedCallback was invoked.");
-    TPOutOfMemoryExhaustedCallbackCalled = true;
-    return malloc(1024);
 }
 
@@ -487,5 +476,5 @@
 }
 
-long memAllocateCallback(const psMemBlock *ptr)
+psMemoryId memAllocateCallback(const psMemBlock *ptr)
 {
     psLogMsg(__func__,PS_LOG_INFO,"block %d was (re)allocated",ptr->id);
@@ -494,5 +483,5 @@
 }
 
-long memFreeCallback(const psMemBlock *ptr)
+psMemoryId memFreeCallback(const psMemBlock *ptr)
 {
     psLogMsg(__func__,PS_LOG_INFO,"block %d was freed",ptr->id);
@@ -500,2 +489,9 @@
     return 1;
 }
+
+void* TPOutOfMemoryExhaustedCallback(size_t size)
+{
+    psLogMsg(__func__,PS_LOG_INFO,"Custom MemExhaustedCallback was invoked.");
+    exhaustedCallbackCalled++;
+    return NULL;
+}