From: Sascha Wildner <saw@online.de>
Date: Sat, 13 Jan 2018 20:37:56 +0000 (+0100)
Subject: Add __attribute__((__noreturn__)) to various function prototypes in usr.sbin/.
X-Git-Tag: v5.3.0~475
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/fe08e20ddf9efaf51ce4fbe089d786a1989e1262

Add __attribute__((__noreturn__)) to various function prototypes in usr.sbin/.

This general cleanup is useful in various ways. It helps the compiler
optimize better and it also helps later GCCs detect better when to give
-Wimplicit-fallthrough warnings and when not.

Found-with: -Wsuggest-attribute=noreturn
---

diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index c403a84b39..b61bff2cd1 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -94,7 +94,7 @@ static void		show_today(struct user_list *, struct utmp_list *,
 			    time_t);
 static void		show_users(struct user_list *);
 static struct user_list	*update_user(struct user_list *, char *, time_t);
-static void		usage(void);
+static void		usage(void) __dead2;
 
 /*
  * open wtmp or die
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index bc2074596e..025239a9e4 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -75,7 +75,7 @@ static void print_entry(struct sockaddr_dl *sdl,
 static void nuke_entry(struct sockaddr_dl *sdl,
 	struct sockaddr_inarp *addr, struct rt_msghdr *rtm);
 static int delete(char *host, char *info);
-static void usage(void);
+static void usage(void) __dead2;
 static int set(int argc, char **argv);
 static int get(char *host);
 static int file(char *name);
diff --git a/usr.sbin/autofs/common.h b/usr.sbin/autofs/common.h
index 063d9b61f9..5cc4ec35a4 100644
--- a/usr.sbin/autofs/common.h
+++ b/usr.sbin/autofs/common.h
@@ -113,8 +113,8 @@ void	defined_parse_and_add(char *def);
 void	lesser_daemon(void);
 
 int	main_automount(int argc, char **argv);
-void	main_automountd(int argc, char **argv);
-void	main_autounmountd(int argc, char **argv);
+void	main_automountd(int argc, char **argv) __dead2;
+void	main_autounmountd(int argc, char **argv) __dead2;
 
 FILE	*auto_popen(const char *argv0, ...);
 int	auto_pclose(FILE *iop);
diff --git a/usr.sbin/btconfig/btconfig.c b/usr.sbin/btconfig/btconfig.c
index adf4ce7b7a..b1c2fb85e4 100644
--- a/usr.sbin/btconfig/btconfig.c
+++ b/usr.sbin/btconfig/btconfig.c
@@ -59,9 +59,9 @@ struct result {
 	int8_t		rssi;
 };
 
-static void badarg(const char *);
-static void badparam(const char *);
-static void usage(void);
+static void badarg(const char *) __dead2;
+static void badparam(const char *) __dead2;
+static void usage(void) __dead2;
 static int set_unit(unsigned long);
 static void config_unit(void);
 static void print_info(int);
diff --git a/usr.sbin/burncd/burncd.c b/usr.sbin/burncd/burncd.c
index 8ae4d409ad..1d882c4ee3 100644
--- a/usr.sbin/burncd/burncd.c
+++ b/usr.sbin/burncd/burncd.c
@@ -63,7 +63,7 @@ static int write_file(struct track_info *);
 static int roundup_blocks(struct track_info *);
 static void cue_ent(struct cdr_cue_entry *, int, int, int, int, int, int, int);
 static void cleanup(int);
-static void usage(void);
+static void usage(void) __dead2;
 
 int
 main(int argc, char **argv)
diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c
index a419a44df2..c077869bca 100644
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@@ -136,7 +136,7 @@ static int		 play_blocks(int blk, int len);
 static int		 run(int cmd, char *arg);
 static char		*parse(char *buf, int *cmd);
 static void		 help(void);
-static void		 usage(void);
+static void		 usage(void) __dead2;
 static char		*use_cdrom_instead(const char *);
 static const char	*strstatus(int);
 static u_int		 dbprog_discid(void);
diff --git a/usr.sbin/clog/clog.c b/usr.sbin/clog/clog.c
index 50791dac59..7f5df6050e 100644
--- a/usr.sbin/clog/clog.c
+++ b/usr.sbin/clog/clog.c
@@ -56,9 +56,9 @@
  */
 #define BUFFER_SIZE 16384
 
