Index: /trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.c	(revision 1715)
+++ /trunk/psLib/src/sys/psLogMsg.c	(revision 1716)
@@ -12,6 +12,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:09:06 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 00:19:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -114,5 +114,5 @@
     if (sscanf(dest, "%4s:%256s", protocol, location) < 2) {
         psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
-                   PS_ERRORTEXT_psLogSetDestination_DESTINATION_MALFORMED,
+                   PS_ERRORTEXT_psLogMsg_DESTINATION_MALFORMED,
                    dest);
         return false;
@@ -135,5 +135,5 @@
         }
         psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
-                   PS_ERRORTEXT_psLogSetDestination_DEST_LOCATION_INVALID,
+                   PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID,
                    location);
         return 1;
@@ -143,5 +143,5 @@
         if (file == NULL) {
             psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_IO,
-                       PS_ERRORTEXT_psLogSetDestination_OPEN_FILE_FAILED,
+                       PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED,
                        location);
             return false;
@@ -155,5 +155,5 @@
 
     psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
-               PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL,
+               PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL,
                protocol);
     return false;
@@ -219,5 +219,5 @@
         default:
             psErrorMsg(ERRORNAME_PREFIX "psLogSetFormat", true, PS_ERR_BAD_PARAMETER_VALUE,
-                       PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY, *ptr);
+                       PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
             break;
         }
Index: /trunk/psLib/src/sysUtils/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.c	(revision 1715)
+++ /trunk/psLib/src/sysUtils/psLogMsg.c	(revision 1716)
@@ -12,6 +12,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:09:06 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 00:19:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -114,5 +114,5 @@
     if (sscanf(dest, "%4s:%256s", protocol, location) < 2) {
         psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
-                   PS_ERRORTEXT_psLogSetDestination_DESTINATION_MALFORMED,
+                   PS_ERRORTEXT_psLogMsg_DESTINATION_MALFORMED,
                    dest);
         return false;
@@ -135,5 +135,5 @@
         }
         psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
-                   PS_ERRORTEXT_psLogSetDestination_DEST_LOCATION_INVALID,
+                   PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID,
                    location);
         return 1;
@@ -143,5 +143,5 @@
         if (file == NULL) {
             psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_IO,
-                       PS_ERRORTEXT_psLogSetDestination_OPEN_FILE_FAILED,
+                       PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED,
                        location);
             return false;
@@ -155,5 +155,5 @@
 
     psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
-               PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL,
+               PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL,
                protocol);
     return false;
@@ -219,5 +219,5 @@
         default:
             psErrorMsg(ERRORNAME_PREFIX "psLogSetFormat", true, PS_ERR_BAD_PARAMETER_VALUE,
-                       PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY, *ptr);
+                       PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
             break;
         }
Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat
===================================================================
--- /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat	(revision 1715)
+++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.dat	(revision 1716)
@@ -9,17 +9,17 @@
 # Error Messages from psLogMsg.c:
 #
-psLogSetDestination_DESTINATION_MALFORMED      The specified destination, %s, is malformed.
-psLogSetDestination_DEST_LOCATION_INVALID      The location, %s, for protocol 'dest' is invalid.
-psLogSetDestination_OPEN_FILE_FAILED           Could not open file '%s' for output.
-psLogSetDestination_UNSUPPORTED_PROTOCOL       Do not know how to handle the protocol '%s'.
-psLogSetFormat_UNKNOWN_KEY                     Unknown logging keyword %c.
+psLogMsg_DESTINATION_MALFORMED         The specified destination, %s, is malformed.
+psLogMsg_DEST_LOCATION_INVALID         The location, %s, for protocol 'dest' is invalid.
+psLogMsg_OPEN_FILE_FAILED              Could not open file '%s' for output.
+psLogMsg_UNSUPPORTED_PROTOCOL          Do not know how to handle the protocol '%s'.
+psLogMsg_UNKNOWN_KEY                   Unknown logging keyword %c.
 #
 # Error Messages from psMemory.c:
 #
-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.
+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:
@@ -29,7 +29,7 @@
 # Error Messages from psTrace.c:
 #
-psTrace_NULL_SUBCOMPONENT                      Sub-component %d of node %s in trace tree is NULL.
-psTrace_NULL_TRACETREE                         Function %s called on a NULL trace level tree.
-psTrace_ADD_NULL_COMPONENT                     Failed to add null component to trace tree.
-psTrace_MALFORMED_COMPONENT_NAME               Failed to add '%s' to the root component tree; component must start with '.'.
-psTrace_FAILED_TO_ADD_COMPONENT                Failed to set trace level (%d) to '%s'.
+psTrace_NULL_SUBCOMPONENT              Sub-component %d of node %s in trace tree is NULL.
+psTrace_NULL_TRACETREE                 Function %s called on a NULL trace level tree.
+psTrace_ADD_NULL_COMPONENT             Failed to add null component to trace tree.
+psTrace_MALFORMED_COMPONENT_NAME       Failed to add '%s' to the root component tree; component must start with '.'.
+psTrace_FAILED_TO_ADD_COMPONENT        Failed to set trace level (%d) to '%s'.
Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.h
===================================================================
--- /trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 1715)
+++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.h	(revision 1716)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:15:16 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 00:19:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30,9 +30,9 @@
 
 //~Start #define PS_ERRORTEXT_$1 "$2"
-#define PS_ERRORTEXT_psLogSetDestination_DESTINATION_MALFORMED "The specified destination, %s, is malformed."
-#define PS_ERRORTEXT_psLogSetDestination_DEST_LOCATION_INVALID "The location, %s, for protocol 'dest' is invalid."
-#define PS_ERRORTEXT_psLogSetDestination_OPEN_FILE_FAILED "Could not open file '%s' for output."
-#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_psLogMsg_DESTINATION_MALFORMED "The specified destination, %s, is malformed."
+#define PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID "The location, %s, for protocol 'dest' is invalid."
+#define PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED "Could not open file '%s' for output."
+#define PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL "Do not know how to handle the protocol '%s'."
+#define PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY "Unknown logging keyword %c."
 #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."