commit 06a84967b7187a4cef7193969de3b17b14d26567
from: Omar Polo <op@omarpolo.com>
date: Thu Jul 22 12:31:07 2021 UTC

__dead -> ATTR_DEAD

commit - 805e39bf9727c783edd6ade3b3d2cc6259023d8e
commit + 06a84967b7187a4cef7193969de3b17b14d26567
blob - a667f8059a426d01cbf9b232436418e8945da1f3
blob + 27bc3cc81a27920c4590db8e31e17caed8c226fe
--- client.c
+++ client.c
@@ -31,7 +31,7 @@
 
 static struct imsgev	*iev_listener;
 
-static __dead void	client_shutdown(void);
+static ATTR_DEAD void	client_shutdown(void);
 static void		client_sig_handler(int, short, void *);
 static void		client_dispatch_listener(int, short, void *);
 static void		client_privdrop(const char *, const char *);
@@ -39,7 +39,7 @@ static void		client_privdrop(const char *, const char 
 static int		client_imsg_compose_listener(int, uint32_t,
     const void *, uint16_t);
 
-__dead void
+ATTR_DEAD void
 client(int debug, int verbose)
 {
 	struct event	ev_sigint, ev_sigterm;
@@ -77,12 +77,11 @@ client(int debug, int verbose)
 	    iev_listener->events, iev_listener->handler, iev_listener);
 	event_add(&iev_listener->ev, NULL);
 
-	log_debug("before dispatch");
 	event_dispatch();
 	client_shutdown();
 }
 
-static __dead void
+static ATTR_DEAD void
 client_shutdown(void)
 {
 	msgbuf_clear(&iev_listener->ibuf.w);
@@ -148,7 +147,6 @@ client_dispatch_listener(int fd, short event, void *d)
 		if (n == 0)	/* No more messages. */
 			break;
 
-		log_debug("client: got message type %d", imsg.hdr.type);
 		switch (imsg.hdr.type) {
 		case IMSG_AUTH:
 			if (auth)
blob - a007ec7f0ca02d97660866c9201bfe28e6af56a4
blob + 0a10a24169946548cf6ca7e97a13b97c01194d2c
--- client.h
+++ client.h
@@ -19,6 +19,6 @@
 
 #include "compat.h"
 
-__dead void	client(int, int);
+ATTR_DEAD void	client(int, int);
 
 #endif
blob - 5d773704b501c11792309f61888facf29fb63cf1
blob + 52032c7cdc8dbff8bb0095e852aa6a5f8e1d9b40
--- compat.h
+++ compat.h
@@ -26,6 +26,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#define ATTR_DEAD __attribute__((noreturn))
+
 #ifdef HAVE_QUEUE_H
 # include <sys/queue.h>
 #else
blob - e6fc64817d33ec6dfb448540ad0c05c9151903bd
blob + 9839f928ed6bdd448deb77eafaab5b1043f97eb9
--- kamictl.c
+++ kamictl.c
@@ -28,11 +28,11 @@
 #include "kamid.h"
 #include "log.h"
 
-__dead void	 usage(void);
+ATTR_DEAD void	 usage(void);
 
 struct imsgbuf	*ibuf;
 
-__dead void
+ATTR_DEAD void
 usage(void)
 {
 	/*
blob - fe394808955b6c3901b3fdf11aaa08dc44c72ff3
blob + 67201e8f435c4a382aeba1763092954a8249178b
--- kamid.c
+++ kamid.c
@@ -52,14 +52,14 @@ const char	*saved_argv0;
 static int	 debug, nflag;
 int		 verbose;
 
-__dead void	usage(void);
+ATTR_DEAD void	usage(void);
 
 void		main_sig_handler(int, short, void *);
 void		main_dispatch_listener(int, short, void *);
 int		main_reload(void);
 int		main_imsg_send_config(struct kd_conf *);
 void		main_dispatch_listener(int, short, void *);
-__dead void	main_shutdown(void);
+ATTR_DEAD void	main_shutdown(void);
 
 static pid_t	start_child(enum kd_process, int, int, int);
 
@@ -69,7 +69,7 @@ const char		*conffile;
 pid_t			 listener_pid;
 uint32_t		 cmd_opts;
 
-__dead void
+ATTR_DEAD void
 usage(void)
 {
 	fprintf(stderr, "usage: %s [-dnv] [-f file] [-s socket]\n",
@@ -448,7 +448,7 @@ config_clear(struct kd_conf *conf)
 	free(conf);
 }
 
-__dead void
+ATTR_DEAD void
 main_shutdown(void)
 {
 	pid_t	pid;
blob - 500d70bd7cd5fa5512a5c46bc2f4fe39b6cc7709
blob + 2c350da805bb2956f33d0960f766a8f27308135d
--- listener.c
+++ listener.c
@@ -46,7 +46,7 @@ static struct kd_conf	*listener_conf;
 static struct imsgev	*iev_main;
 
 static void	listener_sig_handler(int, short, void *);
-__dead void	listener_shutdown(void);
+ATTR_DEAD void	listener_shutdown(void);
 
 SPLAY_HEAD(clients_tree_id, client) clients;
 
@@ -166,7 +166,7 @@ listener(int debug, int verbose)
 	listener_shutdown();
 }
 
-__dead void
+ATTR_DEAD void
 listener_shutdown(void)
 {
 	msgbuf_clear(&iev_main->ibuf.w);
blob - 408dec92e050085f6a48c675e9cb0dde00869cd4
blob + 0a03c597790b71166630fed098b600408a042624
--- log.h
+++ log.h
@@ -17,8 +17,7 @@
 #ifndef LOG_H
 #define LOG_H
 
-#include <stdarg.h>
-#include <sys/cdefs.h>
+#include "compat.h"
 
 void	log_init(int, int);
 void	log_procinit(const char *);
@@ -36,9 +35,9 @@ void	logit(int, const char *, ...)
 	    __attribute__((__format__ (printf, 2, 3)));
 void	vlog(int, const char *, va_list)
 	    __attribute__((__format__ (printf, 2, 0)));
-__dead void fatal(const char *, ...)
+ATTR_DEAD void fatal(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
-__dead void fatalx(const char *, ...)
+ATTR_DEAD void fatalx(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 
 #endif /* LOG_H */