Changeset 1738

Timestamp:

Sep 8, 2004, 2:14:42 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

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

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 00:10:48 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 00:14:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -237 +237 @@
     }
 
-    /*
-        if (comp[0] != '.') {
-            compName = (char *) psAlloc(10 + strlen(comp));
-            compName[0] = '.';
-            compName = strcat(compName, comp);
-        } else {
-            compName = (char *) comp;
-        }
-    */
+    if (comp[0] != '.') {
+        compName = (char *) psAlloc(10 + strlen(comp));
+        compName[0] = '.';
+        compName = strcat(compName, comp);
+    } else {
+        compName = (char *) comp;
+    }
 
     // Add the new component to the component tree.
@@ -261 +259 @@
     }
 
-    /*
-        if (comp[0] != '.') {
-            psFree(compName);
-        }
-    */
+    if (comp[0] != '.') {
+        psFree(compName);
+    }
+
     return true;
 }
@@ -351 +348 @@
 int psTraceGetLevel(const char *name)
 {
+    char *compName = NULL;
+    int traceLevel;
+
     if (cRoot == NULL) {
         return (PS_UNKNOWN_TRACE_LEVEL);
     }
-    // Search the component root tree, determine the trace level.
-    return (doGetTraceLevel(name));
+
+    if (name[0] != '.') {
+        compName = (char *) psAlloc(10 + strlen(name));
+        compName[0] = '.';
+        compName = strcat(compName, name);
+        traceLevel = doGetTraceLevel(compName);
+        psFree(compName);
+    } else {
+        // Search the component root tree, determine the trace level.
+        traceLevel = doGetTraceLevel(name);
+    }
+    return(traceLevel);
 }
 

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 00:10:48 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 00:14:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -237 +237 @@
     }
 
-    /*
-        if (comp[0] != '.') {
-            compName = (char *) psAlloc(10 + strlen(comp));
-            compName[0] = '.';
-            compName = strcat(compName, comp);
-        } else {
-            compName = (char *) comp;
-        }
-    */
+    if (comp[0] != '.') {
+        compName = (char *) psAlloc(10 + strlen(comp));
+        compName[0] = '.';
+        compName = strcat(compName, comp);
+    } else {
+        compName = (char *) comp;
+    }
 
     // Add the new component to the component tree.
@@ -261 +259 @@
     }
 
-    /*
-        if (comp[0] != '.') {
-            psFree(compName);
-        }
-    */
+    if (comp[0] != '.') {
+        psFree(compName);
+    }
+
     return true;
 }
@@ -351 +348 @@
 int psTraceGetLevel(const char *name)
 {
+    char *compName = NULL;
+    int traceLevel;
+
     if (cRoot == NULL) {
         return (PS_UNKNOWN_TRACE_LEVEL);
     }
-    // Search the component root tree, determine the trace level.
-    return (doGetTraceLevel(name));
+
+    if (name[0] != '.') {
+        compName = (char *) psAlloc(10 + strlen(name));
+        compName[0] = '.';
+        compName = strcat(compName, name);
+        traceLevel = doGetTraceLevel(compName);
+        psFree(compName);
+    } else {
+        // Search the component root tree, determine the trace level.
+        traceLevel = doGetTraceLevel(name);
+    }
+    return(traceLevel);
 }