Changeset 1731 for trunk/psLib/src/sysUtils/psLogMsg.c

Timestamp:

Sep 8, 2004, 11:22:47 AM (22 years ago)

Author:

desonia

Message:

changed the naming conventions of errors.

File:

• trunk/psLib/src/sysUtils/psLogMsg.c (modified) (8 diffs)

trunk/psLib/src/sysUtils/psLogMsg.c

@@ -12 +12 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 00:19:21 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 21:22:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 
 #include "psSysUtilsErrors.h"
-#define ERRORNAME_PREFIX PS_ERRORNAME_DOMAIN ".psLogMsg."
 
 #define MIN_LOG_LEVEL 0
@@ -113 +112 @@
 
     if (sscanf(dest, "%4s:%256s", protocol, location) < 2) {
-        psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
                    PS_ERRORTEXT_psLogMsg_DESTINATION_MALFORMED,
                    dest);
@@ -134 +133 @@
             return true;
         }
-        psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
                    PS_ERRORTEXT_psLogMsg_DEST_LOCATION_INVALID,
                    location);
@@ -142 +141 @@
 
         if (file == NULL) {
-            psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_IO,
+            psErrorMsg(PS_ERRORNAME_DOMAIN "psLogSetDestination", true, PS_ERR_IO,
                        PS_ERRORTEXT_psLogMsg_OPEN_FILE_FAILED,
                        location);
@@ -154 +153 @@
     }
 
-    psErrorMsg(ERRORNAME_PREFIX "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
+    psErrorMsg(PS_ERRORNAME_DOMAIN "psLogSetDestination", true, PS_ERR_LOCATION_INVALID,
                PS_ERRORTEXT_psLogMsg_UNSUPPORTED_PROTOCOL,
                protocol);
@@ -218 +217 @@
             break;
         default:
-            psErrorMsg(ERRORNAME_PREFIX "psLogSetFormat", true, PS_ERR_BAD_PARAMETER_VALUE,
+            psErrorMsg(PS_ERRORNAME_DOMAIN "psLogSetFormat", true, PS_ERR_BAD_PARAMETER_VALUE,
                        PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
             break;
@@ -333 +332 @@
             *head_ptr++ = '|';
         }
-        maxLength -= snprintf(head_ptr, maxLength, "%15.15s", name);
+        if (strlen(name) > 15) {
+            maxLength -= snprintf(head_ptr, maxLength, "+%14.14s", &name[strlen(name)-14]);
+        } else {
+            maxLength -= snprintf(head_ptr, maxLength, "%15.15s", name);
+        }
+
         head_ptr += strlen(head_ptr);
     }