Changeset 885

Timestamp:

Jun 4, 2004, 3:27:54 PM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• sys/psTrace.c (modified) (3 diffs)
• sys/psTrace.h (modified) (2 diffs)
• sysUtils/psHash.c (modified) (1 diff)
• sysUtils/psHash.h (modified) (2 diffs)
• sysUtils/psTrace.c (modified) (3 diffs)
• sysUtils/psTrace.h (modified) (2 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -39 +39 @@
 
 static Component *croot = NULL;           // The root of the trace component
+static FILE *traceFP = NULL;
 /*****************************************************************************
     componentAlloc(): allocate memory for a new node, and initialize members.
@@ -378 +379 @@
         va_start(ap, level);
 
-        // We indent each message one space foe each level of the message.
-        for (i = 0; i < level; i++) {
-            putchar(' ');
-        }
-
         // The following functions get the variable list of parameters with
         // which this function was called, and print them to the standard
         // output.
         fmt = va_arg(ap, char *);
-        vprintf(fmt, ap);
+
+        if (traceFP != NULL) {
+            // We indent each message one space for each level of the message.
+            for (i = 0; i < level; i++) {
+                fprintf(traceFP, " ");
+            }
+            vfprintf(traceFP, fmt, ap);
+        } else {
+            // We indent each message one space for each level of the message.
+            for (i = 0; i < level; i++) {
+                putchar(' ');
+            }
+            vprintf(fmt, ap);
+        }
         va_end(ap);
     }
@@ -393 +402 @@
     // NOTE: should we free *fmt as well?  Read the man page.
 }
+
+void psTraceSetDestination(FILE *fp)
+{
+    traceFP = fp;
+}

trunk/psLib/src/sys/psTrace.h

@@ -55 +55 @@
 ;
 
+void psTraceSetDestination(FILE *fp);
+
+
 /* \} */ // End of SystemGroup Functions
 
@@ -67 +70 @@
 
 #endif
+

trunk/psLib/src/sysUtils/psHash.c

@@ -13 +13 @@
 #include "psTrace.h"
 
-void psHashKeyList()
-{
-    printf("This has not been coded.\n");
+psDlist *psHashKeyList(psHash *table)
+{
+    int i = 0;
+    psDlist *myLinkList = NULL;
+
+    if (table == NULL) {
+        return NULL;
+    }
+
+    myLinkList = psDlistAlloc(NULL);
+
+    for (i=0;i<table->nbucket;i++) {
+        if (table->buckets[i] != NULL) {
+            psDlistAdd(myLinkList, (table->buckets[i])->key, PS_DLIST_HEAD);
+        }
+    }
+
+    return(myLinkList);
 }
 

trunk/psLib/src/sysUtils/psHash.h

@@ -6 +6 @@
  *  \ingroup DataGroup
  */
+#include "psDList.h"
+
 
 /** DO WE NEED TO DEFINE HashTable? */
@@ -59 +61 @@
 
 /// List all keys in table.
-void psHashKeyList();
+psDlist *psHashKeyList(psHash *table);
 
 /* \} */ // End of DataGroup Functions

trunk/psLib/src/sysUtils/psTrace.c

@@ -39 +39 @@
 
 static Component *croot = NULL;           // The root of the trace component
+static FILE *traceFP = NULL;
 /*****************************************************************************
     componentAlloc(): allocate memory for a new node, and initialize members.
@@ -378 +379 @@
         va_start(ap, level);
 
-        // We indent each message one space foe each level of the message.
-        for (i = 0; i < level; i++) {
-            putchar(' ');
-        }
-
         // The following functions get the variable list of parameters with
         // which this function was called, and print them to the standard
         // output.
         fmt = va_arg(ap, char *);
-        vprintf(fmt, ap);
+
+        if (traceFP != NULL) {
+            // We indent each message one space for each level of the message.
+            for (i = 0; i < level; i++) {
+                fprintf(traceFP, " ");
+            }
+            vfprintf(traceFP, fmt, ap);
+        } else {
+            // We indent each message one space for each level of the message.
+            for (i = 0; i < level; i++) {
+                putchar(' ');
+            }
+            vprintf(fmt, ap);
+        }
         va_end(ap);
     }
@@ -393 +402 @@
     // NOTE: should we free *fmt as well?  Read the man page.
 }
+
+void psTraceSetDestination(FILE *fp)
+{
+    traceFP = fp;
+}

trunk/psLib/src/sysUtils/psTrace.h

@@ -55 +55 @@
 ;
 
+void psTraceSetDestination(FILE *fp);
+
+
 /* \} */ // End of SystemGroup Functions
 
@@ -67 +70 @@
 
 #endif
+