4 files changed, 11 insertions, 12 deletions

diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index bd03e0272284..2a107c26afd5 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
 struct passwd	*pw;
 int		doall = 0;
 int		debug = 0;
-char		*DEBUG = NULL;
-time_t		f_time = 0;
+static char	*DEBUG = NULL;
+static time_t	f_time = 0;
 double		UTCOffset = UTCOFFSET_NOTSET;
 int		EastLongitude = LONGITUDE_NOTSET;
 
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index 3f8b89f7ee9c..989f29c970be 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -43,7 +43,7 @@ struct cal_year {
 	int firstdayofweek; /* 0 .. 6 */
 	struct cal_month *months;
 	struct cal_year	*nextyear;
-} cal_year;
+};
 
 struct cal_month {
 	int month;			/* 01 .. 12 */
@@ -52,7 +52,7 @@ struct cal_month {
 	struct cal_year *year;		/* points back */
 	struct cal_day *days;
 	struct cal_month *nextmonth;
-} cal_month;
+};
 
 struct cal_day {
 	int dayofmonth;			/* 01 .. 31 */
@@ -62,19 +62,18 @@ struct cal_day {
 	struct cal_month *month;	/* points back */
 	struct cal_year	*year;		/* points back */
 	struct event *events;
-} cal_day;
+};
 
 int debug_remember = 0;
-struct cal_year	*hyear = NULL;
+static struct cal_year *hyear = NULL;
 
 /* 1-based month, 0-based days, cumulative */
-int *cumdays;
 int	cumdaytab[][14] = {
 	{0, -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364},
 	{0, -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
 };
 /* 1-based month, individual */
-int *mondays;
+static int *mondays;
 int	mondaytab[][14] = {
 	{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
 	{0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 237b6b5a7d92..dac6115be4b4 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include "calendar.h"
 
-time_t			time1, time2;
+static time_t		time1, time2;
 const struct tm		tm0;
 char			dayname[100];
 int			year1, year2;
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index e1ed21d8aa84..162571719e37 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -60,10 +60,10 @@ __FBSDID("$FreeBSD$");
 #include "calendar.h"
 
 const char *calendarFile = "calendar";	/* default calendar file */
-const char *calendarHomes[] = {".calendar", _PATH_INCLUDE};	/* HOME */
-const char *calendarNoMail = "nomail";	/* don't sent mail if this file exist */
+static const char *calendarHomes[] = {".calendar", _PATH_INCLUDE}; /* HOME */
+static const char *calendarNoMail = "nomail";/* don't sent mail if file exist */
 
-char	path[MAXPATHLEN];
+static char path[MAXPATHLEN];
 
 struct fixs neaster, npaskha, ncny, nfullmoon, nnewmoon;
 struct fixs nmarequinox, nsepequinox, njunsolstice, ndecsolstice;