From 99519c4e5b106252ff134f47f9734bb7e70c6508 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 6 Apr 2020 10:25:17 +0300
Subject: [PATCH] Fix more warnings

---
 include/extern.h |  4 ++++
 src/cmd.c        |  4 ----
 src/do_name.c    | 17 +++++++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/include/extern.h b/include/extern.h
index 4d02b680f..fc93068b9 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -347,6 +347,10 @@ E void NDECL(unearth_you);
 E void NDECL(escape_tomb);
 E void FDECL(bury_obj, (struct obj *));
 #endif
+#ifdef DEBUG
+extern int NDECL(wiz_debug_cmd_bury);
+#endif
+
 
 /* ### display.c ### */
 
diff --git a/src/cmd.c b/src/cmd.c
index c0d3946ff..9883f4d74 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -42,10 +42,6 @@ static boolean alt_esc = FALSE;
 #define CMD_TRAVEL (char) 0x90
 #define CMD_CLICKLOOK (char) 0x8F
 
-#ifdef DEBUG
-extern int NDECL(wiz_debug_cmd_bury);
-#endif
-
 #ifdef DUMB /* stuff commented out in extern.h, but needed here */
 extern int NDECL(doapply);            /**/
 extern int NDECL(dorub);              /**/
diff --git a/src/do_name.c b/src/do_name.c
index a44374a9c..131edf835 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -6,11 +6,16 @@
 #include "hack.h"
 
 static char *NDECL(nextmbuf);
+static void FDECL(getpos_help_keyxhelp, (winid, const char *, const char *, int));
 static void FDECL(getpos_help, (BOOLEAN_P, const char *));
 static int FDECL(CFDECLSPEC cmp_coord_distu, (const void *, const void *));
+static int FDECL(gloc_filter_classify_glyph, (int));
+static int FDECL(gloc_filter_floodfill_matcharea, (int, int));
+static void FDECL(gloc_filter_floodfill, (int, int));
+static void NDECL(gloc_filter_init);
+static void NDECL(gloc_filter_done);
 static boolean FDECL(gather_locs_interesting, (int, int, int));
 static void FDECL(gather_locs, (coord **, int *, int));
-static int FDECL(gloc_filter_floodfill_matcharea, (int, int));
 static void FDECL(auto_describe, (int, int));
 static void NDECL(do_mname);
 static boolean FDECL(alreadynamed, (struct monst *, char *, char *));
@@ -68,7 +73,7 @@ static const char *const gloc_filtertxt[NUM_GFILTER] = {
     " in this area"
 };
 
-void
+static void
 getpos_help_keyxhelp(tmpwin, k1, k2, gloc)
 winid tmpwin;
 const char *k1;
@@ -248,7 +253,7 @@ const void *b;
     (isok((x), (y))                                             \
      && (selection_getpoint((x),(y), g.gloc_filter_map)))
 
-int
+static int
 gloc_filter_classify_glyph(glyph)
 int glyph;
 {
@@ -291,7 +296,7 @@ int x, y;
     return FALSE;
 }
 
-void
+static void
 gloc_filter_floodfill(x, y)
 int x, y;
 {
@@ -301,7 +306,7 @@ int x, y;
     selection_floodfill(g.gloc_filter_map, x, y, FALSE);
 }
 
-void
+static void
 gloc_filter_init()
 {
     if (iflags.getloc_filter == GFILTER_AREA) {
@@ -322,7 +327,7 @@ gloc_filter_init()
     }
 }
 
-void
+static void
 gloc_filter_done()
 {
     if (g.gloc_filter_map) {