ANSIfy function definitions.

Move some extern declarations to a header file.
Remove an unneeded extern declaration for optarg.

1 files changed, 9 insertions, 16 deletions

diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 2df00ee48aa1..90890d0c23c4 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -75,7 +75,8 @@ static struct fixs fnmonths[13];      /* full national months names */
 static struct fixs nmonths[13];       /* short national month names */
 
 
-void setnnames(void)
+void
+setnnames(void)
 {
 	char buf[80];
 	int i, l;
@@ -137,8 +138,7 @@ void setnnames(void)
 }
 
 void
-settime(now)
-    	time_t now;
+settime(time_t now)
 {
 	char *oldl, *lbufp;
 
@@ -170,8 +170,8 @@ settime(now)
 /* 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 +216,7 @@ time_t Mktime (dp)
  * 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;
 
@@ -397,8 +393,7 @@ isnow(endp, monthp, dayp, varp)
 
 
 int
-getmonth(s)
-	char *s;
+getmonth(char *s)
 {
 	const char **p;
 	struct fixs *n;
@@ -417,8 +412,7 @@ getmonth(s)
 
 
 int
-getday(s)
-	char *s;
+getday(char *s)
 {
 	const char **p;
 	struct fixs *n;
@@ -441,8 +435,7 @@ getday(s)
  * ... etc ...
  */
 int
-getdayvar(s)
-	char *s;
+getdayvar(char *s)
 {
 	int offs;