!STATUS_HILITE warning fixes

Mostly declarations of static functions which don't exist (due to being
conditionally excluded).  One unused local variable.

diff --git a/src/botl.c b/src/botl.c
index 03f2aea119492f123f508820c78150b6b97f15b2..19ed8c9733c36c691a23fd5bbce03e9884e1da05 100644 (file)
--- a/src/botl.c
+++ b/src/botl.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 botl.c  $NHDT-Date: 1469930895 2016/07/31 02:08:15 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.75 $ */
+/* NetHack 3.6 botl.c  $NHDT-Date: 1506903619 2017/10/02 00:20:19 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.81 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -12,7 +12,9 @@ const char *const enc_stat[] = { "",         "Burdened",  "Stressed",
 
 STATIC_OVL NEARDATA int mrank_sz = 0; /* loaded by max_rank_sz (from u_init) */
 STATIC_DCL const char *NDECL(rank);
+#ifdef STATUS_HILITES
 STATIC_DCL void NDECL(bot_via_windowport);
+#endif
 
 static char *
 get_strength_str()
@@ -1060,6 +1062,7 @@ int anytype;
     return buf;
 }
 
+#ifdef STATUS_HILITES
 STATIC_OVL void
 s_to_anything(a, buf, anytype)
 anything *a;
@@ -1107,6 +1110,7 @@ int anytype;
     }
     return;
 }
+#endif /* STATUS_HILITES */
 
 STATIC_OVL int
 percentage(bl, maxbl)

diff --git a/win/tty/wintty.c b/win/tty/wintty.c
index 2eb84b0cc54181dd26b7b2fd9e6fa08eda54c198..aa9ecfa5e17ac1a7e40cd4a94a28a9d44bd96e0d 100644 (file)
--- a/win/tty/wintty.c
+++ b/win/tty/wintty.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6 wintty.c        $NHDT-Date: 1463614572 2016/05/18 23:36:12 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.131 $ */
+/* NetHack 3.6 wintty.c        $NHDT-Date: 1506903624 2017/10/02 00:20:24 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.139 $ */
 /* Copyright (c) David Cohrs, 1991                                */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -3431,25 +3431,25 @@ extern winid WIN_STATUS;
 static long tty_condition_bits;
 static int tty_status_colors[MAXBLSTATS];
 int hpbar_percent, hpbar_color;
-#endif /* STATUS_HILITES */
 
 static int FDECL(condcolor, (long, unsigned long *));
 static int FDECL(condattr, (long, unsigned long *));
-
+#endif /* STATUS_HILITES */
 
 void
 tty_status_init()
 {
+#ifdef STATUS_HILITES
     int i;
 
-    /* let genl_status_init do most of the initialization */
-    genl_status_init();
-
-#ifdef STATUS_HILITES
-    for (i = 0; i < MAXBLSTATS; ++i) {
+    for (i = 0; i < MAXBLSTATS; ++i)
         tty_status_colors[i] = NO_COLOR; /* no color */
-    }
+    tty_condition_bits = 0L;
+    hpbar_percent = 0, hpbar_color = NO_COLOR;
 #endif /* STATUS_HILITES */
+
+    /* let genl_status_init do most of the initialization */
+    genl_status_init();
 }
 
 /*
@@ -3581,7 +3581,7 @@ unsigned long *colormasks;
     int coloridx = NO_COLOR;
 #endif
     char *text = (char *) ptr;
-    static boolean oncearound = FALSE; /* prevent premature partial status display */
+    static boolean oncearound = FALSE; /* prevent premature partial display */
     enum statusfields fieldorder[2][15] = {
         { BL_TITLE, BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, BL_ALIGN,
           BL_SCORE, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH,
@@ -3773,7 +3773,6 @@ int condcolor(bm, bmarray)
 long bm;
 unsigned long *bmarray;
 {
-#ifdef STATUS_HILITES
     int i;
 
     if (bm && bmarray)
@@ -3781,7 +3780,6 @@ unsigned long *bmarray;
             if (bmarray[i] && (bm & bmarray[i]))
                 return i;
         }
-#endif
     return NO_COLOR;
 }
 #endif /* TEXTCOLOR */
@@ -3820,7 +3818,6 @@ unsigned long *bmarray;
 }
 #endif /* STATUS_HILITES */
 
-
 #endif /* TTY_GRAPHICS */
 
 /*wintty.c*/