Delete obsolete /* ARGSUSED */ lint comments.

ok miod@ millert@

85 files changed, 85 insertions, 251 deletions

diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 06fa3796d2e..a41a1632485 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmd.c,v 1.110 2022/12/04 23:50:50 cheloha Exp $	*/
+/*	$OpenBSD: apmd.c,v 1.111 2023/03/08 04:43:13 guenther Exp $	*/
 
 /*
  *  Copyright (c) 1995, 1996 John T. Kohl
@@ -75,7 +75,6 @@ void do_etc_file(const char *file);
 void error(const char *fmt, const char *arg);
 void set_driver_messages(int fd, int mode);
 
-/* ARGSUSED */
 void
 sigexit(int signo)
 {
diff --git a/usr.sbin/dvmrpd/control.c b/usr.sbin/dvmrpd/control.c
index 3bc6db24c62..08516168db6 100644
--- a/usr.sbin/dvmrpd/control.c
+++ b/usr.sbin/dvmrpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.24 2021/01/19 12:23:30 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.25 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -116,7 +116,6 @@ control_cleanup(void)
 	unlink(DVMRPD_SOCKET);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -214,7 +213,6 @@ control_close(int fd)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/eeprom/ophandlers.c b/usr.sbin/eeprom/ophandlers.c
index 11b915176f6..d94b6e5af7b 100644
--- a/usr.sbin/eeprom/ophandlers.c
+++ b/usr.sbin/eeprom/ophandlers.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ophandlers.c,v 1.17 2022/01/12 22:49:53 tb Exp $	*/
+/*	$OpenBSD: ophandlers.c,v 1.18 2023/03/08 04:43:13 guenther Exp $	*/
 /*	$NetBSD: ophandlers.c,v 1.2 1996/02/28 01:13:30 thorpej Exp $	*/
 
 /*-
@@ -158,7 +158,6 @@ op_handler(char *keyword, char *arg)
 	return (NULL);
 }
 
-/* ARGSUSED */
 static void
 op_notsupp(struct extabent *exent, struct opiocdesc *opiop, char *arg)
 {
diff --git a/usr.sbin/eigrpd/control.c b/usr.sbin/eigrpd/control.c
index 14e955df809..c825a4e5c3a 100644
--- a/usr.sbin/eigrpd/control.c
+++ b/usr.sbin/eigrpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.9 2021/01/19 10:37:25 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.10 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -108,7 +108,6 @@ control_listen(void)
 	return (0);
 }
 
-/* ARGSUSED */
 static void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -206,7 +205,6 @@ control_close(int fd)
 	free(c);
 }
 
-/* ARGSUSED */
 static void
 control_dispatch_imsg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/eigrpd/eigrpd.c b/usr.sbin/eigrpd/eigrpd.c
