Changeset 3541

Timestamp:

Mar 29, 2005, 11:31:54 AM (21 years ago)

Author:

desonia

Message:

fixed some small bugs.

Location:

trunk/psLib

Files:

• src/astronomy/psMetadata.c (modified) (1 diff)
• src/astronomy/psMetadata.h (modified) (2 diffs)
• src/collections/psMetadata.c (modified) (1 diff)
• src/collections/psMetadata.h (modified) (2 diffs)
• src/sys/psTrace.c (modified) (4 diffs)
• src/sysUtils/psTrace.c (modified) (4 diffs)
• src/types/psMetadata.c (modified) (1 diff)
• src/types/psMetadata.h (modified) (2 diffs)
• test/sysUtils/tst_psTrace.c (modified) (1 diff)

trunk/psLib/src/astronomy/psMetadata.c

@@ -9 +9 @@
 *  @ingroup Metadata
 *
+*  @author Robert DeSonia, MHPCC
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-24 22:21:17 $
+*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 21:31:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/astronomy/psMetadata.h

@@ -1 @@
-
 /** @file  psMetadata.h
 *
@@ -9 +8 @@
 *  @ingroup Metadata
 *
+*  @author Robert DeSonia, MHPCC
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 21:31:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psMetadata.c

@@ -9 +9 @@
 *  @ingroup Metadata
 *
+*  @author Robert DeSonia, MHPCC
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-24 22:21:17 $
+*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 21:31:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/collections/psMetadata.h

@@ -1 @@
-
 /** @file  psMetadata.h
 *
@@ -9 +8 @@
 *  @ingroup Metadata
 *
+*  @author Robert DeSonia, MHPCC
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 21:31:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-29 21:31:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -150 +150 @@
 static psBool componentAdd(const char *addNodeName, psS32 level)
 {
-    psS32 i = 0;                  // Loop index variable.
+    psS32 i = 0;                        // Loop index variable.
     char name[strlen(addNodeName) + 1]; // buffer for writeable copy.
     char *pname = name;
@@ -185 +185 @@
     while (pname != NULL) {
         firstComponent = pname;
-        pname = strtok(pname, ".");
+        pname = strchr(firstComponent, '.');
         if (pname != NULL) {
             *pname = '\0';
@@ -325 +325 @@
     defaultLevel = cRoot->level;
     strcpy(name, aname);
-    pname = &name[1];
+    pname = name+1;
     while (pname != NULL) {
         firstComponent = pname;
-        pname = strtok(pname, ".");
+        pname = strchr(firstComponent, '.');
         if (pname != NULL) {
             *pname = '\0';

trunk/psLib/src/sysUtils/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-29 21:31:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -150 +150 @@
 static psBool componentAdd(const char *addNodeName, psS32 level)
 {
-    psS32 i = 0;                  // Loop index variable.
+    psS32 i = 0;                        // Loop index variable.
     char name[strlen(addNodeName) + 1]; // buffer for writeable copy.
     char *pname = name;
@@ -185 +185 @@
     while (pname != NULL) {
         firstComponent = pname;
-        pname = strtok(pname, ".");
+        pname = strchr(firstComponent, '.');
         if (pname != NULL) {
             *pname = '\0';
@@ -325 +325 @@
     defaultLevel = cRoot->level;
     strcpy(name, aname);
-    pname = &name[1];
+    pname = name+1;
     while (pname != NULL) {
         firstComponent = pname;
-        pname = strtok(pname, ".");
+        pname = strchr(firstComponent, '.');
         if (pname != NULL) {
             *pname = '\0';

trunk/psLib/src/types/psMetadata.c

@@ -9 +9 @@
 *  @ingroup Metadata
 *
+*  @author Robert DeSonia, MHPCC
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-24 22:21:17 $
+*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 21:31:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/types/psMetadata.h

@@ -1 @@
-
 /** @file  psMetadata.h
 *
@@ -9 +8 @@
 *  @ingroup Metadata
 *
+*  @author Robert DeSonia, MHPCC
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-29 21:31:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/test/sysUtils/tst_psTrace.c

@@ -98 +98 @@
     psTraceSetDestination(stderr);
     (void)psTraceSetLevel(".A.B.C.D.E", 5);
+
+    psTrace(".A.C.D.C",1,"You should not see this.\n");
+    psTrace(".A.B.C.D.E",2,"You should see this.\n");
+    psTrace(".A.B.C.D.E.F",3,"You should see this too.\n");
 
     psTracePrintLevels();