Changeset 4321 for trunk/psLib/src/sys/psMemory.c

Timestamp:

Jun 20, 2005, 12:42:30 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

File:

• trunk/psLib/src/sys/psMemory.c (modified) (3 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 21:42:02 $
+*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -255 +255 @@
 }
 
-psS32 psMemCheckCorruption(psBool abort_on_error)
+int psMemCheckCorruption(bool abort_on_error)
 {
     psS32 nbad = 0;               // number of bad blocks
@@ -504 +504 @@
 
 // return refCounter
-psReferenceCount psMemGetRefCounter(psPtr vptr)
-{
-    psMemBlock* ptr;
+psReferenceCount psMemGetRefCounter(const psPtr ptr)
+{
+    psMemBlock* ptr2;
     psU32 refCount;
 
-    if (vptr == NULL) {
+    if (ptr == NULL) {
         return 0;
     }
 
-    ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    pthread_mutex_lock(&ptr->refCounterMutex);
-    refCount = ptr->refCounter;
-    pthread_mutex_unlock(&ptr->refCounterMutex);
+    ptr2 = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(ptr2, __func__) != 0) {
+        memProblemCallback(ptr2, __func__, __LINE__);
+    }
+
+    pthread_mutex_lock(&ptr2->refCounterMutex);
+    refCount = ptr2->refCounter;
+    pthread_mutex_unlock(&ptr2->refCounterMutex);
 
     return refCount;