Changeset 1700

Timestamp:

Sep 7, 2004, 9:58:06 AM (22 years ago)

Author:

desonia

Message:

fixed small bug in psTraceReset.

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.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-27 21:45:42 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-07 19:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -121 +121 @@
 void psTraceReset()
 {
-    componentFree(cRoot);
+    psFree(cRoot);
     cRoot = NULL;
 }
@@ -152 +152 @@
 
     if (addNodeName[0] != '.') {
-        printf("ERROR: failed to add %s to the root component tree.\n", addNodeName);
-        exit(1);
+        psAbort(__func__,"Failed to add %s to the root component tree.\n",
+                addNodeName);
     }
 
@@ -178 +178 @@
             currentNode->subcomp = psRealloc(currentNode->subcomp,
                                              (currentNode->n + 1) * sizeof(p_psComponent* ));
-            currentNode->n = (currentNode->n) + 1;
+            currentNode->n++;
 
             if (pname == NULL) {
-                currentNode->subcomp[(currentNode->n) - 1] = componentAlloc(firstComponent, level);
+                currentNode->subcomp[currentNode->n - 1] = componentAlloc(firstComponent, level);
             } else {
-                currentNode->subcomp[(currentNode->n) - 1] = componentAlloc(firstComponent, currentNode->level);
-            }
-            currentNode = currentNode->subcomp[(currentNode->n) - 1];
+                currentNode->subcomp[currentNode->n - 1] = componentAlloc(firstComponent, currentNode->level);
+            }
+            currentNode = currentNode->subcomp[currentNode->n - 1];
         }
     }

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-27 21:45:42 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-07 19:58:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -121 +121 @@
 void psTraceReset()
 {
-    componentFree(cRoot);
+    psFree(cRoot);
     cRoot = NULL;
 }
@@ -152 +152 @@
 
     if (addNodeName[0] != '.') {
-        printf("ERROR: failed to add %s to the root component tree.\n", addNodeName);
-        exit(1);
+        psAbort(__func__,"Failed to add %s to the root component tree.\n",
+                addNodeName);
     }
 
@@ -178 +178 @@
             currentNode->subcomp = psRealloc(currentNode->subcomp,
                                              (currentNode->n + 1) * sizeof(p_psComponent* ));
-            currentNode->n = (currentNode->n) + 1;
+            currentNode->n++;
 
             if (pname == NULL) {
-                currentNode->subcomp[(currentNode->n) - 1] = componentAlloc(firstComponent, level);
+                currentNode->subcomp[currentNode->n - 1] = componentAlloc(firstComponent, level);
             } else {
-                currentNode->subcomp[(currentNode->n) - 1] = componentAlloc(firstComponent, currentNode->level);
-            }
-            currentNode = currentNode->subcomp[(currentNode->n) - 1];
+                currentNode->subcomp[currentNode->n - 1] = componentAlloc(firstComponent, currentNode->level);
+            }
+            currentNode = currentNode->subcomp[currentNode->n - 1];
         }
     }