Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 1714)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 1715)
@@ -9,6 +9,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-07 19:05:07 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-08 00:15:16 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104,5 +104,5 @@
     if (ptr->refCounter < 1) {
         psErrorMsg(ERRORNAME_PREFIX "memProblemCallbackDefault", false, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_memProblemCallbackDefault_MULTIPLE_FREE,
+                   PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
                    ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
@@ -232,5 +232,5 @@
     if (m == NULL) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_NULL_BLOCK);
+                   PS_ERRORTEXT_psMemory_NULL_BLOCK);
         return 1;
     }
@@ -239,5 +239,5 @@
         // using an unreferenced block of memory, are you?
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_DEREF_USE,
+                   PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
                    m->id);
         return 1;
@@ -246,5 +246,5 @@
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_UNDERFLOW,
+                   PS_ERRORTEXT_psMemory_UNDERFLOW,
                    m->id);
         return 1;
@@ -252,5 +252,5 @@
     if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_OVERFLOW,
+                   PS_ERRORTEXT_psMemory_OVERFLOW,
                    m->id);
         return 1;
Index: /trunk/psLib/src/sys/psString.c
===================================================================
--- /trunk/psLib/src/sys/psString.c	(revision 1714)
+++ /trunk/psLib/src/sys/psString.c	(revision 1715)
@@ -9,6 +9,6 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:09:06 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 00:15:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,5 +40,5 @@
         // Log error message and return NULL
         psErrorMsg(ERRORNAME_PREFIX "psStringNCopy", PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psStringNCopy_NCHAR_NEGATIVE,
+                   PS_ERRORTEXT_psString_NCHAR_NEGATIVE,
                    nChar);
         return NULL;
Index: /trunk/psLib/src/sysUtils/psMemory.c
===================================================================
--- /trunk/psLib/src/sysUtils/psMemory.c	(revision 1714)
+++ /trunk/psLib/src/sysUtils/psMemory.c	(revision 1715)
@@ -9,6 +9,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-07 19:05:07 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-08 00:15:16 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104,5 +104,5 @@
     if (ptr->refCounter < 1) {
         psErrorMsg(ERRORNAME_PREFIX "memProblemCallbackDefault", false, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_memProblemCallbackDefault_MULTIPLE_FREE,
+                   PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
                    ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
@@ -232,5 +232,5 @@
     if (m == NULL) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_NULL_BLOCK);
+                   PS_ERRORTEXT_psMemory_NULL_BLOCK);
         return 1;
     }
@@ -239,5 +239,5 @@
         // using an unreferenced block of memory, are you?
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_DEREF_USE,
+                   PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
                    m->id);
         return 1;
@@ -246,5 +246,5 @@
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_UNDERFLOW,
+                   PS_ERRORTEXT_psMemory_UNDERFLOW,
                    m->id);
         return 1;
@@ -252,5 +252,5 @@
     if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_OVERFLOW,
+                   PS_ERRORTEXT_psMemory_OVERFLOW,
                    m->id);
         return 1;
Index: /trunk/psLib/src/sysUtils/psString.c
===================================================================
--- /trunk/psLib/src/sysUtils/psString.c	(revision 1714)
+++ /trunk/psLib/src/sysUtils/psString.c	(revision 1715)
@@ -9,6 +9,6 @@
  *  @author Eric Van Alst, MHPCC
  *   
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:09:06 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 00:15:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,5 +40,5 @@
         // Log error message and return NULL
         psErrorMsg(ERRORNAME_PREFIX "psStringNCopy", PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psStringNCopy_NCHAR_NEGATIVE,
+                   PS_ERRORTEXT_psString_NCHAR_NEGATIVE,
                    nChar);
         return NULL;
Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat
===================================================================
--- /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat	(revision 1714)
+++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat	(revision 1715)
@@ -17,9 +17,9 @@
 # Error Messages from psMemory.c:
 #
-checkMemBlock_NULL_BLOCK                       NULL memory block found.
-checkMemBlock_DEREF_USE                        Memory block %ld was freed but still used.
-checkMemBlock_UNDERFLOW                        Memory block %ld is corrupted; buffer underflow detected.
-checkMemBlock_OVERFLOW                         Memory block %ld is corrupted; buffer overflow detected.
-memProblemCallbackDefault_MULTIPLE_FREE        Block %ld allocated at %s:%d freed more than once at %s:%d.
+psMemory_NULL_BLOCK                            NULL memory block found.
+psMemory_DEREF_BLOCK_USE                       Memory block %ld was freed but still used.
+psMemory_UNDERFLOW                             Memory block %ld is corrupted; buffer underflow detected.
+psMemory_OVERFLOW                              Memory block %ld is corrupted; buffer overflow detected.
+psMemory_MULTIPLE_FREE                         Block %ld allocated at %s:%d freed more than once at %s:%d.
 #
 # Error Messages from psString.c:
Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.h
===================================================================
--- /trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 1714)
+++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 1715)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:09:06 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 00:15:16 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35,9 +35,9 @@
 #define PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL "Do not know how to handle the protocol '%s'."
 #define PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY "Unknown logging keyword %c."
-#define PS_ERRORTEXT_checkMemBlock_NULL_BLOCK "NULL memory block found."
-#define PS_ERRORTEXT_checkMemBlock_DEREF_USE "Memory block %ld was freed but still used."
-#define PS_ERRORTEXT_checkMemBlock_UNDERFLOW "Memory block %ld is corrupted; buffer underflow detected."
-#define PS_ERRORTEXT_checkMemBlock_OVERFLOW "Memory block %ld is corrupted; buffer overflow detected."
-#define PS_ERRORTEXT_memProblemCallbackDefault_MULTIPLE_FREE "Block %ld allocated at %s:%d freed more than once at %s:%d."
+#define PS_ERRORTEXT_psMemory_NULL_BLOCK "NULL memory block found."
+#define PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE "Memory block %ld was freed but still used."
+#define PS_ERRORTEXT_psMemory_UNDERFLOW "Memory block %ld is corrupted; buffer underflow detected."
+#define PS_ERRORTEXT_psMemory_OVERFLOW "Memory block %ld is corrupted; buffer overflow detected."
+#define PS_ERRORTEXT_psMemory_MULTIPLE_FREE "Block %ld allocated at %s:%d freed more than once at %s:%d."
 #define PS_ERRORTEXT_psString_NCHAR_NEGATIVE "Can not copy a negative number of characters (%d)."
 #define PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT "Sub-component %d of node %s in trace tree is NULL."