4 files changed, 10 insertions, 10 deletions

diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 5ec6d7a69e7a..be1b6f63ce4b 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -293,7 +293,7 @@ Type(msgvec)
 /*
  * Type out the messages requested.
  */
-jmp_buf	pipestop;
+static jmp_buf	pipestop;
 int
 type1(msgvec, doign, page)
 	int *msgvec;
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index 7eb11231334e..4d5e14b0b18d 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
  * Lexical processing of commands.
  */
 
-const char	*prompt = "& ";
+static const char	*prompt = "& ";
 
 extern const struct cmd cmdtab[];
 extern const char *version;	
@@ -194,8 +194,8 @@ incfile()
 	return (msgCount - omsgCount);
 }
 
-int	*msgvec;
-int	reset_on_stop;			/* do a reset() if stopped */
+static int	*msgvec;
+static int	reset_on_stop;		/* do a reset() if stopped */
 
 /*
  * Interpret user commands one by one.  If standard input is not a tty,
@@ -539,7 +539,7 @@ isprefix(as1, as2)
  * Also, unstack all source files.
  */
 
-int	inithdr;			/* am printing startup headers */
+static int	inithdr;		/* am printing startup headers */
 
 /*ARGSUSED*/
 void
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index abff92a928c9..b5907ecb2107 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -98,7 +98,7 @@ getmsglist(buf, vector, flags)
  * the colon and gives the corresponding modifier bit.
  */
 
-struct coltab {
+static struct coltab {
 	char	co_char;		/* What to find past : */
 	int	co_bit;			/* Associated modifier bit */
 	int	co_mask;		/* m_status bits to mask */
@@ -499,7 +499,7 @@ getrawlist(line, argv, argc)
  * appropriate.  In any event, store the scanned `thing' in lexstring.
  */
 
-struct lex {
+static struct lex {
 	char	l_char;
 	char	l_token;
 } singles[] = {
@@ -686,7 +686,7 @@ matchsender(str, mesg)
 
 static char *to_fields[] = { "to", "cc", "bcc", NULL };
 
-int
+static int
 matchto(str, mesg)
 	char *str;
 	int mesg;
@@ -723,7 +723,7 @@ matchto(str, mesg)
  * be used to limit the search to just the 'To' field.
  */
 
-char lastscan[STRINGLEN];
+static char lastscan[STRINGLEN];
 int
 matchfield(str, mesg)
 	char *str;
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 3338b1dee93c..3dc5938faead 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
  * Startup -- interface with user.
  */
 
-jmp_buf	hdrjmp;
+static jmp_buf	hdrjmp;
 
 extern const char *version;