Changeset 7569

Timestamp:

Jun 14, 2006, 2:17:32 PM (20 years ago)

Author:

Paul Price

Message:

Abstracting stdout, stderr file descriptors, just in case.

File:

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

trunk/psLib/src/sys/psLogMsg.c

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-15 00:14:49 $
+ *  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-15 00:17:32 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 #define MAX_LOG_LINE_LENGTH 256
 
-static int logFD = 2;                   // Log file descriptor
+static int logFD = STDERR_FILENO;       // Log file descriptor
 static psS32 globalLogLevel = PS_LOG_INFO; // log all messages at this or above
 static psBool logTime = true;     // Flag to include time info
@@ -87 +87 @@
 bool psLogSetDestination(int fd)
 {
-    if (fd <= -1) {
+    if (fd < 0) {
         return false;
     }
 
     // Close the current FD if it's not stdout, stderr.
-    if (logFD > 2) {
+    if (logFD > STDERR_FILENO) {
         close(logFD);
     }
@@ -186 +186 @@
     // Special destinations: stdout, stderr
     if (strcmp(dest, "stdout") == 0) {
-        return 1;
+        return STDOUT_FILENO;
     }
     if (strcmp(dest, "stderr") == 0) {
-        return 2;
+        return STDERR_FILENO;
     }
 
@@ -250 +250 @@
     // If it's an abort, we always want to see the message
     if (logFD == 0 && level == PS_LOG_ABORT) {
-        logFD = 2;
+        logFD = STDERR_FILENO;
     }
     // If logging is off, or if the level is too high, return immediately.
@@ -352 +352 @@
     if (level == PS_LOG_ABORT) {
         switch (logFD) {
-        case 1:
+        case STDOUT_FILENO:
             fflush(stdout);
             break;
-        case 2:
+        case STDERR_FILENO:
             fflush(stderr);
             break;