Delete obsolete /* ARGSUSED */ lint comments.

ok miod@ millert@

13 files changed, 13 insertions, 135 deletions

diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 8d20c480066..8bb31c1e8c8 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.22 2016/05/22 23:09:56 schwarze Exp $	*/
+/*	$OpenBSD: common.c,v 1.23 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: common.c,v 1.24 2009/12/30 22:37:40 christos Exp $	*/
 
 /*-
@@ -52,7 +52,6 @@
  *	[^D]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_end_of_file(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -109,7 +108,6 @@ ed_insert(EditLine *el, wint_t c)
  *	[M-^?] [^W]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_delete_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp, *p, *kp;
@@ -137,7 +135,6 @@ ed_delete_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^D] [x]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_delete_next_char(EditLine *el, wint_t c)
 {
 #ifdef notdef			/* XXX */
@@ -187,7 +184,6 @@ ed_delete_next_char(EditLine *el, wint_t c)
  *	[^K] [^K]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *kp, *cp;
@@ -208,7 +204,6 @@ ed_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^E] [^E]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_move_to_end(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -231,7 +226,6 @@ ed_move_to_end(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^A] [^A]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_move_to_beg(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -280,7 +274,6 @@ ed_transpose_chars(EditLine *el, wint_t c)
  *	[^F] [^F]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *lim = el->el_line.lastchar;
@@ -309,7 +302,6 @@ ed_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-b] [b]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -335,7 +327,6 @@ ed_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^B] [^B]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -430,7 +421,6 @@ ed_argument_digit(EditLine *el, wint_t c)
  *	Bound to keys that are not assigned
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_unassigned(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -443,7 +433,6 @@ ed_unassigned(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^C ^O ^Q ^S ^Z ^\ ^]] [^C ^O ^Q ^S ^\]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_ignore(EditLine *el __attribute__((__unused__)),
 	      wint_t c __attribute__((__unused__)))
 {
@@ -457,7 +446,6 @@ ed_ignore(EditLine *el __attribute__((__unused__)),
  *	[^J]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_newline(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -473,7 +461,6 @@ ed_newline(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^?]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -493,7 +480,6 @@ ed_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^L]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_clear_screen(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -508,7 +494,6 @@ ed_clear_screen(EditLine *el, wint_t c __attribute__((__unused__)))
  *	^R
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_redisplay(EditLine *el __attribute__((__unused__)),
 	     wint_t c __attribute__((__unused__)))
 {
@@ -522,7 +507,6 @@ ed_redisplay(EditLine *el __attribute__((__unused__)),
  *	[^G]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_start_over(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -536,7 +520,6 @@ ed_start_over(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Placeholder for external keys
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
 		    wint_t c __attribute__((__unused__)))
 {
@@ -550,7 +533,6 @@ ed_sequence_lead_in(EditLine *el __attribute__((__unused__)),
  *	[^P] [k]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	char beep = 0;
@@ -587,7 +569,6 @@ ed_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^N] [j]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	el_action_t beep = CC_REFRESH, rval;
@@ -614,7 +595,6 @@ ed_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
  *	next search history [M-P] [K]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_search_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	const wchar_t *hp;
@@ -682,7 +662,6 @@ ed_search_prev_history(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-N] [J]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_search_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	const wchar_t *hp;
@@ -736,7 +715,6 @@ ed_search_next_history(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Could be [k] [^p]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_prev_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *ptr;
@@ -779,7 +757,6 @@ ed_prev_line(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Could be [j] [^n]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_next_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *ptr;
@@ -813,7 +790,6 @@ ed_next_line(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-X] [:]
  */
 protected el_action_t
-/*ARGSUSED*/
 ed_command(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t tmpbuf[EL_BUFSIZ];
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
index 2b57de13e6e..e77f0d146c9 100644
--- a/lib/libedit/el.c
+++ b/lib/libedit/el.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: el.c,v 1.37 2017/04/12 18:24:37 tb Exp $	*/
+/*	$OpenBSD: el.c,v 1.38 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: el.c,v 1.61 2011/01/27 23:11:40 christos Exp $	*/
 
 /*-
@@ -597,7 +597,6 @@ el_beep(EditLine *el)
  *	Set the state of EDIT_DISABLED from the `edit' command.
  */
 protected int
-/*ARGSUSED*/
 el_editmode(EditLine *el, int argc, const wchar_t **argv)
 {
 	const wchar_t *how;
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index 19503d6fb54..138157224d2 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emacs.c,v 1.17 2016/05/06 13:12:52 schwarze Exp $	*/
+/*	$OpenBSD: emacs.c,v 1.18 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: emacs.c,v 1.35 2016/04/18 17:01:19 christos Exp $	*/
 
 /*-
@@ -49,7 +49,6 @@
  *	[^D]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_delete_or_list(EditLine *el, wint_t c)
 {
 
@@ -85,7 +84,6 @@ em_delete_or_list(EditLine *el, wint_t c)
  *	[M-d]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_delete_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp, *p, *kp;
@@ -114,7 +112,6 @@ em_delete_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^Y]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_yank(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *kp, *cp;
@@ -150,7 +147,6 @@ em_yank(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^U]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *kp, *cp;
@@ -172,7 +168,6 @@ em_kill_line(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^W]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_kill_region(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *kp, *cp;
@@ -205,7 +200,6 @@ em_kill_region(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-W]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_copy_region(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *kp, *cp;
@@ -254,7 +248,6 @@ em_gosmacs_transpose(EditLine *el, wint_t c)
  *	[M-f]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	if (el->el_line.cursor == el->el_line.lastchar)
@@ -279,7 +272,6 @@ em_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-u]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_upper_case(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp, *ep;
@@ -303,7 +295,6 @@ em_upper_case(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-c]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_capitol_case(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp, *ep;
@@ -335,7 +326,6 @@ em_capitol_case(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[M-l]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_lower_case(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp, *ep;
@@ -359,7 +349,6 @@ em_lower_case(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^@]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_set_mark(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -373,7 +362,6 @@ em_set_mark(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^X^X]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_exchange_mark(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp;
@@ -390,7 +378,6 @@ em_exchange_mark(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^U]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_universal_argument(EditLine *el, wint_t c __attribute__((__unused__)))
 {				/* multiply current argument by 4 */
 
@@ -407,7 +394,6 @@ em_universal_argument(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[<ESC>]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_meta_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -420,7 +406,6 @@ em_meta_next(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Switch from insert to overwrite mode or vice versa
  */
 protected el_action_t
-/*ARGSUSED*/
 em_toggle_overwrite(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -434,7 +419,6 @@ em_toggle_overwrite(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Copy current word to cursor
  */
 protected el_action_t
-/*ARGSUSED*/
 em_copy_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *cp, *oldc, *dp;
@@ -461,7 +445,6 @@ em_copy_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Emacs incremental next search
  */
 protected el_action_t
-/*ARGSUSED*/
 em_inc_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -474,7 +457,6 @@ em_inc_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Emacs incremental reverse search
  */
 protected el_action_t
-/*ARGSUSED*/
 em_inc_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -488,7 +470,6 @@ em_inc_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^?]
  */
 protected el_action_t
-/*ARGSUSED*/
 em_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
diff --git a/lib/libedit/filecomplete.c b/lib/libedit/filecomplete.c
index 6c22624f75b..28b89101428 100644
--- a/lib/libedit/filecomplete.c
+++ b/lib/libedit/filecomplete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: filecomplete.c,v 1.12 2016/04/11 20:43:33 schwarze Exp $ */
+/*	$OpenBSD: filecomplete.c,v 1.13 2023/03/08 04:43:05 guenther Exp $ */
 /*	$NetBSD: filecomplete.c,v 1.22 2010/12/02 04:42:46 dholland Exp $	*/
 
 /*-
@@ -545,7 +545,6 @@ fn_complete(EditLine *el,
 /*
  * el-compatible wrapper around rl_complete; needed for key binding
  */
-/* ARGSUSED */
 unsigned char
 _el_fn_complete(EditLine *el, int ch __attribute__((__unused__)))
 {
diff --git a/lib/libedit/hist.c b/lib/libedit/hist.c
index c26ff93c12f..c82a1f0369b 100644
--- a/lib/libedit/hist.c
+++ b/lib/libedit/hist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hist.c,v 1.18 2017/04/12 18:24:37 tb Exp $	*/
+/*	$OpenBSD: hist.c,v 1.19 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: hist.c,v 1.28 2016/04/11 00:50:13 christos Exp $	*/
 
 /*-
@@ -188,7 +188,6 @@ hist_command(EditLine *el, int argc, const wchar_t **argv)
  *	Return 0 for failure, 1 for success.
  */
 protected int
-/*ARGSUSED*/
 hist_enlargebuf(EditLine *el, size_t oldsz, size_t newsz)
 {
 	wchar_t *newbuf;
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index e92600253be..57322087d2d 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.28 2016/04/11 21:17:29 schwarze Exp $	*/
+/*	$OpenBSD: history.c,v 1.29 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: history.c,v 1.37 2010/01/03 18:27:10 christos Exp $	*/
 
 /*-
@@ -449,7 +449,6 @@ history_deldata_nth(history_t *h, TYPE(HistEvent) *ev,
 /* history_def_del():
  *	Delete element hp of the h list
  */
-/* ARGSUSED */
 static int
 history_def_del(void *p, TYPE(HistEvent) *ev __attribute__((__unused__)),
     const int num)
@@ -467,7 +466,6 @@ history_def_del(void *p, TYPE(HistEvent) *ev __attribute__((__unused__)),
 /* history_def_delete():
  *	Delete element hp of the h list
  */
-/* ARGSUSED */
 static void
 history_def_delete(history_t *h,
 		   TYPE(HistEvent) *ev __attribute__((__unused__)), hentry_t *hp)
@@ -547,7 +545,6 @@ history_def_enter(void *p, TYPE(HistEvent) *ev, const Char *str)
 /* history_def_init():
  *	Default history initialization function
  */
-/* ARGSUSED */
 static int
 history_def_init(void **p, TYPE(HistEvent) *ev __attribute__((__unused__)), int n)
 {
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 360042466b9..67fb84ace94 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prompt.c,v 1.13 2016/04/11 21:17:29 schwarze Exp $	*/
+/*	$OpenBSD: prompt.c,v 1.14 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: prompt.c,v 1.25 2016/04/11 18:56:31 christos Exp $	*/
 
 /*-
@@ -48,7 +48,6 @@ static wchar_t	*prompt_default_r(EditLine *);
  *	Just a default prompt, in case the user did not provide one
  */
 static wchar_t *
-/*ARGSUSED*/
 prompt_default(EditLine *el __attribute__((__unused__)))
 {
 	static wchar_t a[3] = L"? ";
@@ -61,7 +60,6 @@ prompt_default(EditLine *el __attribute__((__unused__)))
  *	Just a default rprompt, in case the user did not provide one
  */
 static wchar_t *
-/*ARGSUSED*/
 prompt_default_r(EditLine *el __attribute__((__unused__)))
 {
 	static wchar_t a[1] = L"";
@@ -130,7 +128,6 @@ prompt_init(EditLine *el)
  *	Clean up the prompt stuff
  */
 protected void
-/*ARGSUSED*/
 prompt_end(EditLine *el __attribute__((__unused__)))
 {
 }
diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c
index 3fa6593f678..99364cbfd36 100644
--- a/lib/libedit/readline.c
+++ b/lib/libedit/readline.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readline.c,v 1.29 2019/08/14 08:31:00 asou Exp $	*/
+/*	$OpenBSD: readline.c,v 1.30 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: readline.c,v 1.91 2010/08/28 15:44:59 christos Exp $	*/
 
 /*-
@@ -178,7 +178,6 @@ static int		 _rl_event_read_char(EditLine *, wchar_t *);
 static void		 _rl_update_pos(void);
 
 
-/* ARGSUSED */
 static char *
 _get_prompt(EditLine *el __attribute__((__unused__)))
 {
@@ -210,7 +209,6 @@ _move_history(int op)
  * read one key from user defined input function
  */
 static int
-/*ARGSUSED*/
 _getc_function(EditLine *el __attribute__((__unused__)), wchar_t *c)
 {
 	int i;
@@ -1674,7 +1672,6 @@ history_search_prefix(const char *str, int direction)
  * search for event in history containing str, starting at offset
  * abs(pos); continue backward, if pos<0, forward otherwise
  */
-/* ARGSUSED */
 int
 history_search_pos(const char *str,
 		   int direction __attribute__((__unused__)), int pos)
@@ -1757,7 +1754,6 @@ username_completion_function(const char *text, int state)
 /*
  * el-compatible wrapper to send TSTP on ^Z
  */
-/* ARGSUSED */
 static unsigned char
 _el_rl_tstp(EditLine *el __attribute__((__unused__)), int ch __attribute__((__unused__)))
 {
@@ -1778,7 +1774,6 @@ rl_display_match_list(char **matches, int len, int max)
 }
 
 static const char *
-/*ARGSUSED*/
 _rl_completion_append_character_function(const char *dummy
     __attribute__((__unused__)))
 {
@@ -1792,7 +1787,6 @@ _rl_completion_append_character_function(const char *dummy
 /*
  * complete word at current point
  */
-/* ARGSUSED */
 int
 rl_complete(int ignore __attribute__((__unused__)), int invoking_key)
 {
@@ -1824,7 +1818,6 @@ rl_complete(int ignore __attribute__((__unused__)), int invoking_key)
 }
 
 
-/* ARGSUSED */
 static unsigned char
 _el_rl_complete(EditLine *el __attribute__((__unused__)), int ch)
 {
@@ -1874,7 +1867,6 @@ rl_read_key(void)
 /*
  * reset the terminal
  */
-/* ARGSUSED */
 void
 rl_reset_terminal(const char *p __attribute__((__unused__)))
 {
@@ -1920,7 +1912,6 @@ rl_insert_text(const char *text)
 	return (int)strlen(text);
 }
 
-/*ARGSUSED*/
 int
 rl_newline(int count, int c)
 {
@@ -1930,7 +1921,6 @@ rl_newline(int count, int c)
 	return rl_insert(1, '\n');
 }
 
-/*ARGSUSED*/
 static unsigned char
 rl_bind_wrapper(EditLine *el, unsigned char c)
 {
@@ -2026,7 +2016,6 @@ rl_get_previous_history(int count, int key)
 }
 
 void
-/*ARGSUSED*/
 rl_prep_terminal(int meta_flag)
 {
 	el_set(e, EL_PREP_TERM, 1);
@@ -2245,7 +2234,6 @@ history_get_history_state(void)
 }
 
 int
-/*ARGSUSED*/
 rl_kill_text(int from, int to)
 {
 	return 0;
@@ -2264,20 +2252,17 @@ rl_get_keymap(void)
 }
 
 void
-/*ARGSUSED*/
 rl_set_keymap(Keymap k)
 {
 }
 
 int
-/*ARGSUSED*/
 rl_generic_bind(int type, const char * keyseq, const char * data, Keymap k)
 {
 	return 0;
 }
 
 int
-/*ARGSUSED*/
 rl_bind_key_in_map(int key, rl_command_func_t *fun, Keymap k)
 {
 	return 0;
@@ -2296,7 +2281,6 @@ rl_on_new_line(void)
 }
 
 int
-/*ARGSUSED*/
 rl_set_keyboard_input_timeout(int u __attribute__((__unused__)))
 {
 	return 0;
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index f9ba18d2a8f..2e25491e56d 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: refresh.c,v 1.22 2018/10/11 15:19:09 millert Exp $	*/
+/*	$OpenBSD: refresh.c,v 1.23 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: refresh.c,v 1.50 2016/05/02 16:35:17 christos Exp $	*/
 
 /*-
@@ -352,7 +352,6 @@ re_goto_bottom(EditLine *el)
  *	at dat, maximum length of d is dlen
  */
 static void
-/*ARGSUSED*/
 re_insert(EditLine *el __attribute__((__unused__)),
     wchar_t *d, int dat, int dlen, wchar_t *s, int num)
 {
@@ -403,7 +402,6 @@ re_insert(EditLine *el __attribute__((__unused__)),
  *	delete num characters d at dat, maximum length of d is dlen
  */
 static void
-/*ARGSUSED*/
 re_delete(EditLine *el __attribute__((__unused__)),
     wchar_t *d, int dat, int dlen, int num)
 {
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 58459ec3faf..68c725aefd3 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.27 2016/05/06 13:12:52 schwarze Exp $	*/
+/*	$OpenBSD: search.c,v 1.28 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: search.c,v 1.45 2016/04/18 17:01:19 christos Exp $	*/
 
 /*-
@@ -95,7 +95,6 @@ search_end(EditLine *el)
  *	Handle regular expression errors
  */
 void
-/*ARGSUSED*/
 regerror(const char *msg)
 {
 }
diff --git a/lib/libedit/terminal.c b/lib/libedit/terminal.c
index a2feda87985..7a9db20e15c 100644
--- a/lib/libedit/terminal.c
+++ b/lib/libedit/terminal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: terminal.c,v 1.19 2019/08/07 04:22:16 yasuoka Exp $	*/
+/*	$OpenBSD: terminal.c,v 1.20 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: terminal.c,v 1.17 2016/02/15 15:35:03 christos Exp $	*/
 
 /*-
@@ -1268,7 +1268,6 @@ terminal_writec(EditLine *el, wint_t c)
  *	Print the current termcap characteristics
  */
 protected int
-/*ARGSUSED*/
 terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
     const wchar_t **argv __attribute__((__unused__)))
 {
@@ -1310,7 +1309,6 @@ terminal_telltc(EditLine *el, int argc __attribute__((__unused__)),
  *	Change the current terminal characteristics
  */
 protected int
-/*ARGSUSED*/
 terminal_settc(EditLine *el, int argc __attribute__((__unused__)),
     const wchar_t **argv)
 {
@@ -1389,7 +1387,6 @@ terminal_settc(EditLine *el, int argc __attribute__((__unused__)),
  *	Get the current terminal characteristics
  */
 protected int
-/*ARGSUSED*/
 terminal_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
 {
 	const struct termcapstr *ts;
@@ -1443,7 +1440,6 @@ terminal_gettc(EditLine *el, int argc __attribute__((__unused__)), char **argv)
  *	Print the termcap string out with variable substitution
  */
 protected int
-/*ARGSUSED*/
 terminal_echotc(EditLine *el, int argc __attribute__((__unused__)),
     const wchar_t **argv)
 {
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index 98ee27a8d4e..32a4850ba1b 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.27 2016/05/06 13:12:52 schwarze Exp $	*/
+/*	$OpenBSD: tty.c,v 1.28 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: tty.c,v 1.34 2011/01/27 23:11:40 christos Exp $	*/
 
 /*-
@@ -580,7 +580,6 @@ tty_init(EditLine *el)
  *	Restore the tty to its original settings
  */
 protected void
-/*ARGSUSED*/
 tty_end(EditLine *el)
 {
 	if (el->el_flags & EDIT_DISABLED)
@@ -1144,7 +1143,6 @@ tty_noquotemode(EditLine *el)
  *	Stty builtin
  */
 protected int
-/*ARGSUSED*/
 tty_stty(EditLine *el, int argc __attribute__((__unused__)),
     const wchar_t **argv)
 {
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 2a3042e9561..355fd3516d8 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vi.c,v 1.28 2019/09/04 00:00:49 asou Exp $	*/
+/*	$OpenBSD: vi.c,v 1.29 2023/03/08 04:43:05 guenther Exp $	*/
 /*	$NetBSD: vi.c,v 1.33 2011/02/17 16:44:48 joerg Exp $	*/
 
 /*-
@@ -122,7 +122,6 @@ cv_paste(EditLine *el, wint_t c)
  *	[p]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_paste_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -135,7 +134,6 @@ vi_paste_next(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[P]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_paste_prev(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -148,7 +146,6 @@ vi_paste_prev(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[B]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_prev_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -173,7 +170,6 @@ vi_prev_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[b]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -198,7 +194,6 @@ vi_prev_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[W]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_next_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -222,7 +217,6 @@ vi_next_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[w]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_next_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -277,7 +271,6 @@ vi_change_case(EditLine *el, wint_t c)
  *	[c]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_change_meta(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -294,7 +287,6 @@ vi_change_meta(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[I]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_insert_at_bol(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -310,7 +302,6 @@ vi_insert_at_bol(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[r]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_replace_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -329,7 +320,6 @@ vi_replace_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[R]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_replace_mode(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -345,7 +335,6 @@ vi_replace_mode(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[s]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_substitute_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -360,7 +349,6 @@ vi_substitute_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[S]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_substitute_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -378,7 +366,6 @@ vi_substitute_line(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[C]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_change_to_eol(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -396,7 +383,6 @@ vi_change_to_eol(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[i]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_insert(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -411,7 +397,6 @@ vi_insert(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[a]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_add(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	int ret;
@@ -436,7 +421,6 @@ vi_add(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[A]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_add_at_eol(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -452,7 +436,6 @@ vi_add_at_eol(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[d]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_delete_meta(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -465,7 +448,6 @@ vi_delete_meta(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[E]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_end_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -489,7 +471,6 @@ vi_end_big_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[e]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_end_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -513,7 +494,6 @@ vi_end_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[u]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_undo(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	c_undo_t un = el->el_chared.c_undo;
@@ -540,7 +520,6 @@ vi_undo(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[<ESC>]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_command_mode(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -585,7 +564,6 @@ vi_zero(EditLine *el, wint_t c)
  *	[^H] in insert mode only
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -603,7 +581,6 @@ vi_delete_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[^D]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_list_or_eof(EditLine *el, wint_t c)
 {
 
@@ -640,7 +617,6 @@ vi_list_or_eof(EditLine *el, wint_t c)
  *	[^U]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_kill_line_prev(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	wchar_t *kp, *cp;
@@ -661,7 +637,6 @@ vi_kill_line_prev(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[?]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -674,7 +649,6 @@ vi_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[/]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -687,7 +661,6 @@ vi_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[n]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_repeat_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -702,7 +675,6 @@ vi_repeat_search_next(EditLine *el, wint_t c __attribute__((__unused__)))
  *	Vi repeat current search in the opposite search direction
  *	[N]
  */
-/*ARGSUSED*/
 protected el_action_t
 vi_repeat_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
 {
@@ -721,7 +693,6 @@ vi_repeat_search_prev(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[f]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 0);
@@ -733,7 +704,6 @@ vi_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[F]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 0);
@@ -745,7 +715,6 @@ vi_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[t]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_to_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	return cv_csearch(el, CHAR_FWD, -1, el->el_state.argument, 1);
@@ -757,7 +726,6 @@ vi_to_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[T]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_to_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	return cv_csearch(el, CHAR_BACK, -1, el->el_state.argument, 1);
@@ -769,7 +737,6 @@ vi_to_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[;]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_repeat_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -783,7 +750,6 @@ vi_repeat_next_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[,]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_repeat_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	el_action_t r;
@@ -801,7 +767,6 @@ vi_repeat_prev_char(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[%]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_match(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	const wchar_t match_chars[] = L"()[]{}";
@@ -848,7 +813,6 @@ vi_match(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[U]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_undo_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -862,7 +826,6 @@ vi_undo_line(EditLine *el, wint_t c __attribute__((__unused__)))
  * NB netbsd vi goes to screen column 'n', posix says nth character
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_to_column(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -876,7 +839,6 @@ vi_to_column(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[Y]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_yank_end(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -890,7 +852,6 @@ vi_yank_end(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[y]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_yank(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -902,7 +863,6 @@ vi_yank(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[#]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_comment_out(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 
@@ -924,7 +884,6 @@ __weakref_visible char *my_get_alias_text(const char *)
     __weak_reference(get_alias_text);
 #endif
 protected el_action_t
-/*ARGSUSED*/
 vi_alias(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 #ifdef __weak_reference
@@ -954,7 +913,6 @@ vi_alias(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[G]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_to_history_line(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	int sv_event_no = el->el_history.eventno;
@@ -999,7 +957,6 @@ vi_to_history_line(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[v]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_histedit(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	int fd;
@@ -1088,7 +1045,6 @@ vi_histedit(EditLine *el, wint_t c __attribute__((__unused__)))
  * '_' in vi means 'entire current line', so 'cc' is a synonym for 'c_'
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_history_word(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	const wchar_t *wp = HIST_FIRST(el);
@@ -1138,7 +1094,6 @@ vi_history_word(EditLine *el, wint_t c __attribute__((__unused__)))
  *	[.]
  */
 protected el_action_t
-/*ARGSUSED*/
 vi_redo(EditLine *el, wint_t c __attribute__((__unused__)))
 {
 	c_redo_t *r = &el->el_chared.c_redo;