From 55d1d547a679d18d19f09edd86f9b331d2aab769 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 10 Oct 2020 08:55:43 -0400
Subject: [PATCH] silence some util/makdefs.c src/mdlib warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In file included from makedefs.c:213:0:
../src/mdlib.c: In function ‘runtime_info_init’:
../src/mdlib.c:808:12: warning: variable ‘timeresult’ set but not used [-Wunused-but-set-variable]
     time_t timeresult;
            ^~~~~~~~~~
makedefs.c: In function ‘do_date’:
makedefs.c:1140:16: warning: unused variable ‘ind’ [-Wunused-variable]
     const char ind[] = "    ";
                ^~~
makedefs.c:1139:9: warning: unused variable ‘steps’ [-Wunused-variable]
     int steps = 0;
         ^~~~~
makedefs.c: In function ‘do_monstr’:
makedefs.c:1934:12: warning: variable ‘j’ set but not used [-Wunused-but-set-variable]
     int i, j;
            ^
---
 src/mdlib.c     | 40 ++++++++++++++++++----------------------
 util/makedefs.c |  6 ++----
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/mdlib.c b/src/mdlib.c
index e0fef5a64..623333df8 100644
--- a/src/mdlib.c
+++ b/src/mdlib.c
@@ -799,6 +799,8 @@ build_options()
 void
 runtime_info_init()
 {
+#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET) \
+    && defined(__DATE__) && defined(__TIME__)
     int i;
     char tmpbuf[BUFSZ], *strp;
     const char *mth[] = {
@@ -806,12 +808,15 @@ runtime_info_init()
         "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
     struct tm t = {0};
     time_t timeresult;
+#endif
 
     if (!done_runtime_opt_init_once) {
         done_runtime_opt_init_once = 1;
         build_savebones_compat_string();
         /* construct the current version number */
         make_version();
+#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET)
+#if defined(__DATE__) && defined(__TIME__)
         /*
          * In a cross-compiled environment, you can't execute
          * the target binaries during the build, so we can't
@@ -831,8 +836,6 @@ runtime_info_init()
          *    gcc, msvc, clang   __TIME__  "23:59:01"
          *
          */
-
-#if defined(__DATE__) && defined(__TIME__)
         if (sizeof __DATE__ + sizeof __TIME__  + sizeof "123" <
             sizeof rttimebuf)
             Sprintf(rttimebuf, "%s %s", __DATE__, __TIME__);
@@ -859,35 +862,28 @@ runtime_info_init()
             extract_field(tmpbuf, rttimebuf, 2, 18);  /* sec  */
             t.tm_sec = atoi(tmpbuf);
             timeresult = mktime(&t);
-#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET)
             BUILD_TIME = (unsigned long) timeresult;
             BUILD_DATE = rttimebuf;
-#endif
-#else  /* __DATE__ && __TIME__ */
-            nhUse(strp);
+	}
 #endif /* __DATE__ && __TIME__ */
-
-#if !defined(MAKEDEFS_C) && defined(CROSSCOMPILE_TARGET)
-            VERSION_NUMBER = version.incarnation;
-            VERSION_FEATURES = version.feature_set;
+        VERSION_NUMBER = version.incarnation;
+        VERSION_FEATURES = version.feature_set;
 #ifdef MD_IGNORED_FEATURES
-            IGNORED_FEATURES = MD_IGNORED_FEATURES;
-#endif
-            VERSION_SANITY1 = version.entity_count;
-            VERSION_SANITY2 = version.struct_sizes1;
-            VERSION_SANITY3 = version.struct_sizes2;
-
-            VERSION_STRING = strdup(version_string(tmpbuf, "."));
-            VERSION_ID = strdup(version_id_string(tmpbuf, BUILD_DATE));
-            COPYRIGHT_BANNER_C = strdup(bannerc_string(tmpbuf, BUILD_DATE));
+        IGNORED_FEATURES = MD_IGNORED_FEATURES;
+#endif
+        VERSION_SANITY1 = version.entity_count;
+        VERSION_SANITY2 = version.struct_sizes1;
+        VERSION_SANITY3 = version.struct_sizes2;
+        VERSION_STRING = strdup(version_string(tmpbuf, "."));
+        VERSION_ID = strdup(version_id_string(tmpbuf, BUILD_DATE));
+        COPYRIGHT_BANNER_C = strdup(bannerc_string(tmpbuf, BUILD_DATE));
 #ifdef NETHACK_HOST_GIT_SHA
-            NETHACK_GIT_SHA = strdup(NETHACK_HOST_GIT_SHA);
+        NETHACK_GIT_SHA = strdup(NETHACK_HOST_GIT_SHA);
 #endif
 #ifdef NETHACK_HOST_GIT_BRANCH
-            NETHACK_GIT_BRANCH = strdup(NETHACK_HOST_GIT_BRANCH);
+        NETHACK_GIT_BRANCH = strdup(NETHACK_HOST_GIT_BRANCH);
 #endif
 #endif /* !MAKEDEFS_C  && CROSSCOMPILE_TARGET */
-	}
         idxopttext = 0;
         build_options();
     }
diff --git a/util/makedefs.c b/util/makedefs.c
index f8636c893..3d81f4ab8 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -1136,8 +1136,6 @@ do_date()
     char *c, cbuf[60], buf[BUFSZ];
     const char *ul_sfx;
 #if defined(CROSSCOMPILE) && !defined(CROSSCOMPILE_TARGET)
-    int steps = 0;
-    const char ind[] = "    ";
     const char *xpref = "HOST_";
 #else
     const char *xpref = (const char *) 0;
@@ -1931,7 +1929,7 @@ void
 do_monstr()
 {
     struct permonst *ptr;
-    int i, j;
+    int i;
 
     /* Don't break anything for ports that haven't been updated. */
     printf("DEPRECATION WARNINGS:\n");
@@ -1973,7 +1971,7 @@ do_monstr()
 
     /* output derived monstr values as a comment */
     Fprintf(ofp, "\n\n/*\n * default mons[].difficulty values\n *\n");
-    for (ptr = &mons[0], j = 0; ptr->mlet; ptr++) {
+    for (ptr = &mons[0]; ptr->mlet; ptr++) {
         i = mstrength(ptr);
         Fprintf(ofp, "%-24s %2u\n", ptr->mname, (unsigned int) (uchar) i);
     }
-- 
2.50.1