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

Timestamp:

Jun 27, 2005, 10:38:12 AM (21 years ago)

Author:

drobbin

Message:

made required changes based on apidelta-report-cycle6

File:

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

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 03:32:42 $
+*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-27 20:38:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -342 +342 @@
 
     ptr->file = file;
-    ptr->freeFcn = NULL;
+    ptr->freeFunc = NULL;
     ptr->persistent = false;
     *(psU32 *)&ptr->lineno = lineno;
@@ -576 +576 @@
         pthread_mutex_unlock(&ptr->refCounterMutex);
 
-        if (ptr->freeFcn != NULL) {
-            ptr->freeFcn(vptr);
+        if (ptr->freeFunc != NULL) {
+            ptr->freeFunc(vptr);
         }
 
@@ -640 +640 @@
 }
 
-void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn)
+void psMemSetDeallocator(psPtr ptr, psFreeFunc freeFunc)
+{
+    if (ptr == NULL) {
+        return;
+    }
+
+    psMemBlock* PTR = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(PTR, __func__) != 0) {
+        memProblemCallback(PTR, __func__, __LINE__);
+    }
+
+    PTR->freeFunc = freeFunc;
+
+}
+psFreeFunc psMemGetDeallocator(psPtr ptr)
+{
+    if (ptr == NULL) {
+        return NULL;
+    }
+
+    psMemBlock* PTR = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(PTR, __func__) != 0) {
+        memProblemCallback(PTR, __func__, __LINE__);
+    }
+
+    return PTR->freeFunc;
+}
+
+bool p_psMemGetPersistent(psPtr vptr)
+{
+    if (vptr == NULL) {
+        return NULL;
+    }
+
+    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
+
+    if (checkMemBlock(ptr, __func__) != 0) {
+        memProblemCallback(ptr, __func__, __LINE__);
+    }
+
+    return ptr->persistent;
+}
+
+void p_psMemSetPersistent(psPtr vptr, bool value)
 {
     if (vptr == NULL) {
@@ -652 +697 @@
     }
 
-    ptr->freeFcn = freeFcn;
-
-}
-psFreeFunc psMemGetDeallocator(psPtr vptr)
-{
-    if (vptr == NULL) {
-        return NULL;
-    }
-
-    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    return ptr->freeFcn;
-}
-
-bool p_psMemGetPersistent(psPtr vptr)
-{
-    if (vptr == NULL) {
-        return NULL;
-    }
-
-    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    return ptr->persistent;
-}
-
-void p_psMemSetPersistent(psPtr vptr, bool value)
-{
-    if (vptr == NULL) {
-        return;
-    }
-
-    psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
     ptr->persistent = value;
 }