Changeset 1741

Timestamp:

Sep 8, 2004, 3:42:37 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib

Files:

• src/sys/psTrace.c (modified) (2 diffs)
• src/sysUtils/psTrace.c (modified) (3 diffs)
• test/sysUtils/tst_psTrace.c (modified) (1 diff)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 01:41:24 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 01:42:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -237 +237 @@
     }
 
+    // If the component name has no leading dot, then supply it.
     if (comp[0] != '.') {
         compName = (char *) psAlloc(10 + strlen(comp));

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-09 01:33:28 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-09 01:41:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -239 +239 @@
     if (comp[0] != '.') {
         compName = (char *) psAlloc(10 + strlen(comp));
-        compName[0] = '.';
+        strcpy(compName, ".");
         compName = strcat(compName, comp);
     } else {
@@ -357 +357 @@
     if (name[0] != '.') {
         compName = (char *) psAlloc(10 + strlen(name));
-        compName[0] = '.';
+        strcpy(compName, ".");
         compName = strcat(compName, name);
         traceLevel = doGetTraceLevel(compName);

trunk/psLib/test/sysUtils/tst_psTrace.c

@@ -307 +307 @@
     (void)psTraceSetLevel(".c.c", 5);
 
-    if ((psTraceGetLevel(".")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("c")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("a.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("a.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("b.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("b.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("c.a")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("c.b")!=PS_UNKNOWN_TRACE_LEVEL) ||
-            (psTraceGetLevel("c.c")!=PS_UNKNOWN_TRACE_LEVEL)) {
+    if ((psTraceGetLevel(".")!=9) ||
+            (psTraceGetLevel("a")!=8) ||
+            (psTraceGetLevel("b")!=7) ||
+            (psTraceGetLevel("c")!=5) ||
+            (psTraceGetLevel("a.a")!=4) ||
+            (psTraceGetLevel("a.b")!=3) ||
+            (psTraceGetLevel("b.a")!=2) ||
+            (psTraceGetLevel("b.b")!=1) ||
+            (psTraceGetLevel("c.a")!=0) ||
+            (psTraceGetLevel("c.b")!=3) ||
+            (psTraceGetLevel("c.c")!=5)) {
         return 1;
     }