From 91662194760f26f2b5a16b98ae7b837c150bdebd Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Fri, 13 Aug 2021 09:11:42 -0700
Subject: [PATCH] PDP11: Cleanup potential compiler warnings

---
 PDP11/pdp11_cis.c | 2 +-
 PDP11/pdp11_dz.c  | 2 +-
 PDP11/pdp11_hk.c  | 4 ++--
 display/display.c | 4 ++--
 display/vt11.c    | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/PDP11/pdp11_cis.c b/PDP11/pdp11_cis.c
index 4ec7fb09..a61db0e2 100644
--- a/PDP11/pdp11_cis.c
+++ b/PDP11/pdp11_cis.c
@@ -1453,7 +1453,7 @@ return ((nz - 1) * 8) + i;
 
 void CreateTable (DSTR *dsrc, DSTR mtable[10])
 {
-int32 (i);
+int32 i;
 
 mtable[1] = *dsrc;
 for (i = 2; i < 10; i++)
diff --git a/PDP11/pdp11_dz.c b/PDP11/pdp11_dz.c
index 6e09c682..962dd909 100644
--- a/PDP11/pdp11_dz.c
+++ b/PDP11/pdp11_dz.c
@@ -226,7 +226,7 @@ uint16 dz_lpr[MAX_DZ_MUXES] = { 0 };                    /* line param */
 uint16 dz_tcr[MAX_DZ_MUXES] = { 0 };                    /* xmit control */
 uint16 dz_msr[MAX_DZ_MUXES] = { 0 };                    /* modem status */
 uint16 dz_tdr[MAX_DZ_MUXES] = { 0 };                    /* xmit data */
-uint16 dz_silo[MAX_DZ_MUXES][DZ_SILO_ALM] = { 0 };      /* silo */
+uint16 dz_silo[MAX_DZ_MUXES][DZ_SILO_ALM] = { {0} };    /* silo */
 uint16 dz_scnt[MAX_DZ_MUXES] = { 0 };                   /* silo used */
 uint8 dz_sae[MAX_DZ_MUXES] = { 0 };                     /* silo alarm enabled */
 uint32 dz_rxi = 0;                                      /* rcv interrupts */
diff --git a/PDP11/pdp11_hk.c b/PDP11/pdp11_hk.c
index 4f902572..bd60eded 100644
--- a/PDP11/pdp11_hk.c
+++ b/PDP11/pdp11_hk.c
@@ -1186,7 +1186,7 @@ switch (fnc) {                                          /* case on function */
         else if (uptr->FNC == FNC_READ) {               /* read? */
             err = sim_disk_rdsect (uptr, da/HK_NUMWD, (uint8 *)hkxb, &sectsread, ((wc + (HK_NUMWD - 1)) & ~(HK_NUMWD - 1))/HK_NUMWD);
             if ((err == SCPE_OK) &&
-                (sectsread != (((wc + (HK_NUMWD - 1)) & ~(HK_NUMWD - 1))/HK_NUMWD)))
+                (sectsread != (t_seccnt)((((wc + (HK_NUMWD - 1)) & ~(HK_NUMWD - 1))/HK_NUMWD))))
                 err = -1;
             sim_disk_data_trace (uptr, (uint8 *)hkxb, da/HK_NUMWD, sectsread*HK_NUMWD*sizeof(*hkxb), "sim_disk_rdsect", HKDEB_DAT & dptr->dctrl, HKDEB_OPS);
             if (hkcs2 & CS2_UAI) {                      /* no addr inc? */
@@ -1206,7 +1206,7 @@ switch (fnc) {                                          /* case on function */
         else {                                          /* wchk */                  
             err = sim_disk_rdsect (uptr, da/HK_NUMWD, (uint8 *)hkxb, &sectsread, ((wc + (HK_NUMWD - 1)) & ~(HK_NUMWD - 1))/HK_NUMWD);
             if ((err == SCPE_OK) &&
-                (sectsread != (((wc + (HK_NUMWD - 1)) & ~(HK_NUMWD - 1))/HK_NUMWD)))
+                (sectsread != (t_seccnt)((((wc + (HK_NUMWD - 1)) & ~(HK_NUMWD - 1))/HK_NUMWD))))
                 err = -1;
             sim_disk_data_trace (uptr, (uint8 *)hkxb, da/HK_NUMWD, sectsread*HK_NUMWD*sizeof(*hkxb), "sim_disk_rdsect", HKDEB_DAT & dptr->dctrl, HKDEB_OPS);
             awc = wc;
diff --git a/display/display.c b/display/display.c
index b31ee5bf..020ea62d 100644
--- a/display/display.c
+++ b/display/display.c
@@ -556,7 +556,7 @@ display_delay(int t, int slowdown)
         return;
 
     elapsed = os_elapsed();     /* read and reset elapsed timer */
-    if (elapsed == ~0L) {       /* first time thru? */
+    if (elapsed == (unsigned long)(~0L)) {/* first time thru? */
         slowdown = 0;           /* no adjustments */
         elapsed = sim_time;
         }
@@ -946,7 +946,7 @@ phosphor_init(struct phosphor *phosphors, int nphosphors, int color)
 static struct display *
 find_type(enum display_type type)
 {
-    int i;
+    size_t i;
     struct display *dp;
 
     for (i = 0, dp = displays; i < ELEMENTS(displays); i++, dp++)
diff --git a/display/vt11.c b/display/vt11.c
index b6f6f555..cfc24444 100644
--- a/display/vt11.c
+++ b/display/vt11.c
@@ -2923,9 +2923,9 @@ character(int c)
             lp_suppress = x == 0 || x == 5;
 
             for (y = 0; y < 8; ++y) {
-                int delay_skew;
+                int delay_skew = 0;
                 int compress = vt11_csp_w <= 12 && x == 2;
-                int dot = col & (1<<y), nxtdot;
+                int dot = col & (1<<y), nxtdot = 0;
 
                 if (dot) {
                     illum2(xbase + xllc, ybase + yllc);
@@ -2941,7 +2941,7 @@ character(int c)
                 ++yllc;
                 if (dot) {
                     illum2(xbase + xllc, ybase + yllc);
-                    if (!compress || nxtdot == 0)
+                    if (!compress || (nxtdot == 0))
                         illum2(xbase + xllc + 1, ybase + yllc);
                 }
                 if (italics && delay_skew)