Changeset 3788 for branches/eam-psphot-branch/psLib/src/sys/psTrace.c

Timestamp:

Apr 28, 2005, 11:17:02 PM (21 years ago)

Author:

magnier

Message:

checking in the versions of the files below, incorporating the changes
I made and have already submitted to bugzilla. these files should be
replaced with the versions contributed on the main trunk by MHPCC.
I will tag this state with eam-psphot-1

src/astronomy/psMetadata.c src/astronomy/psMetadata.h
src/collections/psVector.c src/collections/psVector.h
src/dataManip/psMinimize.c src/dataManip/psMinimize.h
src/image/psImage.c src/image/psImage.h src/sysUtils/psTrace.c
src/sysUtils/psTrace.h

File:

• branches/eam-psphot-branch/psLib/src/sys/psTrace.c (modified) (5 diffs)

branches/eam-psphot-branch/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 21:31:54 $
+ *  @version $Revision: 1.44.4.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-29 09:17:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -252 +252 @@
     if (cRoot == NULL) {
         initTrace();
+    }
+
+    if (traceFP == NULL) {
+        traceFP = stderr;
     }
 
@@ -425 +429 @@
     psS32 i = 0;
 
+    if (traceFP == NULL) {
+        traceFP = stderr;
+    }
+
     if (comp->name[0] == '\0') {
         return;
     } else {
         if (comp->level == PS_DEFAULT_TRACE_LEVEL) {
-            if (traceFP == NULL) {
-                printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                       defLevel);
-            } else {
-                fprintf(traceFP,"%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                        defLevel);
-            }
+            fprintf(traceFP,"%*s%-*s %d\n", depth, "", 20 - depth, comp->name, defLevel);
         } else {
-            if (traceFP == NULL) {
-                printf("%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                       comp->level);
-            } else {
-                fprintf(traceFP, "%*s%-*s %d\n", depth, "", 20 - depth, comp->name,
-                        comp->level);
-            }
+            fprintf(traceFP, "%*s%-*s %d\n", depth, "", 20 - depth, comp->name, comp->level);
         }
     }
@@ -498 +494 @@
     psS32 i = 0;
 
+    if (traceFP == NULL) {
+        traceFP = stderr;
+    }
+
     if (NULL == comp) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
@@ -514 +514 @@
         fmt = va_arg(ap, char *);
 
-        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);
-        }
+        // We indent each message one space for each level of the message.
+        for (i = 0; i < level; i++) {
+            fprintf(traceFP, " ");
+        }
+        vfprintf(traceFP, fmt, ap);
         va_end(ap);
     }
-    // NOTE: should we free *fmt as well? Read the man page.
-}
-
+}
+
+// XXX EAM : I've added code to close the old traceFP (safely)
 void psTraceSetDestination(FILE * fp)
 {
+
+    bool special;
+
+    // XXX EAM perhaps return an error?
+    if (fp == NULL) {
+        return;
+    }
+
+    // cannot close traceFP if one of the special FILE ptrs
+    special  = (traceFP == NULL);
+    special |= (traceFP == stdin);
+    special |= (traceFP == stdout);
+    special |= (traceFP == stderr);
+
+    if (!special) {
+        fclose (traceFP);
+    }
     traceFP = fp;
 }
 
+FILE *psTraceGetDestination()
+{
+    if (traceFP == NULL) {
+        traceFP = stderr;
+    }
+    return traceFP;
+}
+
 #endif