From 938e74dcd560a0eea89fcf09db1435c6d5f94fcb Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 30 Dec 2013 04:03:31 +0100
Subject: [PATCH] Remove main() prototypes.

---
 bin/dd/dd.c                           | 2 --
 bin/stty/stty.c                       | 3 ---
 games/hunt/huntd/driver.c             | 2 --
 games/snake/snake/snake.c             | 1 -
 libexec/getty/main.c                  | 2 --
 libexec/utmp_update/utmp_update.c     | 2 --
 sbin/fsck/main.c                      | 1 -
 sbin/fsck_msdosfs/main.c              | 1 -
 sbin/ping6/ping6.c                    | 1 -
 sbin/rcorder/rcorder.c                | 1 -
 sys/dev/disk/aic7xxx/aicasm/aicasm.c  | 2 --
 test/testcases/sysv/sysvsem/semtest.c | 2 --
 test/testcases/sysv/sysvshm/shmtest.c | 2 --
 usr.bin/btpin/btpin.c                 | 2 --
 usr.bin/col/col.c                     | 2 --
 usr.bin/ee/ee.c                       | 1 -
 usr.bin/gencat/gencat.c               | 1 -
 usr.bin/gzip/gzip.c                   | 2 --
 usr.bin/id/id.c                       | 2 --
 usr.bin/last/last.c                   | 2 --
 usr.bin/nl/nl.c                       | 1 -
 usr.bin/sort/sort.c                   | 2 --
 usr.bin/talk/talk.c                   | 3 ---
 usr.bin/window/main.c                 | 1 -
 usr.sbin/ac/ac.c                      | 2 --
 usr.sbin/ancontrol/ancontrol.c        | 1 -
 usr.sbin/btconfig/btconfig.c          | 1 -
 usr.sbin/faithd/faithd.c              | 1 -
 usr.sbin/gifconfig/gifconfig.c        | 1 -
 usr.sbin/ifmcstat/ifmcstat.c          | 1 -
 usr.sbin/lpr/lpc/lpc.c                | 1 -
 usr.sbin/lpr/lpd/lpd.c                | 2 --
 usr.sbin/lpr/lpq/lpq.c                | 2 --
 usr.sbin/lpr/lpr/lpr.c                | 1 -
 usr.sbin/lpr/lprm/lprm.c              | 2 --
 usr.sbin/lpr/pac/pac.c                | 2 --
 usr.sbin/mrouted/main.c               | 3 ---
 usr.sbin/mrouted/mapper.c             | 1 -
 usr.sbin/mrouted/mrinfo.c             | 5 -----
 usr.sbin/mrouted/mtrace.c             | 1 -
 usr.sbin/ndp/ndp.c                    | 2 --
 usr.sbin/pppd/main.c                  | 1 -
 usr.sbin/pppstats/pppstats.c          | 3 ---
 usr.sbin/rip6query/rip6query.c        | 2 --
 usr.sbin/route6d/route6d.c            | 1 -
 usr.sbin/rrenumd/rrenumd.c            | 2 --
 usr.sbin/rtadvd/rtadvd.c              | 1 -
 usr.sbin/rtsold/rtsold.c              | 3 ---
 usr.sbin/setkey/setkey.c              | 2 --
 usr.sbin/traceroute6/traceroute6.c    | 1 -
 usr.sbin/usbdevs/usbdevs.c            | 1 -
 usr.sbin/watchdogd/watchdogd.c        | 1 -
 52 files changed, 88 deletions(-)

diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 50ca08c634..1ba168fb9e 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -33,7 +33,6 @@
  * @(#) Copyright (c) 1991, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)dd.c	8.5 (Berkeley) 4/2/94
  * $FreeBSD: src/bin/dd/dd.c,v 1.27.2.3 2001/08/01 01:37:35 obrien Exp $
- * $DragonFly: src/bin/dd/dd.c,v 1.9 2008/01/28 16:08:02 matthias Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +57,6 @@
 
 static void dd_close (void);
 static void dd_in (void);
-int main (int, char *[]);
 static void getfdtype (IO *);
 static void setup (void);
 
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index 1d2eb03f2e..9f8d093ed2 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -29,7 +29,6 @@
  * @(#) Copyright (c) 1989, 1991, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)stty.c	8.3 (Berkeley) 4/2/94
  * $FreeBSD: src/bin/stty/stty.c,v 1.13.2.2 2001/07/04 22:40:00 kris Exp $
- * $DragonFly: src/bin/stty/stty.c,v 1.5 2004/11/07 20:54:52 eirikn Exp $
  */
 
 #include <sys/types.h>
@@ -46,8 +45,6 @@
 #include "stty.h"
 #include "extern.h"
 
-int main (int, char *[]);
-
 int
 main(int argc, char **argv)
 {
diff --git a/games/hunt/huntd/driver.c b/games/hunt/huntd/driver.c
index 371ed7f4dd..5fef5feb07 100644
--- a/games/hunt/huntd/driver.c
+++ b/games/hunt/huntd/driver.c
@@ -30,7 +30,6 @@
  *
  * $OpenBSD: driver.c,v 1.17 2007/04/02 14:55:16 jmc Exp $
  * $NetBSD: driver.c,v 1.5 1997/10/20 00:37:16 lukem Exp $
- * $DragonFly: src/games/hunt/huntd/driver.c,v 1.3 2008/11/10 15:28:13 swildner Exp $
  */
 
 #include <sys/ioctl.h>
@@ -68,7 +67,6 @@ in_addr_t Server_addr = INADDR_ANY;	/* address to bind to */
 static	void	clear_scores(void);
 static	int	havechar(PLAYER *);
 static	void	init(void);
-	int	main(int, char *[]);
 static	void	makeboots(void);
 static	void	send_stats(void);
 static	void	zap(PLAYER *, FLAG);
diff --git a/games/snake/snake/snake.c b/games/snake/snake/snake.c
index 5f907d03ea..522dcb7d35 100644
--- a/games/snake/snake/snake.c
+++ b/games/snake/snake/snake.c
@@ -109,7 +109,6 @@ void flushi(void);
 void home(void);
 void length(int);
 void logit(const char *);
-int main(int, char **);
 void mainloop(void) __attribute__((__noreturn__));
 struct point *point(struct point *, int, int);
 int post(int, int);
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 1c02eaab7c..88e237addf 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -131,8 +131,6 @@ static void	setttymode (const char *, int);
 static void	setdefttymode (const char *);
 static int	opentty (const char *, int);
 
-int		main (int, char **);
-
 jmp_buf timeout;
 
 static void
diff --git a/libexec/utmp_update/utmp_update.c b/libexec/utmp_update/utmp_update.c
index 1722c0de2e..dcc524f469 100644
--- a/libexec/utmp_update/utmp_update.c
+++ b/libexec/utmp_update/utmp_update.c
@@ -45,8 +45,6 @@
 #include <unistd.h>
 #include <paths.h>
 
-int main(int, char *[]);
-
 int
 main(int argc, char *argv[])
 {
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index 6fc15b2934..49b84dea0b 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -54,7 +54,6 @@ static int docheck(struct fstab *fsp);
 static int checkfilesys(char *filesys, char *mntpt, long auxdata,
 		int child);
 static struct statfs *getmntpt(const char *);
-int main(int argc, char *argv[]);
 
 int
 main(int argc, char **argv)
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index 6501bea132..9d2e6f78e1 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -50,7 +50,6 @@ int preen;		/* set when preening */
 int rdonly;		/* device is opened read only (supersedes above) */
 
 static void usage(void);
-int main(int, char **);
 
 static void
 usage(void)
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 0224773f5b..4630509db9 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -235,7 +235,6 @@ volatile sig_atomic_t seenint;
 volatile sig_atomic_t seeninfo;
 #endif
 
-int	 main(int, char *[]);
 void	 fill(char *, char *);
 int	 get_hoplim(struct msghdr *);
 #ifdef IPV6_RECVPATHMTU
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 1e5c0218d4..1eb70bc132 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -149,7 +149,6 @@ Hash_Entry *make_fake_provision(filenode *);
 void crunch_all_files(void);
 void initialize(void);
 void generate_ordering(void);
-int main(int, char *[]);
 
 int
 main(int argc, char **argv)
diff --git a/sys/dev/disk/aic7xxx/aicasm/aicasm.c b/sys/dev/disk/aic7xxx/aicasm/aicasm.c
index 0a364ed0eb..8aad7ad024 100644
--- a/sys/dev/disk/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/disk/aic7xxx/aicasm/aicasm.c
@@ -112,8 +112,6 @@ extern FILE *yyin;
 extern int yyparse(void);
 extern int yylineno;
 
-int main(int argc, char *argv[]);
-
 int
 main(int argc, char *argv[])
 {
diff --git a/test/testcases/sysv/sysvsem/semtest.c b/test/testcases/sysv/sysvsem/semtest.c
index 39fd4e5a08..25ac0699f8 100644
--- a/test/testcases/sysv/sysvsem/semtest.c
+++ b/test/testcases/sysv/sysvsem/semtest.c
@@ -35,7 +35,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: semtest.c,v 1.4 2002/07/20 08:36:25 grant Exp $
- * $DragonFly: src/tools/regression/sysvsem/semtest.c,v 1.1 2003/10/18 12:13:01 hmp Exp $
  */
 
 /*
@@ -56,7 +55,6 @@
 #include <time.h>
 #include <unistd.h>
 
-int	main (int, char *[]);
 void	print_semid_ds (struct semid_ds *, mode_t);
 void	sigsys_handler (int);
 void	sigchld_handler(int);
diff --git a/test/testcases/sysv/sysvshm/shmtest.c b/test/testcases/sysv/sysvshm/shmtest.c
index 65c73193d1..5dcddd113f 100644
--- a/test/testcases/sysv/sysvshm/shmtest.c
+++ b/test/testcases/sysv/sysvshm/shmtest.c
@@ -35,7 +35,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $
- * $DragonFly: src/tools/regression/sysvshm/shmtest.c,v 1.2 2003/11/14 03:54:33 dillon Exp $
  */
 
 /*
@@ -56,7 +55,6 @@
 #include <time.h>
 #include <unistd.h>
 
-int	main (int, char *[]);
 void	print_shmid_ds (struct shmid_ds *, mode_t);
 void	sigsys_handler (int);
 void	sigchld_handler (int);
diff --git a/usr.bin/btpin/btpin.c b/usr.bin/btpin/btpin.c
index 6b98d33274..96f6a7f6e2 100644
--- a/usr.bin/btpin/btpin.c
+++ b/usr.bin/btpin/btpin.c
@@ -1,5 +1,4 @@
 /* $NetBSD: btpin.c,v 1.3 2007/04/14 09:28:39 plunky Exp $ */
-/* $DragonFly: src/usr.bin/btpin/btpin.c,v 1.2 2008/07/10 18:29:51 swildner Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -41,7 +40,6 @@
 #include <time.h>
 #include <unistd.h>
 
-int  main(int, char *[]);
 void usage(void);
 
 int
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 4c9f11c09b..ae12ef2815 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -32,7 +32,6 @@
  * @(#) Copyright (c) 1990, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)col.c	8.5 (Berkeley) 5/4/95
  * $FreeBSD: src/usr.bin/col/col.c,v 1.6.6.4 2001/08/02 01:27:12 obrien Exp $
- * $DragonFly: src/usr.bin/col/col.c,v 1.5 2006/08/03 16:40:48 swildner Exp $
  */
 
 #include <ctype.h>
@@ -86,7 +85,6 @@ void	flush_line(LINE *);
 void	flush_lines(int);
 void	flush_blanks(void);
 void	free_line(LINE *);
-int	main(int, char **);
 void	usage(void);
 
 CSET	last_set;		/* char_set of last char printed */
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index aebaad1bd6..342b81dae1 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -243,7 +243,6 @@ struct menu_entries {
 	int argument;
 	};
 
-int main(int argc, char *argv[]);
 unsigned char *resiz_line(int factor, struct text *rline, int rpos);
 void insert(int character);
 void delete(int disp);
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index a15817015a..5439b424e0 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -120,7 +120,6 @@ void	MCAddMsg(int, const char *);
 void	MCAddSet(int);
 void	MCDelSet(int);
 void	usage(void);
-int	main(int, char **);
 
 void
 usage(void)
diff --git a/usr.bin/gzip/gzip.c b/usr.bin/gzip/gzip.c
index 6b28fe80eb..9dc390bde1 100644
--- a/usr.bin/gzip/gzip.c
+++ b/usr.bin/gzip/gzip.c
@@ -225,8 +225,6 @@ static	off_t	zuncompress(FILE *, FILE *, char *, size_t, off_t *);
 static	off_t	unpack(int, int, char *, size_t, off_t *);
 #endif
 
-int main(int, char *p[]);
-
 #ifdef SMALL
 #define getopt_long(a,b,c,d,e) getopt(a,b,c)
 #else
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index a7dfb4a1c5..6818554798 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -29,7 +29,6 @@
  * @(#) Copyright (c) 1991, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)id.c	8.2 (Berkeley) 2/16/94
  * $FreeBSD: src/usr.bin/id/id.c,v 1.12.2.3 2001/12/20 12:09:03 ru Exp $
- * $DragonFly: src/usr.bin/id/id.c,v 1.6 2004/12/31 20:58:17 cpressey Exp $
  */
 
 #include <sys/param.h>
@@ -42,7 +41,6 @@
 #include <string.h>
 #include <unistd.h>
 
-int		main(int, char *[]);
 static void	current(void);
 static void	pline(struct passwd *);
 static void	pretty(struct passwd *);
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 15b5d4a618..6e72354470 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -98,8 +98,6 @@ static time_t	currentout;		/* current logout value */
 static long	maxrec;			/* records to display */
 static int	fulltime = 0;		/* Display seconds? */
 
-int	 main(int, char *[]);
-
 static void	 addarg(int, char *);
 static TTY	*addtty(const char *);
 static void	 hostconv(char *);
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index ba20e430ab..df7d007cf5 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -88,7 +88,6 @@ static struct numbering_property numbering_properties[NP_LAST + 1] = {
 	((int)(sizeof (int) * CHAR_BIT - 1) * 302 / 1000 + 2)
 
 static void	filter(void);
-int		main(int, char *[]);
 static void	parse_numbering(const char *, int);
 static void	usage(void);
 
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 85ba31e44b..fc8e8186dd 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -106,8 +106,6 @@ static void cleanup(void);
 static void onsignal(int);
 static void usage(const char *);
 
-int main(int argc, char **argv);
-
 int
 main(int argc, char *argv[])
 {
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 8ccf6b8f5a..3c352ff1b9 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -29,7 +29,6 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)talk.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/talk/talk.c,v 1.7 1999/08/28 01:06:15 peter Exp $
- * $DragonFly: src/usr.bin/talk/talk.c,v 1.3 2003/10/04 20:36:52 hmp Exp $
  */
 
 #include "talk.h"
@@ -50,8 +49,6 @@
  *		Fixed to not run with unwriteable terminals MRVM 28/12/94
  */
 
-int main(int, char **);
-
 int
 main(int argc, char **argv)
 {
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 5495d197e5..c066c26610 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -45,7 +45,6 @@
 #include "char.h"
 #include "local.h"
 
-int	main(int, char **);
 void	usage(void);
 
 int
diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 3a5fabfc61..b265e92a07 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -13,7 +13,6 @@
  *      other than his own.
  *
  * $FreeBSD: src/usr.sbin/ac/ac.c,v 1.14.2.2 2002/03/12 19:55:04 phantom Exp $
- * $DragonFly: src/usr.sbin/ac/ac.c,v 1.6 2004/03/20 17:46:47 cpressey Exp $
  */
 
 #include <sys/types.h>
@@ -81,7 +80,6 @@ static struct tty_list *Ttys = NULL;
 static int Debug = 0;
 #endif
 
-int			main(int, char **);
 int			ac(FILE *);
 struct tty_list		*add_tty(char *);
 int			do_tty(char *);
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 822ef95ca0..f5a54cde16 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -82,7 +82,6 @@ static void an_enable_tx_key(const char *, char *);
 static void an_enable_leap_mode(const char *, char *);
 static void usage	(char *);
 static void 		an_dumprssimap(const char *);
-int main		(int, char **);
 
 #define ACT_DUMPSTATS 1
 #define ACT_DUMPCONFIG 2
diff --git a/usr.sbin/btconfig/btconfig.c b/usr.sbin/btconfig/btconfig.c
index a7953e57fc..f629aa42e4 100644
--- a/usr.sbin/btconfig/btconfig.c
+++ b/usr.sbin/btconfig/btconfig.c
@@ -59,7 +59,6 @@ struct result {
 	int8_t		rssi;
 };
 
-int main(int, char *[]);
 void badarg(const char *);
 void badparam(const char *);
 void usage(void);
diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index 3edc1ce2d9..4f1d6c372f 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -104,7 +104,6 @@ static int pflag = 0;
 static int inetd = 0;
 static char *configfile = NULL;
 
-int main(int, char **);
 static int inetd_main(int, char **);
 static int daemon_main(int, char **);
 static void play_service(int);
diff --git a/usr.sbin/gifconfig/gifconfig.c b/usr.sbin/gifconfig/gifconfig.c
index 8fefd341f5..79a4f7fbf8 100644
--- a/usr.sbin/gifconfig/gifconfig.c
+++ b/usr.sbin/gifconfig/gifconfig.c
@@ -125,7 +125,6 @@ static struct	cmd {
  * XNS support liberally adapted from code written at the University of
  * Maryland principally by James O'Toole and Chris Torek.
  */
-int main(int, char *[]);
 void status(void);
 void phys_status(int);
 void in_status(int);
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 918e63139f..b8d6e788dc 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -63,7 +63,6 @@ struct	nlist nl[] = {
 };
 
 const char *inet6_n2a(struct in6_addr *);
-int main(int, char **);
 char *ifname(struct ifnet *);
 void kread(u_long, void *, int);
 void if6_addrlist(struct ifaddr_container *);
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c
index 83f12a541c..b9cd06b830 100644
--- a/usr.sbin/lpr/lpc/lpc.c
+++ b/usr.sbin/lpr/lpc/lpc.c
@@ -72,7 +72,6 @@ static int	margc;
 static char	*margv[MAX_MARGV];
 uid_t		uid, euid;
 
-int			 main(int _argc, char **_argv);
 static void		 cmdscanner(void);
 static struct cmd	*getcmd(const char *_name);
 static void		 intr(int _signo);
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index 4e1eb85b48..8765d269ad 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -34,7 +34,6 @@
  * @(#) Copyright (c) 1983, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)lpd.c	8.7 (Berkeley) 5/10/95
  * $FreeBSD: src/usr.sbin/lpr/lpd/lpd.c,v 1.12.2.22 2002/06/30 04:09:11 gad Exp $
- * $DragonFly: src/usr.sbin/lpr/lpd/lpd.c,v 1.5 2004/12/18 22:48:03 swildner Exp $
  */
 
 /*
@@ -98,7 +97,6 @@ int	lflag;				/* log requests flag */
 int	sflag;				/* no incoming port flag */
 int	from_remote;			/* from remote socket */
 
-int		 main(int argc, char **_argv);
 static void	 reapchild(int _signo);
 static void	 mcleanup(int _signo);
 static void	 doit(void);
diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c
index 328445ce2b..63f8eac7e9 100644
--- a/usr.sbin/lpr/lpq/lpq.c
+++ b/usr.sbin/lpr/lpq/lpq.c
@@ -34,7 +34,6 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)lpq.c	8.3 (Berkeley) 5/10/95
  * $FreeBSD: src/usr.sbin/lpr/lpq/lpq.c,v 1.7.2.4 2001/07/22 02:51:53 gad Exp $
- * $DragonFly: src/usr.sbin/lpr/lpq/lpq.c,v 1.3 2004/03/22 22:32:50 cpressey Exp $
  */
 
 /*
@@ -70,7 +69,6 @@ uid_t	uid, euid;
 
 static int	 ckqueue(const struct printer *_pp);
 static void	 usage(void);
-int 		 main(int _argc, char **_argv);
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index e6df905757..7633083b43 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -107,7 +107,6 @@ static void	 cleanup(int _signo);
 static void	 copy(const struct printer *_pp, int _f, const char _n[]);
 static char	*itoa(int _i);
 static const char  *linked(const char *_file);
-int		 main(int _argc, char *_argv[]);
 static char	*lmktemp(const struct printer *_pp, const char *_id,
 		    int _num, int len);
 static void	 mktemps(const struct printer *_pp);
diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c
index 0a6d382322..5e0756fa3f 100644
--- a/usr.sbin/lpr/lprm/lprm.c
+++ b/usr.sbin/lpr/lprm/lprm.c
@@ -34,7 +34,6 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)lprm.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/lpr/lprm/lprm.c,v 1.6.2.3 2001/06/25 01:01:04 gad Exp $
- * $DragonFly: src/usr.sbin/lpr/lprm/lprm.c,v 1.2 2003/06/17 04:29:56 dillon Exp $
  */
 
 /*
@@ -73,7 +72,6 @@ uid_t	 uid, euid;		/* real and effective user id's */
 
 static char	luser[16];	/* buffer for person */
 
-int		 main(int argc, char *_argv[]);
 static void	 usage(void);
 
 int
diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c
index 171862cd1a..5aeddf2aae 100644
--- a/usr.sbin/lpr/pac/pac.c
+++ b/usr.sbin/lpr/pac/pac.c
@@ -34,7 +34,6 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)pac.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/lpr/pac/pac.c,v 1.10.2.4 2002/04/26 18:17:52 gad Exp $
- * $DragonFly: src/usr.sbin/lpr/pac/pac.c,v 1.4 2004/12/18 22:48:03 swildner Exp $
  */
 
 /*
@@ -86,7 +85,6 @@ struct hent {
 
 static struct	hent	*hashtab[HSHSIZE];	/* Hash table proper */
 
-int		 main(int argc, char **_argv);
 static void	 account(FILE *_acctf);
 static int	 any(int _ch, const char _str[]);
 static int	 chkprinter(const char *_ptrname);
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 6259e62272..2693b0baa6 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -114,9 +114,6 @@ static void cleanup(void);
 static void resetlogging(void *);
 static void usage(void);
 
-/* To shut up gcc -Wstrict-prototypes */
-int main(int argc, char **argv);
-
 int
 register_input_handler(int fd, ihfunc_t func)
 {
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index 01c9d5750c..ddc5b0a2d8 100644
--- a/usr.sbin/mrouted/mapper.c
+++ b/usr.sbin/mrouted/mapper.c
@@ -76,7 +76,6 @@ vifi_t  numvifs;		/* to keep loader happy */
 Node *			find_node(u_int32 addr, Node **ptr);
 Interface *		find_interface(u_int32 addr, Node *node);
 Neighbor *		find_neighbor(u_int32 addr, Node *node);
-int			main(int argc, char **argv);
 void			ask(u_int32 dst);
 void			ask2(u_int32 dst);
 int			retry_requests(Node *node);
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index 872abe1707..c407ab52ff 100644
--- a/usr.sbin/mrouted/mrinfo.c
+++ b/usr.sbin/mrouted/mrinfo.c
@@ -60,7 +60,6 @@
  *
  * @(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp
  * $FreeBSD: src/usr.sbin/mrouted/mrinfo.c,v 1.17.2.1 2002/09/12 16:27:49 nectar Exp $
- * $DragonFly: src/usr.sbin/mrouted/mrinfo.c,v 1.4 2004/03/15 18:10:28 dillon Exp $
  */
 
 #include <err.h>
@@ -90,10 +89,6 @@ int			get_number(int *var, int deflt, char ***pargv,
 u_int32			host_addr(char *name);
 static void		usage(void);
 
-/* to shut up -Wstrict-prototypes */
-int			main(int argc, char **argv);
-
-
 char *
 inet_name(u_int32 addr)
 {
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index de0733f4d3..4409ab9483 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -352,7 +352,6 @@ int			path_changed(struct resp_buf *base,
 					struct resp_buf *new);
 void			check_vif_state(void);
 
-int			main(int argc, char **argv);
 void			dolog(int, int, char *, ...) __printflike(3, 4);
 static void		usage(void);
 
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index eb3ece016b..5210558e46 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/usr.sbin/ndp/ndp.c,v 1.2.2.6 2003/08/12 16:27:57 ume Exp $	*/
-/*	$DragonFly: src/usr.sbin/ndp/ndp.c,v 1.6 2004/12/30 02:35:24 hsu Exp $	*/
 /*	$KAME: ndp.c,v 1.65 2001/05/08 04:36:34 itojun Exp $	*/
 
 /*
@@ -131,7 +130,6 @@ char ntop_buf[INET6_ADDRSTRLEN];	/* inet_ntop() */
 char host_buf[NI_MAXHOST];		/* getnameinfo() */
 char ifix_buf[IFNAMSIZ];		/* if_indextoname() */
 
-int main(int, char **);
 int file(char *);
 void getsocket(void);
 int set(int, char **);
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index 3f2f8d56f1..fe322903f1 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -126,7 +126,6 @@ static void pr_log(void *, char *, ...);
 
 extern	char	*ttyname(int);
 extern	char	*getlogin(void);
-int main(int, char *[]);
 
 #ifdef ultrix
 #undef	O_NONBLOCK
diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c
index a796219579..c58f3e2f3a 100644
--- a/usr.sbin/pppstats/pppstats.c
+++ b/usr.sbin/pppstats/pppstats.c
@@ -31,7 +31,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * $FreeBSD: src/usr.sbin/pppstats/pppstats.c,v 1.13 1999/08/28 01:19:11 peter Exp $
- * $DragonFly: src/usr.sbin/pppstats/pppstats.c,v 1.7 2005/11/24 23:42:54 swildner Exp $
  */
 
 #include <stdio.h>
@@ -82,8 +81,6 @@ static void get_ppp_stats(struct ppp_stats *);
 static void get_ppp_cstats(struct ppp_comp_stats *);
 static void intpr(void);
 
-int main(int, char *argv[]);
-
 static void
 usage(void)
 {
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index 813f9a686d..b0983fec4d 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rip6query/rip6query.c,v 1.3.2.2 2001/07/03 11:02:08 ume Exp $
- * $DragonFly: src/usr.sbin/rip6query/rip6query.c,v 1.5 2005/12/05 02:40:28 swildner Exp $
  */
 
 #include <stdio.h>
@@ -68,7 +67,6 @@ struct rip6	*ripbuf;
 
 #define	RIPSIZE(n)	(sizeof(struct rip6) + (n-1) * sizeof(struct netinfo6))
 
-int main(int, char **);
 static void usage(void);
 static const char *sa_n2a(struct sockaddr *);
 static const char *inet6_n2a(struct in6_addr *);
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index a4a47e4c75..fffe6190ee 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -203,7 +203,6 @@ volatile sig_atomic_t seenusr1;
 #define RRTF_SENDANYWAY		0x40000000
 #define	RRTF_CHANGED		0x80000000
 
-int main(int, char **);
 void sighandler(int);
 void ripalarm(void);
 void riprecv(void);
diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c
index eade03fe63..2fa1563670 100644
--- a/usr.sbin/rrenumd/rrenumd.c
+++ b/usr.sbin/rrenumd/rrenumd.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rrenumd/rrenumd.c,v 1.1.2.4 2001/07/09 09:49:49 ume Exp $
- * $DragonFly: src/usr.sbin/rrenumd/rrenumd.c,v 1.6 2005/12/05 02:40:28 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -118,7 +117,6 @@ static void rrenum_snd_eachdst(struct payload_list *);
 static void rrenum_snd_fullsequence(void);
 #endif
 static void rrenum_input(int);
-int main(int, char *[]);
 
 
 /* Print usage. Don't call this after daemonized. */
diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c
index 82fb4c679d..15a7243a60 100644
--- a/usr.sbin/rtadvd/rtadvd.c
+++ b/usr.sbin/rtadvd/rtadvd.c
@@ -124,7 +124,6 @@ u_int32_t ndopt_flags[] = {
 	NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU
 };
 
-int main(int, char *[]);
 static void set_die(int);
 static void die(void);
 static void sock_open(void);
diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c
index 4d1c5ec5a6..7993318a5a 100644
--- a/usr.sbin/rtsold/rtsold.c
+++ b/usr.sbin/rtsold/rtsold.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rtsold/rtsold.c,v 1.1.2.4 2002/04/04 11:07:19 ume Exp $
- * $DragonFly: src/usr.sbin/rtsold/rtsold.c,v 1.7 2005/12/05 00:56:37 swildner Exp $
  */
 
 #include <sys/types.h>
@@ -83,8 +82,6 @@ static int fflag = 0;
 /* a == b */
 #define TIMEVAL_EQ(a, b) (((a).tv_sec==(b).tv_sec) && ((a).tv_usec==(b).tv_usec))
 
-int main(int argc, char *argv[]);
-
 /* static variables and functions */
 static int mobile_node = 0;
 static int do_dump;
diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c
index bde07d0d9f..468eb99b23 100644
--- a/usr.sbin/setkey/setkey.c
+++ b/usr.sbin/setkey/setkey.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/usr.sbin/setkey/setkey.c,v 1.1.2.3 2003/04/26 23:53:54 sumikawa Exp $	*/
-/*	$DragonFly: src/usr.sbin/setkey/setkey.c,v 1.6 2005/12/05 02:40:28 swildner Exp $	*/
 /*	$KAME: setkey.c,v 1.18 2001/05/08 04:36:39 itojun Exp $	*/
 
 /*
@@ -55,7 +54,6 @@
 #include "libpfkey.h"
 
 void Usage(void);
-int main(int, char **);
 int get_supported(void);
 void sendkeyshort(u_int);
 void promisc(void);
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 3aee236e72..dd50b03f46 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -296,7 +296,6 @@ struct opacket {
 u_char	packet[512];		/* last inbound (icmp) packet */
 struct opacket	*outpacket;	/* last output (udp) packet */
 
-int	main(int, char *[]);
 int	wait_for_reply(int, struct msghdr *);
 #ifdef IPSEC
 #ifdef IPSEC_POLICY_IPSEC
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 0874026e5b..5854337d9e 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -61,7 +61,6 @@ void usage(void);
 void usbdev(int f, int a, int rec);
 void usbdump(int f);
 void dumpone(char *name, int f, int addr);
-int main(int, char **);
 
 void
 usage(void)
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 49824e10b1..058884e317 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -36,7 +36,6 @@ volatile sig_atomic_t	quit = 0;
 
 void	usage(void);
 void	sighdlr(int);
-int	main(int, char *[]);
 
 void
 usage(void)
-- 
2.41.0