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

Timestamp:

Feb 9, 2005, 4:36:42 PM (21 years ago)

Author:

desonia

Message:

prepared the config/data directories to be installed into standard areas.

File:

• trunk/psLib/src/sys/psTrace.c (modified) (6 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-03 00:54:11 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-10 02:36:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
 #ifndef PS_NO_TRACE
 
+#include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -146 +147 @@
 /*****************************************************************************
 componentAdd(): Adds the component named "addNodeName" to the root tree.
- 
-NOTE: replace the call to strsep() with a call to strtok(), which conforms
-to ANSI-C.
  *****************************************************************************/
 static psBool componentAdd(const char *addNodeName, psS32 level)
@@ -180 +178 @@
 
     strcpy(name, addNodeName);
-    pname = &name[1];
+    pname = name+1;
     // Iterate through the components of addNodeName.  Strip off the first
     // component of the name, find that in the root tree, or add it if it
@@ -186 +184 @@
 
     while (pname != NULL) {
-        firstComponent = strsep(&pname, ".");
+        firstComponent = pname;
+        pname = strtok(pname, ".");
+        if (pname != NULL) {
+            *pname = '\0';
+            pname++;
+        }
         nodeExists = 0;
         for (i = 0; i < currentNode->n; i++) {
@@ -324 +327 @@
     pname = &name[1];
     while (pname != NULL) {
-        firstComponent = strsep(&pname, ".");
+        firstComponent = pname;
+        pname = strtok(pname, ".");
+        if (pname != NULL) {
+            *pname = '\0';
+            pname++;
+        }
         for (i = 0; i < currentNode->n; i++) {
             if (NULL == currentNode->subcomp[i]) {