usage() is __dead

pt out by Alexander v Gernler

5 files changed, 32 insertions, 31 deletions

diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c
index da5f6608253..aba5adb1ae3 100644
--- a/usr.sbin/bgpctl/bgpctl.c
+++ b/usr.sbin/bgpctl/bgpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpctl.c,v 1.72 2004/12/23 17:55:59 henning Exp $ */
+/*	$OpenBSD: bgpctl.c,v 1.73 2005/02/02 18:52:32 henning Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -41,7 +41,7 @@ enum neighbor_views {
 	NV_TIMERS
 };
 
-void		 usage(void);
+__dead void	 usage(void);
 int		 main(int, char *[]);
 char		*fmt_peer(const struct peer_config *, int);
 void		 show_summary_head(void);
@@ -70,7 +70,7 @@ int		 show_rib_summary_msg(struct imsg *);
 
 struct imsgbuf	*ibuf;
 
-void
+__dead void
 usage(void)
 {
 	extern char	*__progname;
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index f761da13ede..a238c577183 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.c,v 1.111 2004/11/23 13:07:01 claudio Exp $ */
+/*	$OpenBSD: bgpd.c,v 1.112 2005/02/02 18:52:32 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -36,14 +36,15 @@
 #include "bgpd.h"
 #include "session.h"
 
-void	sighdlr(int);
-void	usage(void);
-int	main(int, char *[]);
-int	check_child(pid_t, const char *);
-int	send_filterset(struct imsgbuf *, struct filter_set_head *, int, int);
-int	reconfigure(char *, struct bgpd_config *, struct mrt_head *,
-	    struct peer **, struct filter_head *);
-int	dispatch_imsg(struct imsgbuf *, int);
+void		sighdlr(int);
+__dead void	usage(void);
+int		main(int, char *[]);
+int		check_child(pid_t, const char *);
+int		send_filterset(struct imsgbuf *, struct filter_set_head *,
+		    int, int);
+int		reconfigure(char *, struct bgpd_config *, struct mrt_head *,
+		    struct peer **, struct filter_head *);
+int		dispatch_imsg(struct imsgbuf *, int);
 
 int			 rfd = -1;
 volatile sig_atomic_t	 mrtdump = 0;
@@ -74,7 +75,7 @@ sighdlr(int sig)
 	}
 }
 
-void
+__dead void
 usage(void)
 {
 	extern char *__progname;
diff --git a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c
index 086f0883db3..355ae70271c 100644
--- a/usr.sbin/ntpd/ntpd.c
+++ b/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.28 2005/01/28 12:32:24 henning Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.29 2005/02/02 18:52:32 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -33,13 +33,13 @@
 
 #include "ntpd.h"
 
-void	sighdlr(int);
-void	usage(void);
-int	main(int, char *[]);
-int	check_child(pid_t, const char *);
-int	dispatch_imsg(struct ntpd_conf *);
-void	ntpd_adjtime(double);
-void	ntpd_settime(double);
+void		sighdlr(int);
+__dead void	usage(void);
+int		main(int, char *[]);
+int		check_child(pid_t, const char *);
+int		dispatch_imsg(struct ntpd_conf *);
+void		ntpd_adjtime(double);
+void		ntpd_settime(double);
 
 volatile sig_atomic_t	 quit = 0;
 volatile sig_atomic_t	 reconfig = 0;
@@ -63,7 +63,7 @@ sighdlr(int sig)
 	}
 }
 
-void
+__dead void
 usage(void)
 {
 	extern char *__progname;
diff --git a/usr.sbin/ospfctl/ospfctl.c b/usr.sbin/ospfctl/ospfctl.c
index 5120d50ef6c..a6281450315 100644
--- a/usr.sbin/ospfctl/ospfctl.c
+++ b/usr.sbin/ospfctl/ospfctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfctl.c,v 1.2 2005/01/28 17:26:05 norby Exp $ */
+/*	$OpenBSD: ospfctl.c,v 1.3 2005/02/02 18:52:32 henning Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -36,7 +36,7 @@
 #include "parser.h"
 #include "log.h"
 
-void		 usage(void);
+__dead void	 usage(void);
 int		 show_summary_msg(struct imsg *, int);
 int		 show_interface_msg(struct imsg *);
 void		 print_baudrate(u_long);
@@ -57,7 +57,7 @@ int		 show_nbr_detail_msg(struct imsg *);
 
 struct imsgbuf	*ibuf;
 
-void
+__dead void
 usage(void)
 {
 	extern char *__progname;
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 4cc48854ad8..9e5d8feba44 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.c,v 1.2 2005/01/28 17:53:33 norby Exp $ */
+/*	$OpenBSD: ospfd.c,v 1.3 2005/02/02 18:52:32 henning Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -45,10 +45,10 @@
 #include "log.h"
 #include "rde.h"
 
-void	main_sig_handler(int, short, void *);
-void	usage(void);
-void	ospfd_shutdown(void);
-int	check_child(pid_t, const char *);
+void		main_sig_handler(int, short, void *);
+__dead void	usage(void);
+void		ospfd_shutdown(void);
+int		check_child(pid_t, const char *);
 
 void	main_dispatch_ospfe(int, short, void *);
 void	main_dispatch_rde(int, short, void *);
@@ -102,7 +102,7 @@ main_sig_handler(int sig, short event, void *arg)
 	}
 }
 
-void
+__dead void
 usage(void)
 {
 	extern char *__progname;