From aee8272d3dc094971d54f4af9e979ad848ed8dec Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 3 Aug 2008 21:00:40 -0400
Subject: [PATCH] Give some identifiers internal linkage

Give draw_map(), xdeval(), LwpSchedQ[], LwpDeadQ, LwpContextPtr,
LwpMaxpri, LwpStackGrowsDown internal linkage.
---
 include/prototypes.h   | 1 -
 include/xdump.h        | 1 -
 src/lib/common/xdump.c | 4 ++--
 src/lib/lwp/lwp.c      | 8 ++++----
 src/lib/lwp/lwpint.h   | 2 --
 src/lib/subs/maps.c    | 3 ++-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/include/prototypes.h b/include/prototypes.h
index 5f6aee9e..6b74a0eb 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -471,7 +471,6 @@ extern int adj_units(coord, coord, natid);
 extern int islist(char *);
 /* maps.c */
 extern int do_map(int bmap, int unit_type, char *arg1, char *arg2);
-extern int draw_map(int, char, int, struct nstr_sect *);
 extern int display_region_map(int bmap, int unit_type, coord curx,
 			      coord cury, char *arg);
 extern int bmaps_intersect(natid, natid);
diff --git a/include/xdump.h b/include/xdump.h
index 7d244a36..8010fbad 100644
--- a/include/xdump.h
+++ b/include/xdump.h
@@ -51,7 +51,6 @@ struct xdstr *xdinit(struct xdstr *, natid, int, void (*)(char *, ...));
 extern void xdhdr(struct xdstr *, char *, int);
 extern void xdcolhdr(struct xdstr *, struct castr[]);
 extern void xdflds(struct xdstr *, struct castr[], void *);
-extern struct valstr *xdeval(struct valstr *, struct xdstr *, struct castr *, void *, int);
 extern void xdftr(struct xdstr *, int);
 extern int xdmeta(struct xdstr *, int);
 extern int xundump(FILE *, char *, int *, int);
diff --git a/src/lib/common/xdump.c b/src/lib/common/xdump.c
index 202977df..c8d86f3e 100644
--- a/src/lib/common/xdump.c
+++ b/src/lib/common/xdump.c
@@ -105,7 +105,7 @@ xdinit(struct xdstr *xd, natid cnum, int human, void (*pr)(char *fmt, ...))
  * PTR points to the context object.
  * IDX is the index within the attribute.
  */
-struct valstr *
+static struct valstr *
 xdeval(struct valstr *val, struct xdstr *xd,
        struct castr *ca, void *ptr, int idx)
 {
@@ -311,7 +311,7 @@ xdftr(struct xdstr *xd, int n)
 
 /*
  * Dump meta-data for items of type TYPE to XD.
- * Return RET_OK.
+ * Return RET_SYN when TYPE doesn't have meta-data, else RET_OK.
  */
 int
 xdmeta(struct xdstr *xd, int type)
diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index 3e57c8fd..c9ceda4a 100644
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -39,12 +39,12 @@
 #include "lwpint.h"
 #include "prototypes.h"
 
-struct lwpQueue LwpSchedQ[LWP_MAX_PRIO], LwpDeadQ;
+static struct lwpQueue LwpSchedQ[LWP_MAX_PRIO], LwpDeadQ;
 
 struct lwpProc *LwpCurrent = NULL;
-void **LwpContextPtr;
-int LwpMaxpri = 0;		/* maximum priority so far */
-int LwpStackGrowsDown;
+static void **LwpContextPtr;
+static int LwpMaxpri = 0;	/* maximum priority so far */
+static int LwpStackGrowsDown;
 
 static void lwpDestroy(struct lwpProc *proc);
 static void lwpStackCheckInit(struct lwpProc *newp);
diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h
index df4fa343..99a792f6 100644
--- a/src/lib/lwp/lwpint.h
+++ b/src/lib/lwp/lwpint.h
@@ -71,8 +71,6 @@ struct lwpQueue {
 /* XXX Note that this assumes sizeof(int) == 4 */
 #define LWP_CHECKMARK	0x5a5a5a5a
 
-extern int LwpStackGrowsDown;
-
 int lwpNewContext(struct lwpProc *);
 void lwpSwitchContext(struct lwpProc *, struct lwpProc *);
 void lwpAddTail(struct lwpQueue *, struct lwpProc *);
diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 4e588128..4c3ed229 100644
--- a/src/lib/subs/maps.c
+++ b/src/lib/subs/maps.c
@@ -53,6 +53,7 @@
 #include "ship.h"
 #include "xy.h"
 
+static int draw_map(int, char, int, struct nstr_sect *);
 static int bmnxtsct(struct nstr_sect *);
 static char map_char(int, natid, int);
 static int unit_map(int, int, struct nstr_sect *, char *);
@@ -115,7 +116,7 @@ do_map(int bmap, int unit_type, char *arg, char *map_flags_arg)
     return draw_map(bmap, origin, map_flags, &ns);
 }
 
-int
+static int
 draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
 {
     struct natstr *np;