-static void init_log(const char *lname, size_t size);
-static void read_log(const char *lname, int optf);
-static void usage(void);
+static void init_log(const char *lname, size_t size) __dead2;
+static void read_log(const char *lname, int optf) __dead2;
+static void usage(void) __dead2;
 
 static const char *pname;
 
diff --git a/usr.sbin/dntpd/client.h b/usr.sbin/dntpd/client.h
index 1120d96b8c..5c9ae3fec9 100644
--- a/usr.sbin/dntpd/client.h
+++ b/usr.sbin/dntpd/client.h
@@ -123,7 +123,7 @@ struct server_info {
 typedef struct server_info *server_info_t;
 
 void client_init(void);
-void client_main(struct server_info **info_ary, int count);
+void client_main(struct server_info **info_ary, int count) __dead2;
 void client_poll(server_info_t info, int poll_interval, 
 		  int calc_offset_correction);
 void client_check(struct server_info **check, 
diff --git a/usr.sbin/fdcontrol/fdcontrol.c b/usr.sbin/fdcontrol/fdcontrol.c
index 7c0bb79661..fccce5a5d1 100644
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@@ -47,7 +47,7 @@ getnumber(void)
   return i;
 }
 
-static void
+__dead2 static void
 usage(void)
 {
   fprintf(stderr, "usage: fdcontrol [-d 0|1] | [-s] device-node\n");
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c
index f07d8e7e53..6c90ece19d 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy.c
+++ b/usr.sbin/ftp-proxy/ftp-proxy.c
@@ -98,10 +98,10 @@ void	client_read(struct session *);
 void	client_write(struct session *);
 int	drop_privs(void);
 void	end_session(struct session *);
-void	exit_daemon(void);
+void	exit_daemon(void) __dead2;
 int	get_line(char *, size_t *);
 void	handle_connection(const int);
-void	handle_signal(int);
+void	handle_signal(int) __dead2;
 struct session * init_session(void);
 void	logmsg(int, const char *, ...) __printflike(2, 3);
 u_int16_t parse_port(int);
@@ -112,7 +112,7 @@ void	server_read(struct session *);
 void	server_write(struct session *);
 int	allow_data_connection(struct session *s);
 const char *sock_ntop(struct sockaddr *);
-void	usage(void);
+void	usage(void) __dead2;
 
 char linebuf[MAX_LINE + 1];
 size_t linelen;
diff --git a/usr.sbin/gifconfig/gifconfig.c b/usr.sbin/gifconfig/gifconfig.c
index 9c5b18c550..5744917af1 100644
--- a/usr.sbin/gifconfig/gifconfig.c
+++ b/usr.sbin/gifconfig/gifconfig.c
@@ -127,7 +127,7 @@ static void in_status(int);
 static void in6_status(int);
 #endif
 static void ether_status(int);
-static void Perror(char *);
+static void Perror(char *) __dead2;
 static void in_getaddr(char *, int);
 #ifdef INET6
 static void in6_getaddr(char *, int);
diff --git a/usr.sbin/inetd/builtins.c b/usr.sbin/inetd/builtins.c
index b202ac4513..47bd6cf978 100644
--- a/usr.sbin/inetd/builtins.c
+++ b/usr.sbin/inetd/builtins.c
@@ -52,16 +52,16 @@
 #include "inetd.h"
 
 void		chargen_dg(int, struct servtab *);
-void		chargen_stream(int, struct servtab *);
+void		chargen_stream(int, struct servtab *) __dead2;
 void		daytime_dg(int, struct servtab *);
 void		daytime_stream(int, struct servtab *);
 void		discard_dg(int, struct servtab *);
-void		discard_stream(int, struct servtab *);
+void		discard_stream(int, struct servtab *) __dead2;
 void		echo_dg(int, struct servtab *);
-void		echo_stream(int, struct servtab *);
+void		echo_stream(int, struct servtab *) __dead2;
 static int	get_line(int, char *, int);
-void		iderror(int, int, int, const char *);
-void		ident_stream(int, struct servtab *);
+void		iderror(int, int, int, const char *) __dead2;
+void		ident_stream(int, struct servtab *) __dead2;
 void		initring(void);
 unsigned long	machtime(void);
 void		machtime_dg(int, struct servtab *);
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h
index 1c38594512..c2bbbd5197 100644
--- a/usr.sbin/lpr/common_source/lp.h
+++ b/usr.sbin/lpr/common_source/lp.h
@@ -263,7 +263,7 @@ void	 delay(int _millisec);
 void	 displayq(struct printer *_pp, int _format);
 void	 dump(const char *_nfile, const char *_datafile, int _copies);
 void	 fatal(const struct printer *_pp, const char *_msg, ...)
-	    __printflike(2, 3);
+	    __dead2 __printflike(2, 3);
 int	 firstprinter(struct printer *_pp, int *_error);
 void	 free_printer(struct printer *_pp);
 void	 free_request(struct request *_rp);
@@ -288,7 +288,7 @@ const
 char	*pcaperr(int _error);
 void	 prank(int _n);
 void	 process(const struct printer *_pp, char *_file);
-void	 rmjob(const char *_printer);
+void	 rmjob(const char *_printer) __dead2;
 void	 rmremote(const struct printer *_pp);
 void	 setprintcap(char *_newfile);
 int	 set_qstate(int _action, const char *_lfname);
diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h
index 8d88ee9c70..a68f3d870f 100644
--- a/usr.sbin/lpr/lpc/extern.h
+++ b/usr.sbin/lpr/lpc/extern.h
@@ -30,7 +30,6 @@
  *      @(#)extern.h	8.1 (Berkeley) 6/6/93
  *
  * $FreeBSD: src/usr.sbin/lpr/lpc/extern.h,v 1.3.6.8 2002/07/26 03:12:07 gad Exp $
- * $DragonFly: src/usr.sbin/lpr/lpc/extern.h,v 1.2 2003/06/17 04:29:56 dillon Exp $
  */
 
 
@@ -56,7 +55,7 @@ void	 generic(void (*_specificrtn)(struct printer *_pp), int _cmdopts,
 	    void (*_initcmd)(int _argc, char *_argv[]),
 	    int _argc, char *_argv[]);
 void	 help(int _argc, char *_argv[]);
-void	 quit(int _argc, char *_argv[]);
+void	 quit(int _argc, char *_argv[]) __dead2;
 void	 restart_q(struct printer *_pp);
 void	 setstatus_gi(int _argc, char *_argv[]);
 void	 setstatus_q(struct printer *_pp);
diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h
index b574fd3496..c51221dd0b 100644
--- a/usr.sbin/lpr/lpd/extern.h
+++ b/usr.sbin/lpr/lpd/extern.h
@@ -39,8 +39,8 @@ struct	printer;
 struct termios;
 
 __BEGIN_DECLS
-void	 printjob(struct printer *_pp);
-void	 startprinting(const char *_printer);
+void	 printjob(struct printer *_pp) __dead2;
+void	 startprinting(const char *_printer) __dead2;
 void	 recvjob(const char *_printer);
 int	 msearch(char *_str, struct termios *_ip);
 __END_DECLS
diff --git a/usr.sbin/mld6query/mld6query.c b/usr.sbin/mld6query/mld6query.c
index 4a6ad5f7de..bbc0160d5b 100644
--- a/usr.sbin/mld6query/mld6query.c
+++ b/usr.sbin/mld6query/mld6query.c
@@ -64,9 +64,9 @@ static int s;
 #define QUERY_RESPONSE_INTERVAL 10000
 
 static void make_msg(int, struct in6_addr *, u_int);
-static void usage(void);
+static void usage(void) __dead2;
 static void dump(int);
-static void quit(int);
+static void quit(int) __dead2;
 
 int
 main(int argc, char *argv[])
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index eeb528b01b..814c348c69 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -326,7 +326,7 @@ int			mtrace_callback(int, u_char *, int, struct igmp *,
 int			send_recv(u_int32 dst, int type, int code,
 					int tries, struct resp_buf *save,
 					callback_t callback);
-void			passive_mode(void);
+void			passive_mode(void) __dead2;
 char *			print_host(u_int32 addr);
 char *			print_host2(u_int32 addr1, u_int32 addr2);
 void			print_trace(int idx, struct resp_buf *buf,
diff --git a/usr.sbin/ndiscvt/inf-token.l b/usr.sbin/ndiscvt/inf-token.l
index a82e707d46..3967f635b3 100644
--- a/usr.sbin/ndiscvt/inf-token.l
+++ b/usr.sbin/ndiscvt/inf-token.l
@@ -43,7 +43,7 @@
 
 int lineno = 1;
 
-void yyerror(const char *);
+void yyerror(const char *) __dead2;
 
 static void
 update_lineno(const char *cp)
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index f7515d45d7..4d8a778d02 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -135,7 +135,7 @@ static struct in6_nbrinfo *getnbrinfo(struct in6_addr *addr,
 					   int ifindex, int);
 static char *ether_str(struct sockaddr_dl *);
 int ndp_ether_aton(char *, u_char *);
-void usage(void);
+void usage(void) __dead2;
 int rtmsg(int);
 void ifinfo(int, char **);
 void rtrlist(void);
diff --git a/usr.sbin/pfctl/pfctl.c b/usr.sbin/pfctl/pfctl.c
index 37fa0b1de6..5e5b6f2890 100644
--- a/usr.sbin/pfctl/pfctl.c
+++ b/usr.sbin/pfctl/pfctl.c
@@ -58,7 +58,7 @@
 #include "pfctl_parser.h"
 #include "pfctl.h"
 
-void	 usage(void);
+void	 usage(void) __dead2;
 int	 pfctl_enable(int, int);
 int	 pfctl_disable(int, int);
 int	 pfctl_clear_stats(int, int);
diff --git a/usr.sbin/pflogd/pflogd.c b/usr.sbin/pflogd/pflogd.c
index f6f35f6817..bb496c69ff 100644
--- a/usr.sbin/pflogd/pflogd.c
+++ b/usr.sbin/pflogd/pflogd.c
@@ -91,7 +91,7 @@ void  sig_alrm(int);
 void  sig_usr1(int);
 void  sig_close(int);
 void  sig_hup(int);
-void  usage(void);
+void  usage(void) __dead2;
 
 static int try_reset_dump(int);
 
diff --git a/usr.sbin/ppp/main.h b/usr.sbin/ppp/main.h
index 7bc8c7f26b..624d0c5a91 100644
--- a/usr.sbin/ppp/main.h
+++ b/usr.sbin/ppp/main.h
@@ -26,8 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/main.h,v 1.11.2.1 2001/06/13 21:56:36 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/main.h,v 1.2 2003/06/17 04:30:00 dillon Exp $
  */
 
 extern void Cleanup(void);
-extern void AbortProgram(int);
+extern void AbortProgram(int) __dead2;
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index 613b6f9fa9..4469d7c077 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -29,7 +29,6 @@
  * @(#) Copyright (c) 1991, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94
  * $FreeBSD: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.51 2005/06/15 10:13:04 dd Exp $
- * $DragonFly: src/usr.sbin/pwd_mkdb/pwd_mkdb.c,v 1.5 2005/12/05 02:40:27 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -76,7 +75,7 @@ static int is_comment;	/* flag for comments */
 static char line[LINE_MAX];
 
 void	cleanup(void);
-void	error(const char *);
+void	error(const char *) __dead2;
 void	cp(char *, char *, mode_t mode);
 void	mv(char *, char *);
 int	scan(FILE *, struct passwd *);
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index c5015b393f..4379e4d8ce 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -221,7 +221,7 @@ static void ifdump(int);
 static void ifdump0(FILE *, const struct ifc *);
 static void rtdump(int);
 static void rt_entry(struct rt_msghdr *, int);
-static void rtdexit(void);
+static void rtdexit(void) __dead2;
 static void riprequest(struct ifc *, struct netinfo6 *, int,
 	struct sockaddr_in6 *);
 static void ripflush(struct ifc *, struct sockaddr_in6 *);
@@ -243,7 +243,7 @@ static struct ifac *ifa_match(const struct ifc *, const struct in6_addr *, int);
 static struct in6_addr *plen2mask(int);
 static struct riprt *rtsearch(struct netinfo6 *, struct riprt **);
 static int ripinterval(int);
-static void fatal(const char *, ...) __printflike(1, 2);
+static void fatal(const char *, ...) __dead2 __printflike(1, 2);
 static void trace(int, const char *, ...) __printflike(2, 3);
 static void tracet(int, const char *, ...) __printflike(2, 3);
 static struct ifc *ifc_find(char *);
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index 78c8888917..e3f884be46 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -31,7 +31,6 @@
  *
  * $NetBSD: lockd.c,v 1.7 2000/08/12 18:08:44 thorpej Exp $
  * $FreeBSD: src/usr.sbin/rpc.lockd/lockd.c,v 1.6 2001/03/19 12:50:09 alfred Exp $
- * $DragonFly: src/usr.sbin/rpc.lockd/lockd.c,v 1.5 2005/11/25 00:32:49 swildner Exp $
  */
 
 /*
@@ -84,9 +83,9 @@ void	nlm_prog_0(struct svc_req *, SVCXPRT *);
 void	nlm_prog_1(struct svc_req *, SVCXPRT *);
 void	nlm_prog_3(struct svc_req *, SVCXPRT *);
 void	nlm_prog_4(struct svc_req *, SVCXPRT *);
-void	out_of_mem(void);
+void	out_of_mem(void) __dead2;
 
-static void	usage(void);
+static void	usage(void) __dead2;
 
 void	sigalarm_handler(void);
 
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_main.c b/usr.sbin/rpc.ypupdated/ypupdated_main.c
index 131706d897..0842d56bf1 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@@ -174,7 +174,7 @@ reaper(int sig)
 	}
 }
 
-void
+__dead2 void
 usage(void)
 {
 	fprintf(stderr, "rpc.ypupdatedd [-p path]\n");
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
index 7da9e1556a..8bfa10b4d9 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@@ -182,7 +182,7 @@ reaper(int sig)
 	return;
 }
 
-void
+__dead2 void
 usage(void)
 {
 	fprintf(stderr, "usage: rpc.ypxfrd [-p path]\n");
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index d434fe9737..525420ee45 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -112,9 +112,9 @@ void *rpcbproc_taddr2uaddr_com(void *, struct svc_req *, SVCXPRT *,
 int create_rmtcall_fd(struct netconfig *);
 void rpcbproc_callit_com(struct svc_req *, SVCXPRT *, rpcvers_t,
 			      rpcvers_t);
-void my_svc_run(void);
+void my_svc_run(void) __dead2;
 
-void rpcbind_abort(void);
+void rpcbind_abort(void) __dead2;
 void reap(int);
 void toggle_verboselog(int);
 
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index ba083504d0..90cd09929b 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -142,11 +142,11 @@ static int	 configure(int);
 static void	 getboottime(void);
 static void	 send_host_information(void);
 static void	 hup(int);
-static void	 quit(const char *, int);
+static void	 quit(const char *, int) __dead2;
 static void	 rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
 static int	 verify(char *, int);
 static void	 handleread(int);
-static void	 usage(void);
+static void	 usage(void) __dead2;
 static void	 timeadd(struct timeval *, time_t, struct timeval *);
 
 #ifdef DEBUG
diff --git a/usr.sbin/sensorsd/sensorsd.c b/usr.sbin/sensorsd/sensorsd.c
index 898d8ef0d8..095ba1da42 100644
--- a/usr.sbin/sensorsd/sensorsd.c
+++ b/usr.sbin/sensorsd/sensorsd.c
@@ -74,7 +74,7 @@ struct sdlim_t {
 	TAILQ_HEAD(, limits_t)	limits;
 };
 
-static void		 usage(void);
+static void		 usage(void) __dead2;
 static void		 create(void);
 static struct sdlim_t	*create_sdlim(struct sensordev *);
 static void		 destroy_sdlim(struct sdlim_t *);
diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c
index 468eb99b23..55e3445cb3 100644
--- a/usr.sbin/setkey/setkey.c
+++ b/usr.sbin/setkey/setkey.c
@@ -53,10 +53,10 @@
 
 #include "libpfkey.h"
 
-void Usage(void);
+void Usage(void) __dead2;
 int get_supported(void);
 void sendkeyshort(u_int);
-void promisc(void);
+void promisc(void) __dead2;
 int sendkeymsg(void);
 int postproc(struct sadb_msg *, int);
 const char *numstr(int);
diff --git a/usr.sbin/setkey/token.l b/usr.sbin/setkey/token.l
index ede478a251..1b9ed72bda 100644
--- a/usr.sbin/setkey/token.l
+++ b/usr.sbin/setkey/token.l
@@ -75,7 +75,7 @@ extern u_char m_buf[BUFSIZ];
 extern u_int m_len;
 extern int f_debug;
 
-void yyfatal(const char *s);
+void yyfatal(const char *s) __dead2;
 void yyerror(const char *s);
 extern void parse_init(void);
 int parse(FILE **);
diff --git a/usr.sbin/sysvipcd/sysvipcd.c b/usr.sbin/sysvipcd/sysvipcd.c
index 19620d2263..64291e9b39 100644
--- a/usr.sbin/sysvipcd/sysvipcd.c
+++ b/usr.sbin/sysvipcd/sysvipcd.c
@@ -45,7 +45,7 @@
 
 #define MAX_CLIENTS	256
 
-void usage(void);
+void usage(void) __dead2;
 
 
 struct pollfd poll_fds[MAX_CLIENTS];
diff --git a/usr.sbin/timed/timed/extern.h b/usr.sbin/timed/timed/extern.h
index 6abf3fbe40..42e70f0a16 100644
--- a/usr.sbin/timed/timed/extern.h
+++ b/usr.sbin/timed/timed/extern.h
@@ -61,7 +61,7 @@ void	 ignoreack(void);
 int	 in_cksum(u_short *, int);
 void	 lookformaster(struct netinfo *);
 void	 makeslave(struct netinfo *);
-void	 master(void);
+void	 master(void) __dead2;
 void	 masterack(void);
 void	 masterup(struct netinfo *);
 int	 measure(u_long, u_long, char *, struct sockaddr_in *, int);
@@ -73,7 +73,7 @@ void	 print(struct tsp *, struct sockaddr_in *);
 void	 prthp(clock_t);
 void	 rmnetmachs(struct netinfo *);
 void	 setstatus(void);
-void	 slave(void);
+void	 slave(void) __dead2;
 void	 slaveack(void);
 void	 spreadtime(void);
 void	 suppress(struct sockaddr_in *, char *, struct netinfo *);
diff --git a/usr.sbin/timed/timedc/extern.h b/usr.sbin/timed/timedc/extern.h
index 7d90e3ec67..1a463c0f59 100644
--- a/usr.sbin/timed/timedc/extern.h
+++ b/usr.sbin/timed/timedc/extern.h
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
- * $DragonFly: src/usr.sbin/timed/timedc/extern.h,v 1.3 2003/11/03 19:31:43 eirikn Exp $
  */
 
 #if __STDC__
@@ -40,10 +39,10 @@ void	bytehostorder(struct tsp *);
 void	bytenetorder(struct tsp *);
 void	clockdiff(int, char *[]);
 void	help(int, char *[]);
-void	intr(int);
+void	intr(int) __dead2;
 void	makeargv(void);
 void	msite(int, char *[]);
 int	priv_resources(void);
-void	quit(void);
+void	quit(void) __dead2;
 void	testing(int, char *[]);
 void	tracing(int, char *[]);
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index be5497d15e..ca74ae409a 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -287,7 +287,7 @@ static const char *pr_type(u_int8_t);
 static void print(u_char *, int, struct sockaddr_in *);
 static char *inetname(struct in_addr);
 static u_short in_cksum(u_short *, int);
-static void usage(void);
+static void usage(void) __dead2;
 
 static int s;			/* receive (icmp) socket file descriptor */
 static int sndsock;		/* send (udp) socket file descriptor */
diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 24c6e236e1..86ee12c513 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -309,7 +309,7 @@ static char	*pr_type(int);
 static int	packet_ok(struct msghdr *, int, int);
 static void	print(struct msghdr *, int);
 static const char *inetname(struct sockaddr *);
-static void	usage(void);
+static void	usage(void) __dead2;
 
 static int rcvsock;		/* receive (icmp) socket file descriptor */
 static int sndsock;		/* send (udp) socket file descriptor */
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index 1722c39a98..b661d54716 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -34,7 +34,7 @@
 
 static volatile sig_atomic_t	quit = 0;
 
-static void	usage(void);
+static void	usage(void) __dead2;
 static void	sighdlr(int);
 
 static void
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index ec9d3d65ac..054f1003de 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -27,7 +27,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ypbind/ypbind.c,v 1.40 2004/10/17 19:33:33 stefanf Exp $
- * $DragonFly: src/usr.sbin/ypbind/ypbind.c,v 1.6 2005/11/24 22:23:02 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -101,7 +100,7 @@ int	ping(struct _dom_binding *);
 int	tell_parent(char *, struct sockaddr_in *);
 void	handle_children(struct _dom_binding *);
 void	reaper(int);
-void	terminate(int);
+void	terminate(int) __dead2;
 void	yp_restricted_mode(char *);
 int	verify(struct in_addr);