Changeset 1735

Timestamp:

Sep 8, 2004, 1:58:36 PM (22 years ago)

Author:

gusciora

Message:

Optional leading "." in component names.

Location:

trunk/psLib/src

Files:

• sys/psTrace.c (modified) (2 diffs)
• sysUtils/psTrace.c (modified) (2 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 22:10:06 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 23:58:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -230 +230 @@
                      int level)  // desired trace level
 {
+    char *compName = NULL;
+
     // If the root component tree does not exist, then initialize it.
     if (cRoot == NULL) {
         initTrace();
     }
+
+    if (comp[0] != '.') {
+        compName = (char *) psAlloc(2 + strlen(comp));
+        compName[0] = '.';
+        compName = strcat(compName, comp);
+    } else {
+        compName = (char *) comp;
+    }
+
     // Add the new component to the component tree.
-    if ( !componentAdd(comp, level) ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psTraceSetLevel", PS_ERR_UNKNOWN, false,
-                   PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT,level,comp);
+    if ( !componentAdd(compName, level) ) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psTraceSetLevel",
+                   PS_ERR_UNKNOWN,
+                   false,
+                   PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT,
+                   level,
+                   compName);
+        if (comp[0] != '.') {
+            psFree(compName);
+        }
         return false;
+    }
+
+    if (comp[0] != '.') {
+        psFree(compName);
     }
     return true;

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-08 22:10:06 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 23:58:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -230 +230 @@
                      int level)  // desired trace level
 {
+    char *compName = NULL;
+
     // If the root component tree does not exist, then initialize it.
     if (cRoot == NULL) {
         initTrace();
     }
+
+    if (comp[0] != '.') {
+        compName = (char *) psAlloc(2 + strlen(comp));
+        compName[0] = '.';
+        compName = strcat(compName, comp);
+    } else {
+        compName = (char *) comp;
+    }
+
     // Add the new component to the component tree.
-    if ( !componentAdd(comp, level) ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psTraceSetLevel", PS_ERR_UNKNOWN, false,
-                   PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT,level,comp);
+    if ( !componentAdd(compName, level) ) {
+        psErrorMsg(PS_ERRORNAME_DOMAIN "psTraceSetLevel",
+                   PS_ERR_UNKNOWN,
+                   false,
+                   PS_ERRORTEXT_psTrace_FAILED_TO_ADD_COMPONENT,
+                   level,
+                   compName);
+        if (comp[0] != '.') {
+            psFree(compName);
+        }
         return false;
+    }
+
+    if (comp[0] != '.') {
+        psFree(compName);
     }
     return true;