Changeset 446 for trunk/archive/pslib/src/Utils/memory.c

Timestamp:

Apr 19, 2004, 9:41:51 AM (22 years ago)

Author:

rhl

Message:

Fixed up code for changes in organisation and APIs

File:

• trunk/archive/pslib/src/Utils/memory.c (modified) (8 diffs)

trunk/archive/pslib/src/Utils/memory.c

@@ -52 +52 @@
     return NULL;
 }
-static psMemExhaustedCallback memExhaustedCB = memExhaustedCB0;
-
-psMemExhaustedCallback psMemExhaustedSetCB(psMemExhaustedCallback func)
-{
-    psMemExhaustedCallback old = memExhaustedCB;
+static psMemExhaustedCB memExhaustedCB = memExhaustedCB0;
+
+psMemExhaustedCB psMemExhaustedSetCB(psMemExhaustedCB func)
+{
+    psMemExhaustedCB old = memExhaustedCB;
 
     memExhaustedCB = (func != NULL) ? func : memExhaustedCB0;
@@ -89 +89 @@
     }
 }
-static psMemProblemCallback memProblemCB = memProblemCB0;
-
-psMemProblemCallback psMemProblemSetCB(psMemProblemCallback func)
-{
-    psMemProblemCallback old = memProblemCB;
+static psMemProblemCB memProblemCB = memProblemCB0;
+
+psMemProblemCB psMemProblemSetCB(psMemProblemCB func)
+{
+    psMemProblemCB old = memProblemCB;
 
     memProblemCB = (func != NULL) ? func : memProblemCB0;
@@ -129 +129 @@
  * isn't resignalled)
  */
-static int memAllocateCB0(const psMemBlock *ptr)
+static long memAllocateCB0(const psMemBlock *ptr)
 {
     static int incr = 0;                // "p_psMemAllocateID += incr"
@@ -138 +138 @@
 }
 
-static int memFreeCB0(const psMemBlock *ptr)
+static long memFreeCB0(const psMemBlock *ptr)
 {
     static int incr = 0;                // "p_psMemFreeID += incr"
@@ -150 +150 @@
  * The default callbacks, and the routines to change them
  */
-static psMemCallback memAllocateCB = memAllocateCB0;
-static psMemCallback memFreeCB = memFreeCB0;
-
-psMemCallback psMemAllocateSetCB(psMemCallback func)
-{
-    psMemCallback old = memAllocateCB;
+static psMemAllocateCB memAllocateCB = memAllocateCB0;
+static psMemFreeCB memFreeCB = memFreeCB0;
+
+psMemAllocateCB psMemAllocateSetCB(psMemAllocateCB func)
+{
+    psMemAllocateCB old = memAllocateCB;
 
     memAllocateCB = (func != NULL) ? func : memAllocateCB0;
@@ -162 +162 @@
 }
 
-psMemCallback psMemFreeSetCB(psMemCallback func)
-{
-    psMemCallback old = memFreeCB;
+psMemFreeCB psMemFreeSetCB(psMemFreeCB func)
+{
+    psMemFreeCB old = memFreeCB;
 
     memFreeCB = (func != NULL) ? func : memFreeCB0;
@@ -208 +208 @@
     }
     
-    if (m->magic0 != P_PS_MEMMAGIC || m->magic != P_PS_MEMMAGIC) {
+    if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         if (!quiet) {
             psError(__func__, PS_ERR_MEMORY_CORRUPTION, PS_NEW_ERROR,
@@ -261 +261 @@
     ptr->file = file;
     *(int *)&ptr->lineno = lineno;
-    *(void **)&ptr->magic0 = *(void **)&ptr->magic = P_PS_MEMMAGIC;
+    *(void **)&ptr->startblock = *(void **)&ptr->endblock = P_PS_MEMMAGIC;
+    ptr->endpost = &ptr->endblock;      // should point just beyond allocated memory XXX
 
     ptr->refCounter = 1;                // one user so far