Index: calendar/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- calendar/Makefile	16 Aug 2004 09:31:09 -0000	1.30
+++ calendar/Makefile	28 Dec 2004 20:33:08 -0000
@@ -2,6 +2,7 @@
 # $FreeBSD: src/usr.bin/calendar/Makefile,v 1.30 2004/08/16 09:31:09 dwmalone Exp $
 
 PROG=	calendar
+WARNS?=	6
 SRCS=   calendar.c io.c day.c ostern.c paskha.c
 INTER=          de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
 		hr_HR.ISO8859-2 hu_HU.ISO8859-2 ru_RU.KOI8-R
Index: calendar/calendar.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/calendar.c,v
retrieving revision 1.18
diff -u -r1.18 calendar.c
--- calendar/calendar.c	14 Aug 2002 11:28:07 -0000	1.18
+++ calendar/calendar.c	28 Dec 2004 20:34:02 -0000
@@ -67,9 +67,7 @@
 int Friday = 5;	     /* day before weekend */
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	int ch;
 
Index: calendar/calendar.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/calendar.h,v
retrieving revision 1.10
diff -u -r1.10 calendar.h
--- calendar/calendar.h	28 May 2004 17:41:36 -0000	1.10
+++ calendar/calendar.h	28 Dec 2004 07:05:43 -0000
@@ -41,7 +41,6 @@
 extern struct iovec header[];
 extern struct tm *tp;
 extern const char *calendarFile;
-extern char *optarg;
 
 void	 cal(void);
 void	 closecal(FILE *);
Index: calendar/day.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/day.c,v
retrieving revision 1.21
diff -u -r1.21 day.c
--- calendar/day.c	6 Dec 2004 15:38:24 -0000	1.21
+++ calendar/day.c	28 Dec 2004 20:37:51 -0000
@@ -137,8 +137,7 @@
 }
 
 void
-settime(now)
-    	time_t now;
+settime(time_t now)
 {
 	char *oldl, *lbufp;
 
@@ -170,8 +169,7 @@
 /* convert Day[/Month][/Year] into unix time (since 1970)
  * Day: two digits, Month: two digits, Year: digits
  */
-time_t Mktime (dp)
-    char *dp;
+time_t Mktime (char *dp)
 {
     time_t t;
     int d, m, y;
@@ -216,11 +214,7 @@
  * along with the matched line.
  */
 int
-isnow(endp, monthp, dayp, varp)
-	char *endp;
-	int	*monthp;
-	int	*dayp;
-	int	*varp;
+isnow(char *endp, int *monthp, int *dayp, int *varp)
 {
 	int day, flags, month = 0, v1, v2;
 
@@ -392,8 +386,7 @@
 
 
 int
-getmonth(s)
-	char *s;
+getmonth(char *s)
 {
 	const char **p;
 	struct fixs *n;
@@ -412,8 +405,7 @@
 
 
 int
-getday(s)
-	char *s;
+getday(char *s)
 {
 	const char **p;
 	struct fixs *n;
@@ -436,8 +428,7 @@
  * ... etc ...
  */
 int
-getdayvar(s)
-	char *s;
+getdayvar(char *s)
 {
 	int offs;
 
Index: calendar/io.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/io.c,v
retrieving revision 1.19
diff -u -r1.19 io.c
--- calendar/io.c	28 Jul 2002 13:46:09 -0000	1.19
+++ calendar/io.c	28 Dec 2004 21:37:47 -0000
@@ -166,9 +166,7 @@
 }
 
 int
-getfield(p, endp, flags)
-	char *p, **endp;
-	int *flags;
+getfield(char *p, char **endp, int *flags)
 {
 	int val, var;
 	char *start, savech;
@@ -312,8 +310,7 @@
 }
 
 void
-closecal(fp)
-	FILE *fp;
+closecal(FILE *fp)
 {
 	uid_t uid;
 	struct stat sbuf;
Index: calendar/ostern.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/ostern.c,v
retrieving revision 1.11
diff -u -r1.11 ostern.c
--- calendar/ostern.c	10 Dec 2001 21:13:03 -0000	1.11
+++ calendar/ostern.c	28 Dec 2004 20:43:48 -0000
@@ -43,8 +43,7 @@
  * Astronomical Almanac".
  */
 
-int easter (year)
-    int year;            /* 0 ... abcd, NOT since 1900 */
+int easter (int year)	/* 0 ... abcd, NOT since 1900 */
 {
     int G,	/* Golden number - 1 */
 	C,	/* Century */
@@ -72,13 +71,11 @@
  * e.g: Easter-2 is  Good Friday (2 days before Easter)
  */
 
+extern struct fixs neaster;
 int
-geteaster(s, year)
-	char *s;
-        int year;
+geteaster(char *s, int year)
 {
 	int offset = 0;
-	extern struct fixs neaster;
 
 #define EASTER "easter"
 #define EASTERNAMELEN (sizeof(EASTER) - 1)
Index: calendar/paskha.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/calendar/paskha.c,v
retrieving revision 1.7
diff -u -r1.7 paskha.c
--- calendar/paskha.c	10 Dec 2001 21:13:03 -0000	1.7
+++ calendar/paskha.c	28 Dec 2004 20:44:39 -0000
@@ -42,14 +42,14 @@
 /* return year day for Orthodox Easter using Gauss formula */
 /* (old style result) */
 
+extern int *cumdays;
+
 static int
-paskha (R)
-int R;  /*year*/
+paskha (int R)	/*year*/
 {
 	int a, b, c, d, e;
 	static int x = 15;
 	static int y = 6;
-	extern int *cumdays;
 
 	a = R % 19;
 	b = R % 4;
@@ -61,13 +61,12 @@
 
 /* return year day for Orthodox Easter depending days */
 
+extern struct fixs npaskha;
+
 int
-getpaskha(s, year)
-	char *s;
-        int year;
+getpaskha(char *s, int year)
 {
 	int offset;
-	extern struct fixs npaskha;
 
 	if (strncasecmp(s, PASKHA, PASKHALEN) == 0)
 	    s += PASKHALEN;