correct log stream

diff --git a/morep_valid.c b/morep_valid.c
index 00b5e0b9a3557035bf56e900b69c4e1b82759c32..0c0525b7b8506dfe8f4b56cb8a85fa7fde916e60 100644 (file)
--- a/morep_valid.c
+++ b/morep_valid.c
@@ -208,7 +208,7 @@ void print_message (FILE *fd, char *etype, int mode, uint8_t msg, int seqnum, ui
         int i;
         fprintf (fd ? fd : stdout, " PAYLOAD=");
         for (i = 0; i < len; i++) {
-            fprintf (fd ? fd : stdout, "%02x", payload[i]);
+            fprintf (fd, "%02x", payload[i]);
         }
     }
     fprintf (fd ? fd : stdout, "\n");
@@ -424,7 +424,9 @@ int main (int argc, char **argv)
         /* transmit */
         if (mode == 1) {
             int seqnum = MOREP_Send (comm->morep, msgtype, payload, len);
-            print_message (log, comm->etype, 1, msgtype, seqnum, payload, len);
+            if (log) {
+                print_message (log, comm->etype, 1, msgtype, seqnum, payload, len);
+            }
         } else { /* receive */
             uint8_t rxmsgtype = 0;
             uint8_t rxpayload[1496 * 16 - 1] = {0};
@@ -446,7 +448,9 @@ int main (int argc, char **argv)
                     VERBOSE (morep, WARNING, PRINTF ("R%04x SEQ=%d MSG=%d: payloads differed at %d/%d\n", rxmsgtype, seqnum, rxmsgtype, i, rxlen));
                 }
             }
-            print_message (log, comm->etype, 0, rxmsgtype, seqnum, rxpayload, rxlen);
+            if (log) {
+                print_message (log, comm->etype, 0, rxmsgtype, seqnum, rxpayload, rxlen);
+           }
         }
         free (payload);
     }
@@ -456,7 +460,7 @@ int main (int argc, char **argv)
     while (nbcomms) {
         MOREP_Close (--nbcomms);
     }
-    if ((log != NULL) && (log != stdout)) {
+    if ((log) && (log != stdout)) {
         fclose (log);
     }