Index: trunk/psLib/src/sysUtils/psTrace.c
===================================================================
--- trunk/psLib/src/sysUtils/psTrace.c	(revision 1834)
+++ trunk/psLib/src/sysUtils/psTrace.c	(revision 2204)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-20 22:03:35 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34,5 +34,5 @@
  
     PS_DEFAULT_TRACE_LEVEL: This should only be used when adding the
-    intermediate components of a long name.  Ie. the "B" in .A.B.C
+    intermediate components of a psS64 name.  Ie. the "B" in .A.B.C
  
  *****************************************************************************/
@@ -56,10 +56,10 @@
 
 static void componentFree(p_psComponent* comp);
-static p_psComponent* componentAlloc(const char *name, int level);
+static p_psComponent* componentAlloc(const char *name, psS32 level);
 
 /*****************************************************************************
 componentAlloc(): allocate memory for a new node, and initialize members.
  *****************************************************************************/
-static p_psComponent* componentAlloc(const char *name, int level)
+static p_psComponent* componentAlloc(const char *name, psS32 level)
 {
     p_psComponent* comp = psAlloc(sizeof(p_psComponent));
@@ -68,5 +68,5 @@
     p_psMemSetDeallocator(comp, (psFreeFcn) componentFree);
     comp->name = psStringCopy(name);
-    p_psMemSetPersistent((void*)comp->name,true);
+    p_psMemSetPersistent((psPtr)comp->name,true);
     comp->level = level;
     comp->n = 0;
@@ -86,5 +86,5 @@
 
     if (comp->subcomp != NULL) {
-        for (int i = 0; i < comp->n; i++) {
+        for (psS32 i = 0; i < comp->n; i++) {
             p_psMemSetPersistent(comp->subcomp[i],false);
             psFree(comp->subcomp[i]);
@@ -94,6 +94,6 @@
     }
 
-    p_psMemSetPersistent((void*)comp->name,false);
-    psFree((void*)comp->name);
+    p_psMemSetPersistent((psPtr)comp->name,false);
+    psFree((psPtr)comp->name);
 }
 
@@ -115,5 +115,5 @@
 void p_psTraceReset(p_psComponent* currentNode)
 {
-    int i = 0;
+    psS32 i = 0;
 
     if (NULL == currentNode) {
@@ -149,12 +149,12 @@
 to ANSI-C.
  *****************************************************************************/
-static bool componentAdd(const char *addNodeName, int level)
-{
-    int i = 0;                  // Loop index variable.
+static psBool componentAdd(const char *addNodeName, psS32 level)
+{
+    psS32 i = 0;                  // Loop index variable.
     char name[strlen(addNodeName) + 1]; // buffer for writeable copy.
     char *pname = name;
     char *firstComponent = NULL;        // first component of name
     p_psComponent* currentNode = cRoot;
-    int nodeExists = 0;
+    psS32 nodeExists = 0;
 
     // XXX: Verify that this is the correct behavior.
@@ -240,6 +240,6 @@
  zero
 *****************************************************************************/
-bool psTraceSetLevel(const char *comp,   // component of interest
-                     int level)  // desired trace level
+psBool psTraceSetLevel(const char *comp,   // component of interest
+                       psS32 level)  // desired trace level
 {
     char *compName = NULL;
@@ -299,5 +299,5 @@
  The trace level of the "name" component.
  *****************************************************************************/
-static int doGetTraceLevel(const char *aname)
+static psS32 doGetTraceLevel(const char *aname)
 {
     char name[strlen(aname) + 1];       // need a writeable copy: for strsep()
@@ -305,6 +305,6 @@
     char *firstComponent = NULL;        // first component of name
     p_psComponent* currentNode = cRoot;
-    int i = 0;
-    int defaultLevel = 0;
+    psS32 i = 0;
+    psS32 defaultLevel = 0;
 
     if (NULL == currentNode) {
@@ -365,8 +365,8 @@
  The level of "name" in the root component tree.
  *****************************************************************************/
-int psTraceGetLevel(const char *name)
+psS32 psTraceGetLevel(const char *name)
 {
     char *compName = NULL;
-    int traceLevel;
+    psS32 traceLevel;
 
     if (cRoot == NULL) {
@@ -401,8 +401,8 @@
  *****************************************************************************/
 static void doPrintTraceLevels(const p_psComponent* comp,
-                               int depth,
-                               int defLevel)
-{
-    int i = 0;
+                               psS32 depth,
+                               psS32 defLevel)
+{
+    psS32 i = 0;
 
     if (comp->name[0] == '\0') {
@@ -472,10 +472,10 @@
  *****************************************************************************/
 void p_psTrace(const char *comp,        // component being traced
-               int level,       // desired trace level
+               psS32 level,       // desired trace level
                ...)             // arguments
 {
     char *fmt = NULL;
     va_list ap;
-    int i = 0;
+    psS32 i = 0;
 
     if (NULL == comp) {