From 06c4b6cd7e3f75701989891cb648f22cf38b0858 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 25 Jun 2019 21:44:38 -0400
Subject: [PATCH] macosx warning suppression part 3

---
 src/sfascii.c   | 21 ++++++++++-----------
 src/sflendian.c | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/sfascii.c b/src/sfascii.c
index cf37b4ffa..0f310bf84 100644
--- a/src/sfascii.c
+++ b/src/sfascii.c
@@ -83,7 +83,7 @@ NHFILE *nhfp;
 union any *d_any;
 const char *myparent UNUSED;
 const char *myname UNUSED;
-int cnt;
+int cnt UNUSED;
 {
     const char *parent = "any";
 
@@ -132,7 +132,7 @@ NHFILE *nhfp;
 aligntyp *d_aligntyp;
 const char *myparent UNUSED;
 const char *myname UNUSED;
-int cnt;
+int cnt UNUSED;
 {
     int itmp;
     const char *parent = "aligntyp";
@@ -149,7 +149,7 @@ NHFILE *nhfp;
 uint8_t *d_bitfield;
 const char *myparent UNUSED;
 const char *myname UNUSED;
-int cnt;
+int cnt UNUSED;
 {
     const char *parent = "bitfield";
 
@@ -474,7 +474,7 @@ int cnt;
     nhUse(parent);
     /* cnt is the number of characters */
     for (i = 0; i < cnt; ++i) {
-        if ((*src < 32) || (*src == '\\') || (*src > 128)) {
+        if ((*src < 32) || (*src == '\\') || (*src > 127)) {
             *dest++ = '\\';
             intval = (int) *src++;
             Sprintf(sval, "%03d", intval);
@@ -488,10 +488,10 @@ int cnt;
 }
 
 void
-ascii_sfo_addinfo(nhfp, parent, action, myname, index)
-NHFILE *nhfp;
+ascii_sfo_addinfo(nhfp, parent, action, myname, indx)
+NHFILE *nhfp UNUSED;
 const char *parent UNUSED, *action UNUSED, *myname UNUSED;
-int index;
+int indx UNUSED;
 {
     /* ignored */
 }
@@ -1094,10 +1094,10 @@ int cnt;
 }
  
 void
-ascii_sfi_addinfo(nhfp, myparent, action, myname, index)
-NHFILE *nhfp;
+ascii_sfi_addinfo(nhfp, myparent, action, myname, indx)
+NHFILE *nhfp UNUSED;
 const char *myparent UNUSED, *action UNUSED, *myname UNUSED;
-int index;
+int indx UNUSED;
 {
     /* not doing anything here */
 }
@@ -1108,7 +1108,6 @@ NHFILE *nhfp;
 char *inbuf;
 size_t inbufsz;
 {
-    boolean rv = TRUE; /* assume successful parse */
     char *ep, *sep;
 
     if (fgets(inbuf, (int) inbufsz, nhfp->fpdef)) {
diff --git a/src/sflendian.c b/src/sflendian.c
index 413a4b382..81f549e29 100644
--- a/src/sflendian.c
+++ b/src/sflendian.c
@@ -145,6 +145,8 @@ int cnt;
     uint32_t ui32;
     int32_t i32;
     int8_t i8;
+
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         ui64 = (uint64_t) d_any->a_void;
         fwrite(&ui64, sizeof ui64, 1, nhfp->fpdef);
@@ -214,7 +216,7 @@ NHFILE *nhfp;
 uint8_t *d_bitfield;
 const char *myparent UNUSED;
 const char *myname UNUSED;
-int cnt;
+int cnt UNUSED;
 {
     const char *parent = "bitfield";
 
@@ -289,7 +291,6 @@ int cnt;
     int i;
     int8_t p;
 
-    nhUse(parent);
     /*
      * sbrooms is an array of pointers to mkroom.
      * That array dimension is MAX_SUBROOMS.
@@ -622,7 +623,7 @@ int cnt;
     nhUse(parent);
     /* cnt is the number of characters */
     for (i = 0; i < cnt; ++i) {
-        if ((*src < 32) || (*src == '\\') || (*src > 128)) {
+        if ((*src < 32) || (*src == '\\') || (*src > 127)) {
             *dest++ = '\\';
             outcount++;
             intval = (int) *src++;
@@ -653,10 +654,10 @@ int cnt;
 }
 
 void
-lendian_sfo_addinfo(nhfp, parent, action, myname, index)
-NHFILE *nhfp;
+lendian_sfo_addinfo(nhfp, parent, action, myname, indx)
+NHFILE *nhfp UNUSED;
 const char *parent UNUSED, *action UNUSED, *myname UNUSED;
-int index;
+int indx UNUSED;
 {
     /* ignored */
 }
@@ -1323,10 +1324,10 @@ int cnt;
 }
  
 void
-lendian_sfi_addinfo(nhfp, myparent, action, myname, index)
-NHFILE *nhfp;
-const char *myparent, *action, *myname;
-int index;
+lendian_sfi_addinfo(nhfp, myparent, action, myname, indx)
+NHFILE *nhfp UNUSED;
+const char *myparent UNUSED, *action UNUSED, *myname UNUSED;
+int indx UNUSED;
 {
     /* not doing anything here */
 }