Fix warning: return type of `main' is not `int'

17 files changed, 45 insertions, 17 deletions

diff --git a/contrib/cpio/main.c b/contrib/cpio/main.c
index bba4d32..20829ef 100644
--- a/contrib/cpio/main.c
+++ b/contrib/cpio/main.c
@@ -19,6 +19,8 @@
    David MacKenzie <djm@gnu.ai.mit.edu>,
    and John Oleynick <juo@klinzhai.rutgers.edu>.  */
 
+/* $FreeBSD$ */
+
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/types.h>
@@ -498,7 +500,7 @@ initialize_buffers ()
   bzero (zeros_512, 512);
 }
 
-void
+int
 main (argc, argv)
      int argc;
      char *argv[];
diff --git a/games/caesar/caesar.c b/games/caesar/caesar.c
index b227b57..e2f1074 100644
--- a/games/caesar/caesar.c
+++ b/games/caesar/caesar.c
@@ -46,7 +46,12 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)caesar.c    8.1 (Berkeley) 5/31/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <errno.h>
@@ -75,7 +80,8 @@ double stdf[26] = {
 
 void printit();
 
-void main(argc, argv)
+int
+main(argc, argv)
 	int argc;
 	char **argv;
 {
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index 9b67b6a..1a57d2b 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -41,7 +41,12 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)strfile.c   8.1 (Berkeley) 5/31/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 # include	<sys/param.h>
@@ -134,7 +139,7 @@ int cmp_str();
  *	CHUNKSIZE blocks; if the latter, we just write each pointer,
  *	and then seek back to the beginning to write in the table.
  */
-void main(ac, av)
+int main(ac, av)
 int	ac;
 char	**av;
 {
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index 78a21fb..00b5c1e 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -41,7 +41,12 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)unstr.c     8.1 (Berkeley) 5/31/93";
+#else
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 /*
@@ -72,7 +77,7 @@ FILE	*Inf, *Dataf;
 void getargs(), order_unstr();
 
 /* ARGSUSED */
-void main(ac, av)
+int main(ac, av)
 int	ac;
 char	**av;
 {
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 810c9c6..348f8a0 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -97,7 +97,7 @@ void daemon_uid __P((void));
 void user_uid __P((void));
 int speed __P((int));
 
-void
+int
 main(argc, argv)
 	char *argv[];
 {
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 7073dc4..2ebd5572 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -480,7 +480,7 @@ out:
 	return;
 }
 
-void
+int
 main(int ac, char* av[])
 {
 	int	ch;
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index 8d5379b..894c249 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -991,7 +991,7 @@ usage()
 }
 
 
-void
+int
 main(int argc, char **argv)
 {
 	int		opt;
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 5638fd9..1b01fde 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -423,7 +423,7 @@ static void	mremote_clientchg(int add);
 
 static int kidspad(u_char rxc, mousestatus_t *act);
 
-void
+int
 main(int argc, char *argv[])
 {
     int c;
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index c17f766..9af89e2 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -160,7 +160,7 @@ static	u_char zero[6];
 
 int sflag = 0;			/* ignore /tftpboot */
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/usr.sbin/stallion/stlload/stlload.c b/usr.sbin/stallion/stlload/stlload.c
index 6d0f030..163f4ff 100644
--- a/usr.sbin/stallion/stlload/stlload.c
+++ b/usr.sbin/stallion/stlload/stlload.c
@@ -423,7 +423,7 @@ int download()
 
 /*****************************************************************************/
 
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	struct stat	statinfo;
 	int		c;
diff --git a/usr.sbin/stallion/stlstats/stlstats.c b/usr.sbin/stallion/stlstats/stlstats.c
index 19d3161..59fedbd 100644
--- a/usr.sbin/stallion/stlstats/stlstats.c
+++ b/usr.sbin/stallion/stlstats/stlstats.c
@@ -497,7 +497,7 @@ void localexit(int nr)
 
 /*****************************************************************************/
 
-void main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
 	struct stat	statinfo;
 	int		c, useport;
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 307ffa7..a9e2629 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -282,7 +282,7 @@ ask_dev(dev_name, msg)
 
 #define READB_LEN	5
 
-void
+int
 main(ac, av)
 	int             ac;
 	char          **av;
diff --git a/usr.sbin/xntpd/authstuff/md5driver.c b/usr.sbin/xntpd/authstuff/md5driver.c
index 0d7e132..aef597c 100644
--- a/usr.sbin/xntpd/authstuff/md5driver.c
+++ b/usr.sbin/xntpd/authstuff/md5driver.c
@@ -22,6 +22,8 @@
  ***********************************************************************
  */
 
+/* $FreeBSD$ */
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <time.h>
@@ -176,7 +178,7 @@ MDTestSuite ()
     ("12345678901234567890123456789012345678901234567890123456789012345678901234567890");
 }
 
-void
+int
 main (argc, argv)
 int argc;
 char *argv[];
diff --git a/usr.sbin/xntpd/ntpdate/ntpdate.c b/usr.sbin/xntpd/ntpdate/ntpdate.c
index 6088328..1d2c7d5 100644
--- a/usr.sbin/xntpd/ntpdate/ntpdate.c
+++ b/usr.sbin/xntpd/ntpdate/ntpdate.c
@@ -1,5 +1,7 @@
 /*
  * ntpdate - set the time of day by polling one or more NTP servers
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <signal.h>
@@ -156,7 +158,7 @@ static	void	printserver	P((struct server *, FILE *));
  * Main program.  Initialize us and loop waiting for I/O and/or
  * timer expiries.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/usr.sbin/xntpd/ntpq/ntpq.c b/usr.sbin/xntpd/ntpq/ntpq.c
index 2c5eacf..186408a 100644
--- a/usr.sbin/xntpd/ntpq/ntpq.c
+++ b/usr.sbin/xntpd/ntpq/ntpq.c
@@ -1,5 +1,7 @@
 /*
  * ntpq - query an NTP server using mode 6 commands
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <ctype.h>
@@ -512,7 +514,7 @@ int debug;
 /*
  * main - parse arguments and handle options
  */
-void
+int
 main(argc, argv)
 int argc;
 char *argv[];
diff --git a/usr.sbin/xntpd/ntptrace/ntptrace.c b/usr.sbin/xntpd/ntptrace/ntptrace.c
index 206c738..0c54fdf 100644
--- a/usr.sbin/xntpd/ntptrace/ntptrace.c
+++ b/usr.sbin/xntpd/ntptrace/ntptrace.c
@@ -7,6 +7,8 @@
  *	Inspired by a script written by Glenn Trewitt
  *
  *	Large portions stolen from ntpdate.c
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <signal.h>
@@ -103,7 +105,7 @@ static	void	printrefid	P((FILE *, struct server *));
  * Main program.  Initialize us and loop waiting for I/O and/or
  * timer expiries.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/usr.sbin/xntpd/xntpd/ntpd.c b/usr.sbin/xntpd/xntpd/ntpd.c
index ae06f56..bd36004 100644
--- a/usr.sbin/xntpd/xntpd/ntpd.c
+++ b/usr.sbin/xntpd/xntpd/ntpd.c
@@ -1,5 +1,7 @@
 /*
  * ntpd.c - main program for the fixed point NTP daemon
+ *
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <errno.h>
@@ -95,7 +97,7 @@ static	RETSIGTYPE	lessdebug	P((int));
  * Main program.  Initialize us, disconnect us from the tty if necessary,
  * and loop waiting for I/O and/or timer expiries.
  */
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];