Changeset 8232 for trunk/psLib/src/sys/psTrace.c

Timestamp:

Aug 8, 2006, 1:32:23 PM (20 years ago)

Author:

jhoblitt

Message:

bug #790 - remove psErrorText.h and inline all error codes. all newly inlined error codes are wrapped with the _() macro from future gettextification

Location:

trunk/psLib/src

Files:

• . (modified) (1 prop)
• sys/psTrace.c (modified) (9 diffs)

trunk/psLib/src

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-15 00:22:54 $
+ *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-08 23:32:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 #include "psLogMsg.h"
 
-#include "psErrorText.h"
+
 
 static p_psComponent* cRoot = NULL; // The root of the trace component
@@ -132 +132 @@
         if (NULL == currentNode->subcomp[i]) {
             psLogMsg("p_psTraceReset", PS_LOG_WARN,
-                     PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT,
+                     _("Sub-component %d of node %s in trace tree is NULL."),
                      i, currentNode->name);
         } else {
@@ -165 +165 @@
     if (strcmp("", addNodeName) == 0) {
         psError(PS_ERR_BAD_PARAMETER_NULL,true,
-                PS_ERRORTEXT_psTrace_ADD_NULL_COMPONENT);
+                _("Failed to add null component to trace tree."));
         return false;
     }
@@ -177 +177 @@
     if (addNodeName[0] != '.') {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,
-                PS_ERRORTEXT_psTrace_MALFORMED_COMPONENT_NAME,
+                _("Failed to add '%s' to the root component tree; component must start with '.'."),
                 addNodeName);
         return false;
@@ -274 +274 @@
     if ( !componentAdd(compName, level) ) {
         psError(PS_ERR_UNKNOWN, false,
-                PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT,
+                _("Failed to set trace level (%d) to '%s'."),
                 level,
                 compName);
@@ -346 +346 @@
             if (NULL == currentNode->subcomp[i]) {
                 psLogMsg("p_psTraceReset", PS_LOG_WARN,
-                         PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT,
+                         _("Sub-component %d of node %s in trace tree is NULL."),
                          i, currentNode->name);
             }
@@ -504 +504 @@
     if (NULL == comp) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                PS_ERRORTEXT_psTrace_NULL_TRACETREE,
+                _("Function %s called on a NULL trace level tree."),
                 __func__);
         return;
@@ -705 +705 @@
         default:
             psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY, *ptr);
+                    _("Unknown logging keyword %c."), *ptr);
             return false;
         }

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg