Changeset 560 for trunk/psLib/src/sys/psLogMsg.c

Timestamp:

May 1, 2004, 1:04:35 PM (22 years ago)

Author:

gusciora

Message:

This is a fairly large checkin. I had been sitting on a lot of test code
that was not quite in sync with the current test harness. I modified it
somewhat so it mostly works with the test harness, though there are still
problems with the printFooter() function not having a status for "status
unknown". Also, the runTest is not correctly parsing my date strings in
psLogMsg calls. Also, I added an individual entry for each test in the
Makefile in the test directory. I did this because the generic rules were
failing, and I did not want to break the tests for those people who were
successfully using the generic rules.

File:

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

trunk/psLib/src/sys/psLogMsg.c

@@ -261 +261 @@
         head_ptr += strlen(head_ptr);
     }
+
     if (head_ptr > head) {
         *head_ptr++ = '|';
@@ -269 +270 @@
     case PS_LOG_TO_STDOUT:
         puts(head);
-        vprintf(fmt, ap);
-        if (fmt[strlen(fmt) - 1] != '\n') {
+        if (log_msg) {
+            vprintf(fmt, ap);
+            if (fmt[strlen(fmt) - 1] != '\n') {
+                putc('\n', stdout);
+            }
+        } else {
             putc('\n', stdout);
         }
@@ -277 +282 @@
     case PS_LOG_TO_STDERR:
         fputs(head, stderr);
-        vfprintf(stderr, fmt, ap);
-        if (fmt[strlen(fmt) - 1] != '\n') {
+        if (log_msg) {
+            vfprintf(stderr, fmt, ap);
+            if (fmt[strlen(fmt) - 1] != '\n') {
+                putc('\n', stderr);
+            }
+        } else {
             putc('\n', stderr);
         }