From fdc5054deaeda55e6190219f656c9dd5c9b4b7f6 Mon Sep 17 00:00:00 2001 From: Mazet Laurent Date: Fri, 28 Mar 2025 00:24:15 +0100 Subject: [PATCH] correct log stream --- morep_valid.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/morep_valid.c b/morep_valid.c index 00b5e0b..0c0525b 100644 --- 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); } -- 2.30.2