Index: /branches/jch-memory/psLib/src/sys/psError.c
===================================================================
--- /branches/jch-memory/psLib/src/sys/psError.c	(revision 10904)
+++ /branches/jch-memory/psLib/src/sys/psError.c	(revision 10905)
@@ -11,6 +11,6 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.41.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-03 21:45:54 $
+ *  @version $Revision: 1.41.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-05 00:49:33 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,7 +55,7 @@
     if (psArrayLength(errorStack) < MAX_ERROR_STACK_SIZE) {
         // make the psErr persistent
-        p_psMemSetPersistent(err, true);
-        p_psMemSetPersistent(err->msg, true);
-        p_psMemSetPersistent(err->name, true);
+        psMemSetPersistent(err, true);
+        psMemSetPersistent(err->msg, true);
+        psMemSetPersistent(err->name, true);
 
         psArrayAdd(errorStack, 0, err);
@@ -85,6 +85,6 @@
         // allocate the error stack
         errorStack = psArrayAllocEmpty(MAX_ERROR_STACK_SIZE);
-        p_psMemSetPersistent(errorStack, true);
-        p_psMemSetPersistent(errorStack->data, true);
+        psMemSetPersistent(errorStack, true);
+        psMemSetPersistent(errorStack->data, true);
         // store this threads error stack
         // note that pthread_setspecifc() does not take a pointer as the first
@@ -259,7 +259,7 @@
         psErr *err = errorStack->data[i];
 
-        p_psMemSetPersistent(err, false);
-        p_psMemSetPersistent(err->msg, false);
-        p_psMemSetPersistent(err->name, false);
+        psMemSetPersistent(err, false);
+        psMemSetPersistent(err->msg, false);
+        psMemSetPersistent(err->name, false);
     }
 
Index: /branches/jch-memory/psLib/src/sys/psTrace.c
===================================================================
--- /branches/jch-memory/psLib/src/sys/psTrace.c	(revision 10904)
+++ /branches/jch-memory/psLib/src/sys/psTrace.c	(revision 10905)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 22:04:58 $
+ *  @version $Revision: 1.79.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-05 00:49:33 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80,8 +80,8 @@
     p_psComponent* comp = psAlloc(sizeof(p_psComponent));
 
-    p_psMemSetPersistent(comp,true);
+    psMemSetPersistent(comp,true);
     psMemSetDeallocator(comp, (psFreeFunc) componentFree);
     comp->name = psStringCopy(name);
-    p_psMemSetPersistent((psPtr)comp->name,true);
+    psMemSetPersistent((psPtr)comp->name,true);
     comp->level = level;
     comp->n = 0;
@@ -103,12 +103,12 @@
     if (comp->subcomp != NULL) {
         for (psS32 i = 0; i < comp->n; i++) {
-            p_psMemSetPersistent(comp->subcomp[i],false);
+            psMemSetPersistent(comp->subcomp[i],false);
             psFree(comp->subcomp[i]);
         }
-        p_psMemSetPersistent(comp->subcomp,false);
+        psMemSetPersistent(comp->subcomp,false);
         psFree(comp->subcomp);
     }
 
-    p_psMemSetPersistent((psPtr)comp->name,false);
+    psMemSetPersistent((psPtr)comp->name,false);
     psFree(comp->name);
 }
@@ -232,5 +232,5 @@
             currentNode->subcomp = psRealloc(currentNode->subcomp,
                                              (currentNode->n + 1) * sizeof(p_psComponent* ));
-            p_psMemSetPersistent(currentNode->subcomp,true);
+            psMemSetPersistent(currentNode->subcomp,true);
 
             currentNode->n = (currentNode->n) + 1;