index 648a4464f21..db169455c45 100644
--- a/usr.sbin/eigrpd/eigrpd.c
+++ b/usr.sbin/eigrpd/eigrpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eigrpd.c,v 1.28 2021/01/19 10:53:25 claudio Exp $ */
+/*	$OpenBSD: eigrpd.c,v 1.29 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -61,7 +61,6 @@ static struct imsgev	*iev_rde;
 static pid_t		 eigrpe_pid;
 static pid_t		 rde_pid;
 
-/* ARGSUSED */
 static void
 main_sig_handler(int sig, short event, void *arg)
 {
@@ -362,7 +361,6 @@ start_child(enum eigrpd_process p, char *argv0, int fd, int debug, int verbose,
 }
 
 /* imsg handling */
-/* ARGSUSED */
 static void
 main_dispatch_eigrpe(int fd, short event, void *bula)
 {
@@ -439,7 +437,6 @@ main_dispatch_eigrpe(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 main_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/eigrpd/eigrpe.c b/usr.sbin/eigrpd/eigrpe.c
index 59d2a5c1b7d..ad5495df994 100644
--- a/usr.sbin/eigrpd/eigrpe.c
+++ b/usr.sbin/eigrpd/eigrpe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eigrpe.c,v 1.39 2021/01/19 10:53:25 claudio Exp $ */
+/*	$OpenBSD: eigrpe.c,v 1.40 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -49,7 +49,6 @@ static struct event	 ev6;
 static struct imsgev	*iev_main;
 static struct imsgev	*iev_rde;
 
-/* ARGSUSED */
 static void
 eigrpe_sig_handler(int sig, short event, void *bula)
 {
@@ -211,7 +210,6 @@ eigrpe_imsg_compose_rde(int type, uint32_t peerid, pid_t pid,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 static void
 eigrpe_dispatch_main(int fd, short event, void *bula)
 {
@@ -386,7 +384,6 @@ eigrpe_dispatch_main(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 eigrpe_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/eigrpd/interface.c b/usr.sbin/eigrpd/interface.c
index 438805e2edd..d395fc3a26c 100644
--- a/usr.sbin/eigrpd/interface.c
+++ b/usr.sbin/eigrpd/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.25 2019/06/28 13:32:47 deraadt Exp $ */
+/*	$OpenBSD: interface.c,v 1.26 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -435,7 +435,6 @@ eigrp_if_reset(struct eigrp_iface *ei)
 }
 
 /* timers */
-/* ARGSUSED */
 static void
 eigrp_if_hello_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/eigrpd/kroute.c b/usr.sbin/eigrpd/kroute.c
index 23eb6edbb8e..6dc041cd88e 100644
--- a/usr.sbin/eigrpd/kroute.c
+++ b/usr.sbin/eigrpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.19 2022/12/28 21:30:16 jmc Exp $ */
+/*	$OpenBSD: kroute.c,v 1.20 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -318,7 +318,6 @@ kr_fib_decouple(void)
 	log_info("kernel routing table decoupled");
 }
 
-/* ARGSUSED */
 static void
 kr_dispatch_msg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/eigrpd/neighbor.c b/usr.sbin/eigrpd/neighbor.c
index 2519273d2f3..711f0f8a15f 100644
--- a/usr.sbin/eigrpd/neighbor.c
+++ b/usr.sbin/eigrpd/neighbor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: neighbor.c,v 1.10 2016/09/02 16:44:33 renato Exp $ */
+/*	$OpenBSD: neighbor.c,v 1.11 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -232,7 +232,6 @@ nbr_clear_ctl(struct ctl_nbr *nctl)
 
 /* timers */
 
-/* ARGSUSED */
 static void
 nbr_timeout(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/eigrpd/rde.c b/usr.sbin/eigrpd/rde.c
index 0ee64719dd0..b14d967ba2d 100644
--- a/usr.sbin/eigrpd/rde.c
+++ b/usr.sbin/eigrpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.24 2021/01/19 10:53:25 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.25 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -50,7 +50,6 @@ struct eigrpd_conf	*rdeconf;
 static struct imsgev	*iev_eigrpe;
 static struct imsgev	*iev_main;
 
-/* ARGSUSED */
 static void
 rde_sig_handler(int sig, short event, void *arg)
 {
@@ -161,7 +160,6 @@ rde_imsg_compose_eigrpe(int type, uint32_t peerid, pid_t pid, void *data,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 static void
 rde_dispatch_imsg(int fd, short event, void *bula)
 {
@@ -295,7 +293,6 @@ rde_dispatch_imsg(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 rde_dispatch_parent(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/eigrpd/rde_dual.c b/usr.sbin/eigrpd/rde_dual.c
index 4b965bc5349..e12bf382f28 100644
--- a/usr.sbin/eigrpd/rde_dual.c
+++ b/usr.sbin/eigrpd/rde_dual.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_dual.c,v 1.30 2022/12/28 21:30:16 jmc Exp $ */
+/*	$OpenBSD: rde_dual.c,v 1.31 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -483,7 +483,6 @@ reply_outstanding_remove(struct reply_node *reply)
 	free(reply);
 }
 
-/* ARGSUSED */
 static void
 reply_active_timer(int fd, short event, void *arg)
 {
@@ -516,7 +515,6 @@ reply_active_stop_timer(struct reply_node *reply)
 		fatal("reply_active_stop_timer");
 }
 
-/* ARGSUSED */
 static void
 reply_sia_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/eigrpd/rtp.c b/usr.sbin/eigrpd/rtp.c
index 3a62ee9f4e0..cdc446b82a8 100644
--- a/usr.sbin/eigrpd/rtp.c
+++ b/usr.sbin/eigrpd/rtp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtp.c,v 1.7 2016/09/02 16:44:33 renato Exp $ */
+/*	$OpenBSD: rtp.c,v 1.8 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015 Renato Westphal <renato@openbsd.org>
@@ -248,7 +248,6 @@ rtp_send_ack(struct nbr *nbr)
 
 /* timers */
 
-/* ARGSUSED */
 static void
 rtp_retrans_timer(int fd, short event, void *arg)
 {
@@ -286,7 +285,6 @@ rtp_retrans_stop_timer(struct packet *pkt)
 		fatal("rtp_retrans_stop_timer");
 }
 
-/* ARGSUSED */
 void
 rtp_ack_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/hostapd/hostapd.c b/usr.sbin/hostapd/hostapd.c
index 0371693d013..b4982b8c040 100644
--- a/usr.sbin/hostapd/hostapd.c
+++ b/usr.sbin/hostapd/hostapd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hostapd.c,v 1.41 2019/07/03 03:24:03 deraadt Exp $	*/
+/*	$OpenBSD: hostapd.c,v 1.42 2023/03/08 04:43:13 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -291,7 +291,6 @@ hostapd_udp_init(struct hostapd_config *cfg)
 	}
 }
 
-/* ARGSUSED */
 void
 hostapd_sig_handler(int sig, short event, void *arg)
 {
diff --git a/usr.sbin/hostapd/privsep.c b/usr.sbin/hostapd/privsep.c
index 83de6d8a468..cc7d935bb70 100644
--- a/usr.sbin/hostapd/privsep.c
+++ b/usr.sbin/hostapd/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.27 2019/06/28 13:32:47 deraadt Exp $	*/
+/*	$OpenBSD: privsep.c,v 1.28 2023/03/08 04:43:13 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -456,7 +456,6 @@ hostapd_priv_roaming(struct hostapd_apme *apme, struct hostapd_node *node,
 /*
  * If priv parent gets a TERM or HUP, pass it through to child instead.
  */
-/* ARGSUSED */
 void
 hostapd_sig_relay(int sig, short event, void *arg)
 {
@@ -469,7 +468,6 @@ hostapd_sig_relay(int sig, short event, void *arg)
 	errno = oerrno;
 }
 
-/* ARGSUSED */
 void
 hostapd_sig_chld(int sig, short event, void *arg)
 {
diff --git a/usr.sbin/hotplugd/hotplugd.c b/usr.sbin/hotplugd/hotplugd.c
index df93ff77897..b5d70356697 100644
--- a/usr.sbin/hotplugd/hotplugd.c
+++ b/usr.sbin/hotplugd/hotplugd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hotplugd.c,v 1.18 2022/12/04 23:50:50 cheloha Exp $	*/
+/*	$OpenBSD: hotplugd.c,v 1.19 2023/03/08 04:43:13 guenther Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -173,7 +173,6 @@ exec_script(const char *file, int class, char *name)
 	}
 }
 
-/* ARGSUSED */
 void
 sigchild(int signum)
 {
@@ -211,7 +210,6 @@ sigchild(int signum)
 	errno = saved_errno;
 }
 
-/* ARGSUSED */
 void
 sigquit(int signum)
 {
diff --git a/usr.sbin/httpd/control.c b/usr.sbin/httpd/control.c
index d282a85a316..9a6a9b9b523 100644
--- a/usr.sbin/httpd/control.c
+++ b/usr.sbin/httpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.14 2021/04/20 21:11:56 dv Exp $	*/
+/*	$OpenBSD: control.c,v 1.15 2023/03/08 04:43:13 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -127,7 +127,6 @@ control_cleanup(struct control_sock *cs)
 	event_del(&cs->cs_evt);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *arg)
 {
@@ -214,7 +213,6 @@ control_close(int fd, struct control_sock *cs)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 0afbe0b6e76..715d039549d 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iostat.c,v 1.46 2022/12/28 20:56:37 cheloha Exp $	*/
+/*	$OpenBSD: iostat.c,v 1.47 2023/03/08 04:43:13 guenther Exp $	*/
 /*	$NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $	*/
 
 /*
@@ -214,7 +214,6 @@ sigalarm(int signo)
 {
 }
 
-/*ARGSUSED*/
 static void
 sigheader(int signo)
 {
diff --git a/usr.sbin/iscsid/control.c b/usr.sbin/iscsid/control.c
index de090ed5412..aba16ff9e35 100644
--- a/usr.sbin/iscsid/control.c
+++ b/usr.sbin/iscsid/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.10 2016/09/10 05:42:12 jsg Exp $ */
+/*	$OpenBSD: control.c,v 1.11 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -135,7 +135,6 @@ control_event_init(void)
 	evtimer_set(&control_state->evt, control_accept, NULL);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -196,7 +195,6 @@ control_close(struct control *c)
 
 static char	cbuf[CONTROL_READ_SIZE];
 
-/* ARGSUSED */
 void
 control_dispatch(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/iscsid/session.c b/usr.sbin/iscsid/session.c
index 60ff190b027..f38ab2993b6 100644
--- a/usr.sbin/iscsid/session.c
+++ b/usr.sbin/iscsid/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.8 2015/12/05 06:37:24 mmcc Exp $ */
+/*	$OpenBSD: session.c,v 1.9 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2011 Claudio Jeker <claudio@openbsd.org>
@@ -246,7 +246,6 @@ struct {
 	{ 0, 0, NULL }
 };
 
-/* ARGSUSED */
 void
 session_fsm_callback(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ldapd/control.c b/usr.sbin/ldapd/control.c
index ffeb80bf4c3..2a988e6eb4c 100644
--- a/usr.sbin/ldapd/control.c
+++ b/usr.sbin/ldapd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.17 2021/04/20 21:11:56 dv Exp $	*/
+/*	$OpenBSD: control.c,v 1.18 2023/03/08 04:43:13 guenther Exp $	*/
 
 /*
  * Copyright (c) 2010 Martin Hedenfalk <martin@bzero.se>
@@ -117,7 +117,6 @@ control_cleanup(struct control_sock *cs)
 	event_del(&cs->cs_evt);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *arg)
 {
diff --git a/usr.sbin/ldpd/adjacency.c b/usr.sbin/ldpd/adjacency.c
index 8e54b880f3f..2b4d9da9ef1 100644
--- a/usr.sbin/ldpd/adjacency.c
+++ b/usr.sbin/ldpd/adjacency.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adjacency.c,v 1.27 2019/12/12 00:10:29 yasuoka Exp $ */
+/*	$OpenBSD: adjacency.c,v 1.28 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2013, 2015 Renato Westphal <renato@openbsd.org>
@@ -156,7 +156,6 @@ adj_get_af(struct adj *adj)
 
 /* adjacency timers */
 
-/* ARGSUSED */
 static void
 adj_itimer(int fd, short event, void *arg)
 {
@@ -296,7 +295,6 @@ tnbr_update_all(int af)
 
 /* target neighbors timers */
 
-/* ARGSUSED */
 static void
 tnbr_hello_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ldpd/control.c b/usr.sbin/ldpd/control.c
index 04da144c97e..6b1518b33df 100644
--- a/usr.sbin/ldpd/control.c
+++ b/usr.sbin/ldpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.31 2021/01/19 15:14:35 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.32 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -104,7 +104,6 @@ control_cleanup(void)
 	close(control_fd);
 }
 
-/* ARGSUSED */
 static void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -189,7 +188,6 @@ control_close(int fd)
 	free(c);
 }
 
-/* ARGSUSED */
 static void
 control_dispatch_imsg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ldpd/interface.c b/usr.sbin/ldpd/interface.c
index 01324f9726a..7e4269b5e5c 100644
--- a/usr.sbin/ldpd/interface.c
+++ b/usr.sbin/ldpd/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.51 2019/06/28 13:32:48 deraadt Exp $ */
+/*	$OpenBSD: interface.c,v 1.52 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -374,7 +374,6 @@ if_update_all(int af)
 }
 
 /* timers */
-/* ARGSUSED */
 static void
 if_hello_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ldpd/kroute.c b/usr.sbin/ldpd/kroute.c
index ec550143be6..27dd7164def 100644
--- a/usr.sbin/ldpd/kroute.c
+++ b/usr.sbin/ldpd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.70 2019/06/28 13:32:48 deraadt Exp $ */
+/*	$OpenBSD: kroute.c,v 1.71 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2015, 2016 Renato Westphal <renato@openbsd.org>
@@ -437,7 +437,6 @@ kr_change_egress_label(int af, int was_implicit)
 	}
 }
 
-/* ARGSUSED */
 static void
 kr_dispatch_msg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ldpd/lde.c b/usr.sbin/ldpd/lde.c
index 58f3143bbb6..4eb4c08f75c 100644
--- a/usr.sbin/ldpd/lde.c
+++ b/usr.sbin/ldpd/lde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde.c,v 1.75 2021/01/19 15:23:25 claudio Exp $ */
+/*	$OpenBSD: lde.c,v 1.76 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -65,7 +65,6 @@ struct nbr_tree		 lde_nbrs = RB_INITIALIZER(&lde_nbrs);
 static struct imsgev	*iev_ldpe;
 static struct imsgev	*iev_main;
 
-/* ARGSUSED */
 static void
 lde_sig_handler(int sig, short event, void *arg)
 {
@@ -185,7 +184,6 @@ lde_imsg_compose_ldpe(int type, uint32_t peerid, pid_t pid, void *data,
 	     -1, data, datalen));
 }
 
-/* ARGSUSED */
 static void
 lde_dispatch_imsg(int fd, short event, void *bula)
 {
@@ -376,7 +374,6 @@ lde_dispatch_imsg(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 lde_dispatch_parent(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ldpd/lde_lib.c b/usr.sbin/ldpd/lde_lib.c
index d92b836f8fe..1b8c842fdc0 100644
--- a/usr.sbin/ldpd/lde_lib.c
+++ b/usr.sbin/ldpd/lde_lib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde_lib.c,v 1.70 2022/12/28 21:30:17 jmc Exp $ */
+/*	$OpenBSD: lde_lib.c,v 1.71 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -885,7 +885,6 @@ lde_wildcard_apply(struct map *wcard, struct fec *fec, struct lde_map *me)
 
 /* garbage collector timer: timer to remove dead entries from the LIB */
 
-/* ARGSUSED */
 void
 lde_gc_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ldpd/ldpd.c b/usr.sbin/ldpd/ldpd.c
index 2110bea566b..f9e3e66f6b8 100644
--- a/usr.sbin/ldpd/ldpd.c
+++ b/usr.sbin/ldpd/ldpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpd.c,v 1.68 2021/09/06 13:32:18 deraadt Exp $ */
+/*	$OpenBSD: ldpd.c,v 1.69 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -73,7 +73,6 @@ static struct imsgev	*iev_lde;
 static pid_t		 ldpe_pid;
 static pid_t		 lde_pid;
 
-/* ARGSUSED */
 static void
 main_sig_handler(int sig, short event, void *arg)
 {
@@ -369,7 +368,6 @@ start_child(enum ldpd_process p, char *argv0, int fd, int debug, int verbose,
 }
 
 /* imsg handling */
-/* ARGSUSED */
 static void
 main_dispatch_ldpe(int fd, short event, void *bula)
 {
@@ -450,7 +448,6 @@ main_dispatch_ldpe(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 main_dispatch_lde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ldpd/ldpe.c b/usr.sbin/ldpd/ldpe.c
index c142fe747e0..1e7fde78339 100644
--- a/usr.sbin/ldpd/ldpe.c
+++ b/usr.sbin/ldpd/ldpe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldpe.c,v 1.80 2021/01/19 15:59:25 claudio Exp $ */
+/*	$OpenBSD: ldpe.c,v 1.81 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -50,7 +50,6 @@ static struct imsgev	*iev_main;
 static struct imsgev	*iev_lde;
 static struct event	 pfkey_ev;
 
-/* ARGSUSED */
 static void
 ldpe_sig_handler(int sig, short event, void *bula)
 {
@@ -208,7 +207,6 @@ ldpe_imsg_compose_lde(int type, uint32_t peerid, pid_t pid, void *data,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 static void
 ldpe_dispatch_main(int fd, short event, void *bula)
 {
@@ -485,7 +483,6 @@ ldpe_dispatch_main(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 ldpe_dispatch_lde(int fd, short event, void *bula)
 {
@@ -619,7 +616,6 @@ ldpe_dispatch_lde(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 static void
 ldpe_dispatch_pfkey(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/mopd/common/pf.c b/usr.sbin/mopd/common/pf.c
index 7bcf73d426c..df8766d6818 100644
--- a/usr.sbin/mopd/common/pf.c
+++ b/usr.sbin/mopd/common/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.18 2018/04/26 12:42:51 guenther Exp $ */
+/*	$OpenBSD: pf.c,v 1.19 2023/03/08 04:43:13 guenther Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -63,7 +63,6 @@ extern int promisc;
  * In this case the driver can handle both Ethernet type II and
  * IEEE 802.3 frames (SNAP) in a single pfOpen.
  */
-/* ARGSUSED */
 int
 pfTrans(char *interface)
 {
@@ -73,7 +72,6 @@ pfTrans(char *interface)
 /*
  * Open and initialize packet filter.
  */
-/* ARGSUSED */
 int
 pfInit(char *interface, int mode, u_short protocol, int typ)
 {
@@ -157,7 +155,6 @@ pfInit(char *interface, int mode, u_short protocol, int typ)
 /*
  * Add a Multicast address to the interface
  */
-/* ARGSUSED */
 int
 pfAddMulti(int s, char *interface, char *addr)
 {
@@ -190,7 +187,6 @@ pfAddMulti(int s, char *interface, char *addr)
 /*
  * Delete a Multicast address from the interface
  */
-/* ARGSUSED */
 int
 pfDelMulti(int s, char *interface, char *addr)
 {
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 987b4a62d2c..f1bccdbe05b 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopchk.c,v 1.19 2021/10/24 21:24:19 deraadt Exp $	*/
+/*	$OpenBSD: mopchk.c,v 1.20 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -151,7 +151,6 @@ Usage()
 /*
  * Process incoming packages, NOT. 
  */
-/* ARGSUSED */
 void
 mopProcess(ii, pkt)
 	struct if_info *ii;
diff --git a/usr.sbin/mopd/mopd/process.c b/usr.sbin/mopd/mopd/process.c
index 1169d1d2f73..4f6216942e9 100644
--- a/usr.sbin/mopd/mopd/process.c
+++ b/usr.sbin/mopd/mopd/process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.c,v 1.24 2022/01/28 06:33:27 guenther Exp $ */
+/*	$OpenBSD: process.c,v 1.25 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -334,7 +334,6 @@ mopNextLoad(u_char *dst, u_char *src, u_char new_count, int trans)
 			warnx("pfWrite() error");
 }
 
-/* ARGSUSED */
 void
 mopProcessDL(FILE *fd, struct if_info *ii, u_char *pkt, int *idx, u_char *dst,
     u_char *src, int trans, u_short len)
@@ -462,7 +461,6 @@ mopProcessDL(FILE *fd, struct if_info *ii, u_char *pkt, int *idx, u_char *dst,
 	}
 }
 
-/* ARGSUSED */
 void
 mopProcessRC(FILE *fd, struct if_info *ii, u_char *pkt, int *idx, u_char dst,
     u_char *src, int trans, u_short len)
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 5bcb6292b73..157dd12b7aa 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moptrace.c,v 1.13 2015/02/09 23:00:14 deraadt Exp $ */
+/*	$OpenBSD: moptrace.c,v 1.14 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -112,7 +112,6 @@ Usage()
 /*
  * Process incoming packages.
  */
-/* ARGSUSED */
 void
 mopProcess(struct if_info *ii, u_char *pkt)
 {
diff --git a/usr.sbin/npppd/npppd/control.c b/usr.sbin/npppd/npppd/control.c
index acb06cab031..35e1b18b800 100644
--- a/usr.sbin/npppd/npppd/control.c
+++ b/usr.sbin/npppd/npppd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.7 2017/01/09 14:04:31 krw Exp $	*/
+/*	$OpenBSD: control.c,v 1.8 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -145,7 +145,6 @@ control_cleanup(struct control_sock *cs)
 }
 
 #include <stdio.h>
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *arg)
 {
@@ -238,7 +237,6 @@ control_close(int fd, struct control_sock *cs)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c
index ce018c3e5f0..2bb656c1df7 100644
--- a/usr.sbin/ospf6d/control.c
+++ b/usr.sbin/ospf6d/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.30 2021/01/19 09:42:11 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.31 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -140,7 +140,6 @@ control_cleanup(void)
 	event_del(&control_state.evt);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -238,7 +237,6 @@ control_close(int fd)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/database.c b/usr.sbin/ospf6d/database.c
index febe11934ea..9c025b0feb8 100644
--- a/usr.sbin/ospf6d/database.c
+++ b/usr.sbin/ospf6d/database.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: database.c,v 1.21 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: database.c,v 1.22 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -368,7 +368,6 @@ db_sum_list_clr(struct nbr *nbr)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 db_tx_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospf6d/interface.c b/usr.sbin/ospf6d/interface.c
index 750c0931e0f..b82989d132a 100644
--- a/usr.sbin/ospf6d/interface.c
+++ b/usr.sbin/ospf6d/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.29 2020/05/27 09:03:56 denis Exp $ */
+/*	$OpenBSD: interface.c,v 1.30 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -303,7 +303,6 @@ if_start(struct ospfd_conf *xconf, struct iface *iface)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 if_hello_timer(int fd, short event, void *arg)
 {
@@ -336,7 +335,6 @@ if_stop_hello_timer(struct iface *iface)
 		fatal("if_stop_hello_timer");
 }
 
-/* ARGSUSED */
 void
 if_wait_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospf6d/kroute.c b/usr.sbin/ospf6d/kroute.c
index 0edf4b99d33..a7d2491a9a1 100644
--- a/usr.sbin/ospf6d/kroute.c
+++ b/usr.sbin/ospf6d/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.66 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: kroute.c,v 1.67 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -388,7 +388,6 @@ kr_fib_update_prio(u_int8_t fib_prio)
 	kr_state.fib_prio = fib_prio;
 }
 
-/* ARGSUSED */
 void
 kr_dispatch_msg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/lsack.c b/usr.sbin/ospf6d/lsack.c
index d3c2d65a15b..cec174b9751 100644
--- a/usr.sbin/ospf6d/lsack.c
+++ b/usr.sbin/ospf6d/lsack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsack.c,v 1.9 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: lsack.c,v 1.10 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
@@ -231,7 +231,6 @@ ls_ack_list_empty(struct iface *iface)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 ls_ack_tx_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospf6d/lsreq.c b/usr.sbin/ospf6d/lsreq.c
index 13de5057ef5..29d4133b8b4 100644
--- a/usr.sbin/ospf6d/lsreq.c
+++ b/usr.sbin/ospf6d/lsreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsreq.c,v 1.13 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: lsreq.c,v 1.14 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
@@ -186,7 +186,6 @@ ls_req_list_empty(struct nbr *nbr)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 ls_req_tx_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospf6d/lsupdate.c b/usr.sbin/ospf6d/lsupdate.c
index 9305139ad31..0d934be7674 100644
--- a/usr.sbin/ospf6d/lsupdate.c
+++ b/usr.sbin/ospf6d/lsupdate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsupdate.c,v 1.21 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: lsupdate.c,v 1.22 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -435,7 +435,6 @@ ls_retrans_list_clr(struct nbr *nbr)
 	nbr->ls_ret_cnt = 0;
 }
 
-/* ARGSUSED */
 void
 ls_retrans_timer(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/neighbor.c b/usr.sbin/ospf6d/neighbor.c
index 8834ef917ea..25d43cdb412 100644
--- a/usr.sbin/ospf6d/neighbor.c
+++ b/usr.sbin/ospf6d/neighbor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: neighbor.c,v 1.18 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: neighbor.c,v 1.19 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -387,7 +387,6 @@ nbr_find_id(struct iface *iface, u_int32_t rtr_id)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 nbr_itimer(int fd, short event, void *arg)
 {
@@ -430,7 +429,6 @@ nbr_reset_itimer(struct nbr *nbr)
 		fatal("nbr_reset_itimer");
 }
 
-/* ARGSUSED */
 void
 nbr_adj_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c
index 16cd042a29c..a85f8771c0a 100644
--- a/usr.sbin/ospf6d/ospf6d.c
+++ b/usr.sbin/ospf6d/ospf6d.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospf6d.c,v 1.52 2022/01/20 14:03:31 naddy Exp $ */
+/*	$OpenBSD: ospf6d.c,v 1.53 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -73,7 +73,6 @@ char			*conffile;
 pid_t			 ospfe_pid = 0;
 pid_t			 rde_pid = 0;
 
-/* ARGSUSED */
 void
 main_sig_handler(int sig, short event, void *arg)
 {
@@ -330,7 +329,6 @@ ospfd_shutdown(void)
 }
 
 /* imsg handling */
-/* ARGSUSED */
 void
 main_dispatch_ospfe(int fd, short event, void *bula)
 {
@@ -405,7 +403,6 @@ main_dispatch_ospfe(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 main_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c
index 4ba520480a7..0e8c79755be 100644
--- a/usr.sbin/ospf6d/ospfe.c
+++ b/usr.sbin/ospf6d/ospfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfe.c,v 1.67 2021/01/19 09:54:08 claudio Exp $ */
+/*	$OpenBSD: ospfe.c,v 1.68 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -52,7 +52,6 @@ static struct imsgev	*iev_main;
 static struct imsgev	*iev_rde;
 int			 oe_nofib;
 
-/* ARGSUSED */
 void
 ospfe_sig_handler(int sig, short event, void *bula)
 {
@@ -240,7 +239,6 @@ ospfe_imsg_compose_rde(int type, u_int32_t peerid, pid_t pid,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 void
 ospfe_dispatch_main(int fd, short event, void *bula)
 {
@@ -427,7 +425,6 @@ ospfe_dispatch_main(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 ospfe_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c
index 6aadf964ef4..f67440499de 100644
--- a/usr.sbin/ospf6d/rde.c
+++ b/usr.sbin/ospf6d/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.90 2022/01/20 14:03:32 naddy Exp $ */
+/*	$OpenBSD: rde.c,v 1.91 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -93,7 +93,6 @@ static struct imsgev	*iev_main;
 struct rde_nbr		*nbrself;
 struct lsa_tree		 asext_tree;
 
-/* ARGSUSED */
 void
 rde_sig_handler(int sig, short event, void *arg)
 {
@@ -256,7 +255,6 @@ rde_imsg_compose_ospfe(int type, u_int32_t peerid, pid_t pid, void *data,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 void
 rde_dispatch_imsg(int fd, short event, void *bula)
 {
@@ -636,7 +634,6 @@ rde_dispatch_imsg(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 rde_dispatch_parent(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/rde_lsdb.c b/usr.sbin/ospf6d/rde_lsdb.c
index c14a5bad7ee..33b6b692edd 100644
--- a/usr.sbin/ospf6d/rde_lsdb.c
+++ b/usr.sbin/ospf6d/rde_lsdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_lsdb.c,v 1.47 2020/10/04 07:24:46 denis Exp $ */
+/*	$OpenBSD: rde_lsdb.c,v 1.48 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -803,7 +803,6 @@ lsa_dump(struct lsa_tree *tree, int imsg_type, pid_t pid)
 	}
 }
 
-/* ARGSUSED */
 void
 lsa_timeout(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospf6d/rde_spf.c b/usr.sbin/ospf6d/rde_spf.c
index 8972914e670..fc5d0475bb9 100644
--- a/usr.sbin/ospf6d/rde_spf.c
+++ b/usr.sbin/ospf6d/rde_spf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_spf.c,v 1.28 2020/04/05 18:19:04 denis Exp $ */
+/*	$OpenBSD: rde_spf.c,v 1.29 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -629,7 +629,6 @@ cand_list_clr(void)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 spf_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospfd/control.c b/usr.sbin/ospfd/control.c
index c46e83831cb..80195b3156a 100644
--- a/usr.sbin/ospfd/control.c
+++ b/usr.sbin/ospfd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.47 2021/01/19 09:33:38 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.48 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -140,7 +140,6 @@ control_cleanup(void)
 	event_del(&control_state.evt);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -238,7 +237,6 @@ control_close(int fd)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/database.c b/usr.sbin/ospfd/database.c
index 5bfcd7af64d..17f855c261c 100644
--- a/usr.sbin/ospfd/database.c
+++ b/usr.sbin/ospfd/database.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: database.c,v 1.35 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: database.c,v 1.36 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -381,7 +381,6 @@ db_sum_list_clr(struct nbr *nbr)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 db_tx_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index f69ee07b503..c47268c4a4e 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: interface.c,v 1.86 2021/01/16 08:03:55 claudio Exp $ */
+/*	$OpenBSD: interface.c,v 1.87 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -256,7 +256,6 @@ if_init(struct ospfd_conf *xconf, struct iface *iface)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 if_hello_timer(int fd, short event, void *arg)
 {
@@ -292,7 +291,6 @@ if_stop_hello_timer(struct iface *iface)
 		fatal("if_stop_hello_timer");
 }
 
-/* ARGSUSED */
 void
 if_wait_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospfd/kroute.c b/usr.sbin/ospfd/kroute.c
index db7bcd74c9d..b83514d17ff 100644
--- a/usr.sbin/ospfd/kroute.c
+++ b/usr.sbin/ospfd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.116 2023/02/08 08:20:54 tb Exp $ */
+/*	$OpenBSD: kroute.c,v 1.117 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -455,7 +455,6 @@ kr_fib_update_prio(u_int8_t fib_prio)
 	kr_state.fib_prio = fib_prio;
  }
 
-/* ARGSUSED */
 void
 kr_dispatch_msg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/lsack.c b/usr.sbin/ospfd/lsack.c
index c996607b614..78cd67added 100644
--- a/usr.sbin/ospfd/lsack.c
+++ b/usr.sbin/ospfd/lsack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsack.c,v 1.23 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: lsack.c,v 1.24 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -233,7 +233,6 @@ ls_ack_list_empty(struct iface *iface)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 ls_ack_tx_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospfd/lsreq.c b/usr.sbin/ospfd/lsreq.c
index 28e6dd8095a..6b513ba369e 100644
--- a/usr.sbin/ospfd/lsreq.c
+++ b/usr.sbin/ospfd/lsreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsreq.c,v 1.23 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: lsreq.c,v 1.24 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -189,7 +189,6 @@ ls_req_list_empty(struct nbr *nbr)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 ls_req_tx_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospfd/lsupdate.c b/usr.sbin/ospfd/lsupdate.c
index 4b9c0aff05f..774e002b7b5 100644
--- a/usr.sbin/ospfd/lsupdate.c
+++ b/usr.sbin/ospfd/lsupdate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsupdate.c,v 1.50 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: lsupdate.c,v 1.51 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -430,7 +430,6 @@ ls_retrans_list_clr(struct nbr *nbr)
 	nbr->ls_ret_cnt = 0;
 }
 
-/* ARGSUSED */
 void
 ls_retrans_timer(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/neighbor.c b/usr.sbin/ospfd/neighbor.c
index 205aa78c124..83712fe19f4 100644
--- a/usr.sbin/ospfd/neighbor.c
+++ b/usr.sbin/ospfd/neighbor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: neighbor.c,v 1.50 2021/11/03 21:40:03 sthen Exp $ */
+/*	$OpenBSD: neighbor.c,v 1.51 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -383,7 +383,6 @@ nbr_find_id(struct iface *iface, u_int32_t rtr_id)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 nbr_itimer(int fd, short event, void *arg)
 {
@@ -426,7 +425,6 @@ nbr_reset_itimer(struct nbr *nbr)
 		fatal("nbr_reset_itimer");
 }
 
-/* ARGSUSED */
 void
 nbr_adj_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ospfd/ospfd.c b/usr.sbin/ospfd/ospfd.c
index 0b38f637d62..4c3ae9bbbba 100644
--- a/usr.sbin/ospfd/ospfd.c
+++ b/usr.sbin/ospfd/ospfd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfd.c,v 1.116 2021/09/06 13:32:18 deraadt Exp $ */
+/*	$OpenBSD: ospfd.c,v 1.117 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -73,7 +73,6 @@ char			*conffile;
 pid_t			 ospfe_pid = 0;
 pid_t			 rde_pid = 0;
 
-/* ARGSUSED */
 void
 main_sig_handler(int sig, short event, void *arg)
 {
@@ -346,7 +345,6 @@ ospfd_shutdown(void)
 }
 
 /* imsg handling */
-/* ARGSUSED */
 void
 main_dispatch_ospfe(int fd, short event, void *bula)
 {
@@ -434,7 +432,6 @@ main_dispatch_ospfe(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 main_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c
index 3e5cb5c33d7..ffc6faaa3dc 100644
--- a/usr.sbin/ospfd/ospfe.c
+++ b/usr.sbin/ospfd/ospfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ospfe.c,v 1.110 2021/01/19 09:37:53 claudio Exp $ */
+/*	$OpenBSD: ospfe.c,v 1.111 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -52,7 +52,6 @@ static struct imsgev	*iev_main;
 static struct imsgev	*iev_rde;
 int			 oe_nofib;
 
-/* ARGSUSED */
 void
 ospfe_sig_handler(int sig, short event, void *bula)
 {
@@ -257,7 +256,6 @@ ospfe_imsg_compose_rde(int type, u_int32_t peerid, pid_t pid,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 void
 ospfe_dispatch_main(int fd, short event, void *bula)
 {
@@ -478,7 +476,6 @@ ospfe_dispatch_main(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 ospfe_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/rde.c b/usr.sbin/ospfd/rde.c
index 6fe6badb62e..725f9077661 100644
--- a/usr.sbin/ospfd/rde.c
+++ b/usr.sbin/ospfd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.111 2021/01/19 09:37:53 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.112 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -70,7 +70,6 @@ static struct imsgev	*iev_main;
 struct rde_nbr		*nbrself;
 struct lsa_tree		 asext_tree;
 
-/* ARGSUSED */
 void
 rde_sig_handler(int sig, short event, void *arg)
 {
@@ -243,7 +242,6 @@ rde_imsg_compose_ospfe(int type, u_int32_t peerid, pid_t pid, void *data,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 void
 rde_dispatch_imsg(int fd, short event, void *bula)
 {
@@ -635,7 +633,6 @@ rde_dispatch_imsg(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 rde_dispatch_parent(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/rde_lsdb.c b/usr.sbin/ospfd/rde_lsdb.c
index d9265135bf2..38a4b142c6c 100644
--- a/usr.sbin/ospfd/rde_lsdb.c
+++ b/usr.sbin/ospfd/rde_lsdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_lsdb.c,v 1.51 2020/10/05 09:19:05 jan Exp $ */
+/*	$OpenBSD: rde_lsdb.c,v 1.52 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -654,7 +654,6 @@ lsa_dump(struct lsa_tree *tree, int imsg_type, pid_t pid)
 	}
 }
 
-/* ARGSUSED */
 void
 lsa_timeout(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ospfd/rde_spf.c b/usr.sbin/ospfd/rde_spf.c
index c4da6e4fc02..bc0d4df8285 100644
--- a/usr.sbin/ospfd/rde_spf.c
+++ b/usr.sbin/ospfd/rde_spf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_spf.c,v 1.78 2019/11/19 09:55:55 remi Exp $ */
+/*	$OpenBSD: rde_spf.c,v 1.79 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -509,7 +509,6 @@ cand_list_clr(void)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 spf_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c
index f8791d4e097..e52ac034608 100644
--- a/usr.sbin/portmap/portmap.c
+++ b/usr.sbin/portmap/portmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portmap.c,v 1.50 2019/06/28 13:32:49 deraadt Exp $	*/
+/*	$OpenBSD: portmap.c,v 1.51 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved.
@@ -637,7 +637,6 @@ callit(struct svc_req *rqstp, SVCXPRT *xprt)
 	exit(0);
 }
 
-/* ARGSUSED */
 void
 reap(int signo)
 {
diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c
index 2e1c7e02e71..b98e7fc57e4 100644
--- a/usr.sbin/pppd/chap.c
+++ b/usr.sbin/pppd/chap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chap.c,v 1.19 2017/11/17 20:48:30 jca Exp $	*/
+/*	$OpenBSD: chap.c,v 1.20 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*
  * chap.c - Challenge Handshake Authentication Protocol.
@@ -768,7 +768,6 @@ ChapGenChallenge(cstate)
  * ChapSendResponse - send a response packet with values as specified
  * in *cstate.
  */
-/* ARGSUSED */
 static void
 ChapSendResponse(cstate)
     chap_state *cstate;
diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c
index 2d438b881f8..254309c0239 100644
--- a/usr.sbin/pppd/lcp.c
+++ b/usr.sbin/pppd/lcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcp.c,v 1.13 2015/12/14 03:25:59 mmcc Exp $	*/
+/*	$OpenBSD: lcp.c,v 1.14 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*
  * lcp.c - PPP Link Control Protocol.
@@ -417,7 +417,6 @@ lcp_rprotrej(f, inp, len)
 /*
  * lcp_protrej - A Protocol-Reject was received.
  */
-/*ARGSUSED*/
 static void
 lcp_protrej(unit)
     int unit;
diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c
index ac0caeef22e..6497187cbcc 100644
--- a/usr.sbin/pppd/main.c
+++ b/usr.sbin/pppd/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.55 2021/10/24 21:24:19 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.56 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*
  * main.c - Point-to-Point Protocol main module
@@ -735,7 +735,6 @@ die(status)
 /*
  * cleanup - restore anything which needs to be restored before we exit
  */
-/* ARGSUSED */
 static void
 cleanup()
 {
@@ -952,7 +951,6 @@ hup(sig)
  *
  * Indicates that we should initiate a graceful disconnect and exit.
  */
-/*ARGSUSED*/
 static void
 term(sig)
     int sig;
@@ -992,7 +990,6 @@ chld(sig)
  *
  * Toggle debug flag.
  */
-/*ARGSUSED*/
 static void
 toggle_debug(sig)
     int sig;
@@ -1011,7 +1008,6 @@ toggle_debug(sig)
  *
  * Try to (re)negotiate compression.
  */
-/*ARGSUSED*/
 static void
 open_ccp(sig)
     int sig;
diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c
index b02cef71374..fc03d750081 100644
--- a/usr.sbin/relayd/control.c
+++ b/usr.sbin/relayd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.57 2021/04/20 21:11:56 dv Exp $	*/
+/*	$OpenBSD: control.c,v 1.58 2023/03/08 04:43:14 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -127,7 +127,6 @@ control_cleanup(struct control_sock *cs)
 	event_del(&cs->cs_evt);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *arg)
 {
@@ -214,7 +213,6 @@ control_close(int fd, struct control_sock *cs)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ripd/control.c b/usr.sbin/ripd/control.c
index e377c7ee860..0bab7d71430 100644
--- a/usr.sbin/ripd/control.c
+++ b/usr.sbin/ripd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.27 2021/01/19 10:00:36 claudio Exp $ */
+/*	$OpenBSD: control.c,v 1.28 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -107,7 +107,6 @@ control_listen(void)
 	return (0);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *bula)
 {
@@ -205,7 +204,6 @@ control_close(int fd)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ripd/kroute.c b/usr.sbin/ripd/kroute.c
index b9523e7fdee..08661eda8d7 100644
--- a/usr.sbin/ripd/kroute.c
+++ b/usr.sbin/ripd/kroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kroute.c,v 1.35 2022/05/06 15:51:09 claudio Exp $ */
+/*	$OpenBSD: kroute.c,v 1.36 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -272,7 +272,6 @@ kr_fib_decouple(void)
 	log_info("kernel routing table decoupled");
 }
 
-/* ARGSUSED */
 void
 kr_dispatch_msg(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ripd/message.c b/usr.sbin/ripd/message.c
index be56650f6fd..5f46ddba38f 100644
--- a/usr.sbin/ripd/message.c
+++ b/usr.sbin/ripd/message.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: message.c,v 1.15 2019/12/15 20:51:39 remi Exp $ */
+/*	$OpenBSD: message.c,v 1.16 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -36,7 +36,6 @@ extern struct ripd_conf	*oeconf;
 void	 delete_entry(struct rip_route *);
 
 /* timers */
-/* ARGSUSED */
 void
 report_timer(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ripd/neighbor.c b/usr.sbin/ripd/neighbor.c
index 7d8248513a2..cbbaf33d3f1 100644
--- a/usr.sbin/ripd/neighbor.c
+++ b/usr.sbin/ripd/neighbor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: neighbor.c,v 1.11 2017/01/17 16:30:54 jca Exp $ */
+/*	$OpenBSD: neighbor.c,v 1.12 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -320,7 +320,6 @@ nbr_failed_delete(struct nbr_failed *nbr_failed)
 }
 
 /* timers */
-/* ARGSUSED */
 void
 nbr_timeout_timer(int fd, short event, void *arg)
 {
@@ -332,7 +331,6 @@ nbr_timeout_timer(int fd, short event, void *arg)
 		nbr_fsm(nbr, NBR_EVT_TIMEOUT);
 }
 
-/* ARGSUSED */
 void
 nbr_failed_timeout(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ripd/rde.c b/usr.sbin/ripd/rde.c
index cf7879de608..258010a9cc9 100644
--- a/usr.sbin/ripd/rde.c
+++ b/usr.sbin/ripd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.24 2021/01/19 10:20:47 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.25 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -52,7 +52,6 @@ int	rde_imsg_compose_ripe(int, u_int32_t, pid_t, void *, u_int16_t);
 int	rde_check_route(struct rip_route *);
 void	triggered_update(struct rt_node *);
 
-/* ARGSUSED */
 void
 rde_sig_handler(int sig, short event, void *arg)
 {
@@ -187,7 +186,6 @@ rde_imsg_compose_ripe(int type, u_int32_t peerid, pid_t pid, void *data,
 		    data, datalen));
 }
 
-/* ARGSUSED */
 void
 rde_dispatch_imsg(int fd, short event, void *bula)
 {
@@ -288,7 +286,6 @@ rde_dispatch_imsg(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 rde_dispatch_parent(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ripd/rde_rib.c b/usr.sbin/ripd/rde_rib.c
index 96ed32efcb1..ba7198cc006 100644
--- a/usr.sbin/ripd/rde_rib.c
+++ b/usr.sbin/ripd/rde_rib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_rib.c,v 1.5 2007/10/24 20:38:03 claudio Exp $ */
+/*	$OpenBSD: rde_rib.c,v 1.6 2023/03/08 04:43:14 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -72,7 +72,6 @@ route_start_garbage(struct rt_node *rn)
 	}
 }
 
-/* ARGSUSED */
 void
 route_action_timeout(int fd, short event, void *arg)
 {
@@ -89,7 +88,6 @@ route_action_timeout(int fd, short event, void *arg)
 	rde_send_change_kroute(r);
 }
 
-/* ARGSUSED */
 void
 route_action_garbage(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c
index f09b60e16e1..6675a2041af 100644
--- a/usr.sbin/ripd/ripd.c
+++ b/usr.sbin/ripd/ripd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ripd.c,v 1.36 2021/09/06 13:32:18 deraadt Exp $ */
+/*	$OpenBSD: ripd.c,v 1.37 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -75,7 +75,6 @@ usage(void)
 	exit(1);
 }
 
-/* ARGSUSED */
 void
 main_sig_handler(int sig, short event, void *arg)
 {
@@ -304,7 +303,6 @@ ripd_shutdown(void)
 }
 
 /* imsg handling */
-/* ARGSUSED */
 void
 main_dispatch_ripe(int fd, short event, void *bula)
 {
@@ -384,7 +382,6 @@ main_dispatch_ripe(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 main_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/ripd/ripe.c b/usr.sbin/ripd/ripe.c
index 9f462bc0e2d..c1b3c724e49 100644
--- a/usr.sbin/ripd/ripe.c
+++ b/usr.sbin/ripd/ripe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ripe.c,v 1.30 2021/01/19 10:20:47 claudio Exp $ */
+/*	$OpenBSD: ripe.c,v 1.31 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -49,7 +49,6 @@ struct ripd_conf	*oeconf = NULL;
 static struct imsgev	*iev_main;
 static struct imsgev	*iev_rde;
 
-/* ARGSUSED */
 void
 ripe_sig_handler(int sig, short event, void *bula)
 {
@@ -220,7 +219,6 @@ ripe_imsg_compose_rde(int type, u_int32_t peerid, pid_t pid,
 	    data, datalen));
 }
 
-/* ARGSUSED */
 void
 ripe_dispatch_main(int fd, short event, void *bula)
 {
@@ -299,7 +297,6 @@ ripe_dispatch_main(int fd, short event, void *bula)
 	}
 }
 
-/* ARGSUSED */
 void
 ripe_dispatch_rde(int fd, short event, void *bula)
 {
diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index a3ff649e2db..549fdaacac4 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockd.c,v 1.15 2022/12/04 23:50:51 cheloha Exp $	*/
+/*	$OpenBSD: lockd.c,v 1.16 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -188,7 +188,6 @@ main(int argc, char *argv[])
 }
 
 static void
-/*ARGSUSED*/
 sigalarm_handler(int s)
 {
 	grace_expired = 1;
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 032f7d1d746..bb751cbb0f8 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockd_lock.c,v 1.11 2022/12/28 21:30:18 jmc Exp $	*/
+/*	$OpenBSD: lockd_lock.c,v 1.12 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 2000 Manuel Bouyer.
@@ -171,7 +171,6 @@ lock_lookup(struct file_lock *newfl, int flags)
  */
 
 struct nlm4_holder *
-/*ARGSUSED*/
 testlock(struct nlm4_lock *lock, int flags)
 {
 	struct file_lock *fl;
@@ -430,7 +429,6 @@ lfree(struct file_lock *fl)
 }
 
 void
-/*ARGSUSED*/
 sigchild_handler(int sig)
 {
 	int sstatus;
@@ -604,7 +602,6 @@ do_lock(struct file_lock *fl, int block)
 }
 
 void
-/*ARGSUSED*/
 send_granted(struct file_lock *fl, int opcode)
 {
 	CLIENT *cli;
diff --git a/usr.sbin/rpc.lockd/procs.c b/usr.sbin/rpc.lockd/procs.c
index be4319c55e8..daafeea1300 100644
--- a/usr.sbin/rpc.lockd/procs.c
+++ b/usr.sbin/rpc.lockd/procs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procs.c,v 1.15 2015/01/16 06:40:20 deraadt Exp $	*/
+/*	$OpenBSD: procs.c,v 1.16 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -568,7 +568,6 @@ nlm_granted_msg_1_svc(nlm_testargs *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm_test_res_1_svc(nlm_testres *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -582,7 +581,6 @@ nlm_test_res_1_svc(nlm_testres *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm_lock_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -597,7 +595,6 @@ nlm_lock_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm_cancel_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -611,7 +608,6 @@ nlm_cancel_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm_unlock_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -625,7 +621,6 @@ nlm_unlock_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm_granted_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -717,7 +712,6 @@ nlm_nm_lock_3_svc(nlm_lockargs *arg, struct svc_req *rqstp)
  *		using monitored locks.
  */
 void *
-/*ARGSUSED*/
 nlm_free_all_3_svc(nlm_notify *arg, struct svc_req *rqstp)
 {
 	static char dummy;
@@ -976,7 +970,6 @@ nlm4_granted_msg_4_svc(nlm4_testargs *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm4_test_res_4_svc(nlm4_testres *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -990,7 +983,6 @@ nlm4_test_res_4_svc(nlm4_testres *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm4_lock_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -1005,7 +997,6 @@ nlm4_lock_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm4_cancel_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -1019,7 +1010,6 @@ nlm4_cancel_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm4_unlock_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -1033,7 +1023,6 @@ nlm4_unlock_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm4_granted_res_4_svc(nlm4_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
@@ -1125,7 +1114,6 @@ nlm4_nm_lock_4_svc(nlm4_lockargs *arg, struct svc_req *rqstp)
  *		using monitored locks.
  */
 void *
-/*ARGSUSED*/
 nlm4_free_all_4_svc(nlm_notify *arg, struct svc_req *rqstp)
 {
 	static char dummy;
@@ -1141,7 +1129,6 @@ nlm4_free_all_4_svc(nlm_notify *arg, struct svc_req *rqstp)
  * Returns:	Nothing
  */
 void *
-/*ARGSUSED*/
 nlm_sm_notify_0_svc(struct nlm_sm_status *arg, struct svc_req *rqstp)
 {
 	static char dummy;
diff --git a/usr.sbin/sensorsd/sensorsd.c b/usr.sbin/sensorsd/sensorsd.c
index d1322d21bb8..bf04206a672 100644
--- a/usr.sbin/sensorsd/sensorsd.c
+++ b/usr.sbin/sensorsd/sensorsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sensorsd.c,v 1.68 2021/07/12 15:09:21 beck Exp $ */
+/*	$OpenBSD: sensorsd.c,v 1.69 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -840,7 +840,6 @@ get_val(char *buf, int upper, enum sensor_type type)
 	return (rval);
 }
 
-/* ARGSUSED */
 void
 reparse_cfg(int signo)
 {
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index 43fdec287aa..835ab5520ee 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.128 2021/06/14 17:58:15 eric Exp $	*/
+/*	$OpenBSD: control.c,v 1.129 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -269,7 +269,6 @@ control_listen(void)
 	event_add(&control_state.ev, NULL);
 }
 
-/* ARGSUSED */
 static void
 control_accept(int listenfd, short event, void *arg)
 {
@@ -407,7 +406,6 @@ control_digest_update(const char *key, size_t value, int incr)
 	}
 }
 
-/* ARGSUSED */
 static void
 control_dispatch_ext(struct mproc *p, struct imsg *imsg)
 {
diff --git a/usr.sbin/snmpd/snmpe.c b/usr.sbin/snmpd/snmpe.c
index add7acf3c4b..1d3e7e2ccb7 100644
--- a/usr.sbin/snmpd/snmpe.c
+++ b/usr.sbin/snmpd/snmpe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpe.c,v 1.87 2022/12/20 20:06:47 martijn Exp $	*/
+/*	$OpenBSD: snmpe.c,v 1.88 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008, 2012 Reyk Floeter <reyk@openbsd.org>
@@ -96,7 +96,6 @@ snmpe(struct privsep *ps, struct privsep_proc *p)
 	proc_run(ps, p, procs, nitems(procs), snmpe_init, NULL);
 }
 
-/* ARGSUSED */
 void
 snmpe_init(struct privsep *ps, struct privsep_proc *p, void *arg)
 {
diff --git a/usr.sbin/syslogd/privsep.c b/usr.sbin/syslogd/privsep.c
index d5744db5aa5..db3131bdc5a 100644
--- a/usr.sbin/syslogd/privsep.c
+++ b/usr.sbin/syslogd/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.74 2021/10/24 21:24:19 deraadt Exp $	*/
+/*	$OpenBSD: privsep.c,v 1.75 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 2003 Anil Madhavapeddy <anil@recoil.org>
@@ -833,7 +833,6 @@ sig_pass_to_chld(int sig)
 }
 
 /* When child dies, move into the shutdown state */
-/* ARGSUSED */
 static void
 sig_got_chld(int sig)
 {
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index cdc954c519a..4520c353a60 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.39 2019/12/02 21:47:54 cheloha Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.40 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -302,7 +302,6 @@ dotrace(caddr_t tcpcb)
 /*
  * Tcp debug routines
  */
-/*ARGSUSED*/
 void
 tcp_trace(short act, short ostate, struct tcpcb *tp,
     struct tcpiphdr *ti, struct tcpipv6hdr *ti6, int req)
diff --git a/usr.sbin/vmd/control.c b/usr.sbin/vmd/control.c
index 8b16ba89147..1fe8c1ecba3 100644
--- a/usr.sbin/vmd/control.c
+++ b/usr.sbin/vmd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.39 2022/01/04 15:22:53 claudio Exp $	*/
+/*	$OpenBSD: control.c,v 1.40 2023/03/08 04:43:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -265,7 +265,6 @@ control_listen(struct control_sock *cs)
 	return (0);
 }
 
-/* ARGSUSED */
 void
 control_accept(int listenfd, short event, void *arg)
 {
@@ -369,7 +368,6 @@ control_close(int fd, struct control_sock *cs)
 	free(c);
 }
 
-/* ARGSUSED */
 void
 control_dispatch_imsg(int fd, short event, void *arg)
 {
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c
index ee265aa1f58..83b7613e9a7 100644
--- a/usr.sbin/watchdogd/watchdogd.c
+++ b/usr.sbin/watchdogd/watchdogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: watchdogd.c,v 1.15 2015/01/16 06:40:22 deraadt Exp $ */
+/*	$OpenBSD: watchdogd.c,v 1.16 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Marc Balmer <mbalmer@openbsd.org>
@@ -44,7 +44,6 @@ usage(void)
 	exit(1);
 }
 
-/* ARGSUSED */
 void
 sighdlr(int signum)
 {
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index f121bd6ddd7..6a1c5d91fcc 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.77 2022/12/28 21:30:19 jmc Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.78 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -118,7 +118,6 @@ u_int32_t unique_xid(struct _dom_binding *ypdb);
  * declare sun's interface insufficient and roll our own.
  */
 
-/*ARGSUSED*/
 static void *
 ypbindproc_null_2x(SVCXPRT *transp, void *argp, CLIENT *clnt)
 {
@@ -128,7 +127,6 @@ ypbindproc_null_2x(SVCXPRT *transp, void *argp, CLIENT *clnt)
 	return (void *)&res;
 }
 
-/*ARGSUSED*/
 static struct ypbind_resp *
 ypbindproc_domain_2x(SVCXPRT *transp, domainname *argp, CLIENT *clnt)
 {
@@ -211,7 +209,6 @@ ypbindproc_domain_2x(SVCXPRT *transp, domainname *argp, CLIENT *clnt)
 	return &res;
 }
 
-/*ARGSUSED*/
 static bool_t *
 ypbindproc_setdom_2x(SVCXPRT *transp, struct ypbind_setdom *argp, CLIENT *clnt)
 {
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index 13d12d4b6ad..2f5dd63922d 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv.c,v 1.44 2015/11/17 18:21:48 tedu Exp $ */
+/*	$OpenBSD: ypserv.c,v 1.45 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -81,7 +81,6 @@ _msgout(char *msg)
 #endif
 }
 
-/* ARGSUSED */
 static void
 closedown(int sig)
 {
@@ -538,7 +537,6 @@ main(int argc, char *argv[])
 	/* NOTREACHED */
 }
 
-/* ARGSUSED */
 void
 sig_child(int signo)
 {
@@ -549,7 +547,6 @@ sig_child(int signo)
 	errno = save_errno;
 }
 
-/* ARGSUSED */
 void
 sig_hup(int signo)
 {
diff --git a/usr.sbin/ypserv/ypserv/ypserv_proc.c b/usr.sbin/ypserv/ypserv/ypserv_proc.c
index aa88455071d..ed72977855d 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_proc.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv_proc.c,v 1.29 2015/01/16 06:40:23 deraadt Exp $ */
+/*	$OpenBSD: ypserv_proc.c,v 1.30 2023/03/08 04:43:15 guenther Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -56,7 +56,6 @@ static char *True = "true";
 static char *False = "FALSE";
 #define TORF(N) ((N) ? True : False)
 
-/*ARGSUSED*/
 void *
 ypproc_null_2_svc(void *argp, struct svc_req *rqstp)
 {
@@ -276,7 +275,6 @@ ypproc_xfr_2_svc(ypreq_xfr *argp, struct svc_req *rqstp)
 	return (&res);
 }
 
-/*ARGSUSED*/
 void *
 ypproc_clear_2_svc(void *argp, struct svc_req *rqstp)
 {
@@ -511,7 +509,6 @@ bail:
 	return (&res);
 }
 
-/*ARGSUSED*/
 void *
 ypoldproc_null_1_svc(void *argp, struct svc_req *rqstp)
 {