From 486ef585951f37944ade8c44f74274cdc550165d Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 1 Jun 2013 23:04:45 -0700
Subject: [PATCH] Compiler warning cleanup

---
 PDP11/pdp11_dup.c | 8 +++++---
 scp.c             | 3 ++-
 sim_console.c     | 3 ++-
 sim_tmxr.c        | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/PDP11/pdp11_dup.c b/PDP11/pdp11_dup.c
index 9fe3b644..cf961ee6 100644
--- a/PDP11/pdp11_dup.c
+++ b/PDP11/pdp11_dup.c
@@ -728,7 +728,7 @@ sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d)\n", dup);
 if (!(dup_txcsr[dup] & TXCSR_M_TXDONE) && (!dup_xmtpkrdy[dup])) {
     uint8 data = dup_txdbuf[dup] & TXDBUF_M_TXDBUF;
 
-    dup_put_msg_bytes (dup, &data, (dup_txdbuf[dup] & TXDBUF_M_TEOM) ? 0 : 1, dup_txdbuf[dup] & TXDBUF_M_TSOM, (dup_txdbuf[dup] & TXDBUF_M_TEOM));
+    dup_put_msg_bytes (dup, &data, (dup_txdbuf[dup] & TXDBUF_M_TEOM) && (dptr == &dup_dev) ? 0 : 1, dup_txdbuf[dup] & TXDBUF_M_TSOM, (dup_txdbuf[dup] & TXDBUF_M_TEOM));
     if (dup_xmtpkrdy[dup]) { /* Packet ready to send? */
         sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d) - Packet Done %d bytes\n", dup, dup_xmtpkoffset[dup]);
         ddcmp_packet_trace (DBG_PKT, DUPDPTR, ">>> XMT Packet", dup_xmtpacket[dup], dup_xmtpkoffset[dup], TRUE);
@@ -900,10 +900,12 @@ if (sim_deb && dptr && (reason & dptr->dctrl)) {
                         sim_debug (reason, dptr, "(Unknown=0%o)\n", msg[1]);
                         break;
                     }
-                if (len != 8)
+                if (len != 8) {
                     sim_debug (reason, dptr, "Unexpected Control Message Length: %d expected 8\n", len);
-                if (0 != ddcmp_crc16 (0, msg, len))
+                    }
+                if (0 != ddcmp_crc16 (0, msg, len)) {
                     sim_debug (reason, dptr, "Unexpected Message CRC\n");
+                    }
                 break;
             case DDCMP_DLE:   /* Maintenance Message */
                 sim_debug (reason, dptr, "Maintenance Message, Link: %d, Count: %d, HDRCRC: %s, DATACRC: %s\n", msg[2]>>6, ((msg[2] & 0x3F) << 8)| msg[1], 
diff --git a/scp.c b/scp.c
index 8f5a3bf0..57252fbc 100644
--- a/scp.c
+++ b/scp.c
@@ -6431,8 +6431,9 @@ return 0;
 
 double sim_gtime (void)
 {
-if (AIO_MAIN_THREAD)
+if (AIO_MAIN_THREAD) {
     UPDATE_SIM_TIME;
+    }
 return sim_time;
 }
 
diff --git a/sim_console.c b/sim_console.c
index 2fe37942..544e45b8 100644
--- a/sim_console.c
+++ b/sim_console.c
@@ -704,13 +704,14 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
         strcpy (cbuf, sim_rem_buf[i]);
         sim_rem_buf_ptr[i] = 0;
         sim_rem_buf[i][sim_rem_buf_ptr[i]] = '\0';
-        if (cbuf[0] == '\0')
+        if (cbuf[0] == '\0') {
             if (sim_rem_single_mode[i]) {
                 sim_rem_single_mode[i] = FALSE;
                 break;
                 }
             else
                 continue;
+            }
         sim_sub_args (cbuf, sizeof(cbuf), argv);
         cptr = cbuf;
         cptr = get_glyph (cptr, gbuf, 0);                   /* get command glyph */
diff --git a/sim_tmxr.c b/sim_tmxr.c
index c0a06ac7..d9062879 100644
--- a/sim_tmxr.c
+++ b/sim_tmxr.c
@@ -1817,7 +1817,7 @@ while (*tptr) {
         sim_close_sock (sock, 1);
         strcpy(listen, port);
         cptr = get_glyph (cptr, option, ';');
-        if (option[0])
+        if (option[0]) {
             if (0 == MATCH_CMD (option, "NOTELNET"))
                 listennotelnet = TRUE;
             else
@@ -1825,6 +1825,7 @@ while (*tptr) {
                     listennotelnet = FALSE;
                 else
                     return SCPE_ARG;
+            }
         }
     if (line == -1) {
         if (modem_control != mp->modem_control)