From 7775918a1aca56473ab7390c1f2ecc3b49da20b3 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 25 Jun 2019 21:17:39 -0400
Subject: [PATCH] macosx warning suppression part 2

---
 src/sfascii.c   | 44 ++++++++++++++++++++++++++++++++++++++++----
 src/sflendian.c | 26 ++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/sfascii.c b/src/sfascii.c
index 029118b94..cf37b4ffa 100644
--- a/src/sfascii.c
+++ b/src/sfascii.c
@@ -13,7 +13,7 @@ void FDECL(report_problem_ascii, (NHFILE *, const char *, const char *, const ch
 #endif
 
 struct sf_procs ascii_sfo_procs = {
-    "-ascii",
+    ".ascii",
     {
         ascii_sfo_aligntyp,
         ascii_sfo_any,
@@ -40,7 +40,7 @@ struct sf_procs ascii_sfo_procs = {
 
 struct sf_procs ascii_sfi_procs =
 {
-    "-ascii",
+    ".ascii",
     {
         ascii_sfi_aligntyp,
         ascii_sfi_any,
@@ -87,6 +87,7 @@ int cnt;
 {
     const char *parent = "any";
 
+    nhUse(parent);
     Sprintf(outbuf, "%llx", (unsigned long long) d_any->a_void);
     put_savefield(nhfp, outbuf, BUFSZ);
 
@@ -136,6 +137,7 @@ int cnt;
     int itmp;
     const char *parent = "aligntyp";
 
+    nhUse(parent);
     itmp = (int) *d_aligntyp;
     Sprintf(outbuf, "%d", (short) itmp);
     put_savefield(nhfp, outbuf, BUFSZ);
@@ -151,6 +153,7 @@ int cnt;
 {
     const char *parent = "bitfield";
 
+    nhUse(parent);
     /* for bitfields, cnt is the number of bits, not an array */
     Sprintf(outbuf, "%hu", (unsigned short) *d_bitfield);
     put_savefield(nhfp, outbuf, BUFSZ);
@@ -167,6 +170,7 @@ int cnt;
     int i;
     const char *parent = "boolean";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         if (nhfp->fpdebug)
             fprintf(nhfp->fpdebug, "(%s)\n", (*d_boolean) ? "TRUE" : "FALSE");
@@ -187,6 +191,7 @@ int cnt;
     int i = cnt;
     const char *parent = "char";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         if (nhfp->fpdebug)
             fprintf(nhfp->fpdebug, "(%s)\n", d_char ? d_char : "");
@@ -209,6 +214,7 @@ int cnt;
     char *byteptr = (char *) d_genericptr;
     const char *parent = "genericptr";
 
+    nhUse(parent);
     /*
      * sbrooms is an array of pointers to mkroom.
      * That array dimension is MAX_SUBROOMS.
@@ -238,6 +244,7 @@ int cnt;
     int i;
     const char *parent = "int";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         Sprintf(outbuf, "%d", *d_int);
         put_savefield(nhfp, outbuf, BUFSZ);
@@ -256,6 +263,7 @@ int cnt;
     int i;
     const char *parent = "long";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         Sprintf(outbuf, "%ld", *d_long);
         put_savefield(nhfp, outbuf, BUFSZ);
@@ -274,6 +282,7 @@ int cnt;
     int i, itmp;
     const char *parent = "schar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         itmp = (int) *d_schar;
         Sprintf(outbuf, "%d", itmp);
@@ -293,6 +302,7 @@ int cnt;
     int i;
     const char *parent = "short";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         Sprintf(outbuf, "%hd", *d_short);
         put_savefield(nhfp, outbuf, BUFSZ);
@@ -311,6 +321,7 @@ int cnt;
     int i;
     const char *parent = "size_t";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         unsigned long ul = (unsigned long) *d_size_t;
 
@@ -330,6 +341,7 @@ int cnt UNUSED;
 {
     const char *parent = "time_t";
 
+    nhUse(parent);
     Sprintf(outbuf, "%s", yyyymmddhhmmss(*d_time_t));
     put_savefield(nhfp, outbuf, BUFSZ);
 }
@@ -356,6 +368,7 @@ int cnt;
     int i;
     const char *parent = "uchar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         unsigned short us = (unsigned short) *d_uchar;
 
@@ -376,6 +389,7 @@ int cnt;
     int i;
     const char *parent = "uint";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         Sprintf(outbuf, "%u", *d_uint);
         put_savefield(nhfp, outbuf, BUFSZ);
@@ -394,6 +408,7 @@ int cnt;
     int i;
     const char *parent = "ulong";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         Sprintf(outbuf, "%lu", *d_ulong);
         put_savefield(nhfp, outbuf, BUFSZ);
@@ -412,6 +427,7 @@ int cnt;
     int i;
     const char *parent = "ushort";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         Sprintf(outbuf, "%hu", *d_ushort);
         put_savefield(nhfp, outbuf, BUFSZ);
@@ -430,6 +446,7 @@ int cnt;
     int i;
     const char *parent = "xchar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         short tmp;
 
@@ -454,6 +471,7 @@ int cnt;
     const char *parent = "str";
     char sval[QBUFSZ], *src = d_str, *dest = strbuf;
 
+    nhUse(parent);
     /* cnt is the number of characters */
     for (i = 0; i < cnt; ++i) {
         if ((*src < 32) || (*src == '\\') || (*src > 128)) {
@@ -472,7 +490,7 @@ int cnt;
 void
 ascii_sfo_addinfo(nhfp, parent, action, myname, index)
 NHFILE *nhfp;
-const char *parent, *action, *myname;
+const char *parent UNUSED, *action UNUSED, *myname UNUSED;
 int index;
 {
     /* ignored */
@@ -507,6 +525,7 @@ int cnt;
     long long tmp;
     const char *parent = "any";
 
+    nhUse(parent);
     rstr = get_savefield(nhfp, linebuf, BUFSZ);
     tmp = atoll(rstr);
     d_any->a_void = (void *) tmp;
@@ -561,6 +580,7 @@ int cnt;
     long long lltmp;
     const char *parent = "aligntyp";
 
+    nhUse(parent);
     rstr = get_savefield(nhfp, linebuf, BUFSZ);
     lltmp = atoll(rstr);
     tmp = (aligntyp) lltmp;
@@ -584,6 +604,7 @@ int cnt;
     uint8_t tmp;
     const char *parent = "bitfield";
 
+    nhUse(parent);
     /* cnt is the number of bits in the bitfield, not an array dimension */
     rstr = get_savefield(nhfp, linebuf, BUFSZ);
     tmp = (uint8_t) atoi(rstr);
@@ -607,6 +628,7 @@ int cnt;
     int i;
     const char *parent = "boolean";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
 #ifdef SAVEFILE_DEBUGGING
@@ -636,6 +658,7 @@ int cnt;
     char tmp;
     const char *parent = "char";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         tmp = (char) atoi(rstr);
@@ -664,6 +687,7 @@ int cnt;
     static char *glorkum = "glorkum";
     char *byteptr = (char *) d_genericptr;
 
+    nhUse(parent);
     /*
      * sbrooms is an array of pointers to mkroom.
      * That array dimension is MAX_SUBROOMS.
@@ -697,6 +721,7 @@ int cnt;
     long long lltmp;
     const char *parent = "int";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         lltmp = atoll(rstr);
@@ -725,6 +750,7 @@ int cnt;
     char *rstr;
     const char *parent = "long";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         lltmp = atoll(rstr);
@@ -752,6 +778,7 @@ int cnt;
     char *rstr;
     const char *parent = "schar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         tmp = (schar) atoi(rstr);
@@ -778,6 +805,7 @@ int cnt;
     char *rstr;
     const char *parent = "short";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         tmp = (short) atoi(rstr);
@@ -804,6 +832,7 @@ int cnt;
     char *rstr;
     const char *parent = "size_t";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         tmp = (size_t) atol(rstr);
@@ -830,6 +859,7 @@ int cnt UNUSED;
     char *rstr;
     const char *parent = "time_t";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         tmp = time_from_yyyymmddhhmmss(rstr);
@@ -868,6 +898,7 @@ int cnt;
     char *rstr;
     const char *parent = "uchar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         itmp = atoi(rstr);
@@ -896,6 +927,7 @@ int cnt;
     long long lltmp;
     const char *parent = "uint";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         lltmp = atoll(rstr);
@@ -924,6 +956,7 @@ int cnt;
     char *rstr;
     const char *parent = "ulong";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         lltmp = atoll(rstr);
@@ -952,6 +985,7 @@ int cnt;
     char *rstr;
     const char *parent = "ushort";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         lltmp = atoll(rstr);
@@ -979,6 +1013,7 @@ int cnt;
     char *rstr;
     const char *parent = "xchar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         rstr = get_savefield(nhfp, linebuf, BUFSZ);
         itmp = atoi(rstr);
@@ -1012,6 +1047,7 @@ int cnt;
     char testbuf[BUFSZ];
 #endif
 
+    nhUse(parent);
     /* cnt is the length of the string */
     rstr = get_savefield(nhfp, strbuf, BUFSZ * 4);
     src = rstr;
@@ -1060,7 +1096,7 @@ int cnt;
 void
 ascii_sfi_addinfo(nhfp, myparent, action, myname, index)
 NHFILE *nhfp;
-const char *myparent, *action, *myname;
+const char *myparent UNUSED, *action UNUSED, *myname UNUSED;
 int index;
 {
     /* not doing anything here */
diff --git a/src/sflendian.c b/src/sflendian.c
index 6f4fc9c8c..413a4b382 100644
--- a/src/sflendian.c
+++ b/src/sflendian.c
@@ -195,6 +195,7 @@ int cnt;
     int i;
     int16_t val;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         val = nhfp->bendian ? bswap16(*d_aligntyp) : *d_aligntyp;
 #ifdef SAVEFILE_DEBUGGING
@@ -217,6 +218,7 @@ int cnt;
 {
     const char *parent = "bitfield";
 
+    nhUse(parent);
     /* for bitfields, cnt is the number of bits, not an array */
 #ifdef SAVEFILE_DEBUGGING
     fprintf(nhfp->fpdebug,"%s %s %d %ld %d\n", myname,
@@ -238,6 +240,7 @@ int cnt;
     int i;
     int8_t val;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         val = *d_boolean;
 #ifdef SAVEFILE_DEBUGGING
@@ -262,6 +265,7 @@ int cnt;
     const char *parent = "char";
     int8_t val;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         val = *d_char;
 #ifdef SAVEFILE_DEBUGGING
@@ -285,6 +289,7 @@ int cnt;
     int i;
     int8_t p;
 
+    nhUse(parent);
     /*
      * sbrooms is an array of pointers to mkroom.
      * That array dimension is MAX_SUBROOMS.
@@ -322,6 +327,7 @@ int cnt;
     const char *parent = "int";
     int32_t i32, val;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         i32 = (int32_t) *d_int;
         val = nhfp->bendian ? bswap32(i32) : i32;
@@ -347,6 +353,7 @@ int cnt;
     const char *parent = "long";
     int64_t i64, val64;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         i64 = (int64_t) *d_long;
         val64 = nhfp->bendian ? bswap64(i64) : i64;
@@ -372,6 +379,7 @@ int cnt;
     int8_t itmp;
     const char *parent = "schar";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         itmp = (int8_t) *d_schar;
 #ifdef SAVEFILE_DEBUGGING
@@ -396,6 +404,7 @@ int cnt;
     int16_t itmp;
     const char *parent = "short";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         itmp = (int16_t) *d_short;
 #ifdef SAVEFILE_DEBUGGING
@@ -420,6 +429,7 @@ int cnt;
     uint64_t ui64, val;
     const char *parent = "size_t";
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         ui64 = (uint64_t) *d_size_t;
         val = nhfp->bendian ? bswap64(ui64) : ui64;
@@ -444,6 +454,7 @@ int cnt UNUSED;
     char buf[BUFSZ];
     const char *parent = "time_t";
 
+    nhUse(parent);
     Sprintf(buf, "%s", yyyymmddhhmmss(*d_time_t));
 #ifdef SAVEFILE_DEBUGGING
         fprintf(nhfp->fpdebug,"%s %s %s %ld %d\n", myname,
@@ -475,6 +486,8 @@ int cnt;
     int i;
     const char *parent = "uchar";
     uint8_t ui8;
+
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         ui8 = (uint8_t) *d_uchar;
 #ifdef SAVEFILE_DEBUGGING
@@ -499,6 +512,7 @@ int cnt;
     const char *parent = "uint";
     uint32_t ui32, val;
     
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         ui32 = (uint32_t) *d_uint;
         val = nhfp->bendian ? bswap32(ui32) : ui32;
@@ -524,6 +538,7 @@ int cnt;
     const char *parent = "ulong";
     uint64_t ul64, val64;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         ul64 = (uint64_t) *d_ulong;
         val64 = nhfp->bendian ? bswap64(ul64) : ul64;
@@ -549,6 +564,7 @@ int cnt;
     const char *parent = "ushort";
     uint16_t ui16, val16;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         ui16 = (uint16_t) *d_ushort;
         val16 = nhfp->bendian ? bswap16(ui16) : ui16;
@@ -574,6 +590,7 @@ int cnt;
     const char *parent = "xchar";
     int16_t i16, val16;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         i16 = (int16_t) *d_xchar;
         val16 = nhfp->bendian ? bswap16(i16) : i16;
@@ -602,6 +619,7 @@ int cnt;
     const char *parent = "str";
     char sval[QBUFSZ], *src = d_str, *dest = strbuf;
 
+    nhUse(parent);
     /* cnt is the number of characters */
     for (i = 0; i < cnt; ++i) {
         if ((*src < 32) || (*src == '\\') || (*src > 128)) {
@@ -637,7 +655,7 @@ int cnt;
 void
 lendian_sfo_addinfo(nhfp, parent, action, myname, index)
 NHFILE *nhfp;
-const char *parent, *action, *myname;
+const char *parent UNUSED, *action UNUSED, *myname UNUSED;
 int index;
 {
     /* ignored */
@@ -665,6 +683,8 @@ int cnt;
     uint32_t ui32;
     int32_t i32;
     int8_t i8;
+
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
         fread(&ui64, sizeof ui64, 1, nhfp->fpdef);
         if (feof(nhfp->fpdef)) {
@@ -738,6 +758,7 @@ int cnt;
     int i;
     int16_t val, i16;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
 #ifdef SAVEFILE_DEBUGGING
         floc = ftell(nhfp->fpdef);
@@ -768,6 +789,7 @@ int cnt;
 {
     const char *parent = "bitfield";
 
+    nhUse(parent);
 #ifdef SAVEFILE_DEBUGGING
     floc = ftell(nhfp->fpdef);
 #endif
@@ -795,6 +817,7 @@ int cnt;
     const char *parent = "boolean";
     int8_t i8;
 
+    nhUse(parent);
     for (i = 0; i < cnt; ++i) {
 #ifdef SAVEFILE_DEBUGGING
         floc = ftell(nhfp->fpdef);
@@ -824,7 +847,6 @@ int cnt;
 {
     int i;
     int8_t i8;
-    const char *parent = "char";
 
     for (i = 0; i < cnt; ++i) {
 #ifdef SAVEFILE_DEBUGGING