upstream: Delete obsolete /* ARGSUSED */ lint comments.

ok miod@ millert@

OpenBSD-Commit-ID: 7be168a570264d59e96a7d2d22e927d45fee0e4c
This commit is contained in:
guenther@openbsd.org 2023-03-08 04:43:12 +00:00 committed by Darren Tucker
parent a76085bda8
commit 51875897b8
No known key found for this signature in database
13 changed files with 13 additions and 51 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2.c,v 1.165 2023/03/05 05:34:09 dtucker Exp $ */ /* $OpenBSD: auth2.c,v 1.166 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -177,7 +177,6 @@ do_authentication2(struct ssh *ssh)
ssh->authctxt = NULL; ssh->authctxt = NULL;
} }
/*ARGSUSED*/
static int static int
input_service_request(int type, u_int32_t seq, struct ssh *ssh) input_service_request(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -255,7 +254,6 @@ ensure_minimum_time_since(double start, double seconds)
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
} }
/*ARGSUSED*/
static int static int
input_userauth_request(int type, u_int32_t seq, struct ssh *ssh) input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
{ {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.389 2023/03/03 09:48:51 dtucker Exp $ */ /* $OpenBSD: clientloop.c,v 1.390 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -215,7 +215,6 @@ quit_message(const char *fmt, ...)
* Signal handler for the window change signal (SIGWINCH). This just sets a * Signal handler for the window change signal (SIGWINCH). This just sets a
* flag indicating that the window has changed. * flag indicating that the window has changed.
*/ */
/*ARGSUSED */
static void static void
window_change_handler(int sig) window_change_handler(int sig)
{ {
@ -226,7 +225,6 @@ window_change_handler(int sig)
* Signal handler for signals that cause the program to terminate. These * Signal handler for signals that cause the program to terminate. These
* signals must be trapped to restore terminal modes. * signals must be trapped to restore terminal modes.
*/ */
/*ARGSUSED */
static void static void
signal_handler(int sig) signal_handler(int sig)
{ {

4
kex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.c,v 1.176 2023/03/06 12:14:48 dtucker Exp $ */ /* $OpenBSD: kex.c,v 1.177 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* *
@ -461,7 +461,6 @@ kex_prop_free(char **proposal)
free(proposal); free(proposal);
} }
/* ARGSUSED */
int int
kex_protocol_error(int type, u_int32_t seq, struct ssh *ssh) kex_protocol_error(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -642,7 +641,6 @@ kex_send_kexinit(struct ssh *ssh)
return 0; return 0;
} }
/* ARGSUSED */
int int
kex_input_kexinit(int type, u_int32_t seq, struct ssh *ssh) kex_input_kexinit(int type, u_int32_t seq, struct ssh *ssh)
{ {

4
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.95 2023/01/06 02:39:59 djm Exp $ */ /* $OpenBSD: mux.c,v 1.96 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -186,7 +186,6 @@ static const struct {
}; };
/* Cleanup callback fired on closure of mux client _session_ channel */ /* Cleanup callback fired on closure of mux client _session_ channel */
/* ARGSUSED */
static void static void
mux_master_session_cleanup_cb(struct ssh *ssh, int cid, int force, void *unused) mux_master_session_cleanup_cb(struct ssh *ssh, int cid, int force, void *unused)
{ {
@ -208,7 +207,6 @@ mux_master_session_cleanup_cb(struct ssh *ssh, int cid, int force, void *unused)
} }
/* Cleanup callback fired on closure of mux client _control_ channel */ /* Cleanup callback fired on closure of mux client _control_ channel */
/* ARGSUSED */
static void static void
mux_master_control_cleanup_cb(struct ssh *ssh, int cid, int force, void *unused) mux_master_control_cleanup_cb(struct ssh *ssh, int cid, int force, void *unused)
{ {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: progressmeter.c,v 1.51 2023/02/22 03:56:43 djm Exp $ */ /* $OpenBSD: progressmeter.c,v 1.52 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2003 Nils Nordman. All rights reserved. * Copyright (c) 2003 Nils Nordman. All rights reserved.
* *
@ -238,7 +238,6 @@ refresh_progress_meter(int force_update)
free(obuf); free(obuf);
} }
/*ARGSUSED*/
static void static void
sig_alarm(int ignore) sig_alarm(int ignore)
{ {
@ -281,7 +280,6 @@ stop_progress_meter(void)
atomicio(vwrite, STDOUT_FILENO, "\n", 1); atomicio(vwrite, STDOUT_FILENO, "\n", 1);
} }
/*ARGSUSED*/
static void static void
sig_winch(int sig) sig_winch(int sig)
{ {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: serverloop.c,v 1.235 2023/03/05 05:34:09 dtucker Exp $ */ /* $OpenBSD: serverloop.c,v 1.236 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -112,14 +112,12 @@ bind_permitted(int port, uid_t uid)
return 1; return 1;
} }
/*ARGSUSED*/
static void static void
sigchld_handler(int sig) sigchld_handler(int sig)
{ {
child_terminated = 1; child_terminated = 1;
} }
/*ARGSUSED*/
static void static void
sigterm_handler(int sig) sigterm_handler(int sig)
{ {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.168 2023/01/11 05:39:38 djm Exp $ */ /* $OpenBSD: sftp-client.c,v 1.169 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -149,7 +149,6 @@ request_find(struct requests *requests, u_int id)
return req; return req;
} }
/* ARGSUSED */
static int static int
sftpio(void *_bwlimit, size_t amount) sftpio(void *_bwlimit, size_t amount)
{ {

7
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.226 2023/02/27 22:12:40 dtucker Exp $ */ /* $OpenBSD: sftp.c,v 1.227 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -217,7 +217,6 @@ static const struct CMD cmds[] = {
{ NULL, -1, -1, -1 } { NULL, -1, -1, -1 }
}; };
/* ARGSUSED */
static void static void
killchild(int signo) killchild(int signo)
{ {
@ -232,7 +231,6 @@ killchild(int signo)
_exit(1); _exit(1);
} }
/* ARGSUSED */
static void static void
suspchild(int signo) suspchild(int signo)
{ {
@ -244,7 +242,6 @@ suspchild(int signo)
kill(getpid(), SIGSTOP); kill(getpid(), SIGSTOP);
} }
/* ARGSUSED */
static void static void
cmd_interrupt(int signo) cmd_interrupt(int signo)
{ {
@ -256,14 +253,12 @@ cmd_interrupt(int signo)
errno = olderrno; errno = olderrno;
} }
/* ARGSUSED */
static void static void
read_interrupt(int signo) read_interrupt(int signo)
{ {
interrupted = 1; interrupted = 1;
} }
/*ARGSUSED*/
static void static void
sigchld_handler(int sig) sigchld_handler(int sig)
{ {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.295 2023/03/05 05:34:09 dtucker Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.296 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1960,7 +1960,6 @@ cleanup_exit(int i)
_exit(i); _exit(i);
} }
/*ARGSUSED*/
static void static void
cleanup_handler(int sig) cleanup_handler(int sig)
{ {

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ecdsa-sk.c,v 1.17 2022/10/28 00:44:44 djm Exp $ */ /* $OpenBSD: ssh-ecdsa-sk.c,v 1.18 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2010 Damien Miller. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved.
@ -230,7 +230,6 @@ webauthn_check_prepare_hash(const u_char *data, size_t datalen,
return r; return r;
} }
/* ARGSUSED */
static int static int
ssh_ecdsa_sk_verify(const struct sshkey *key, ssh_ecdsa_sk_verify(const struct sshkey *key,
const u_char *sig, size_t siglen, const u_char *sig, size_t siglen,

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ecdsa.c,v 1.25 2022/10/28 00:44:44 djm Exp $ */ /* $OpenBSD: ssh-ecdsa.c,v 1.26 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2010 Damien Miller. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved.
@ -222,7 +222,6 @@ ssh_ecdsa_deserialize_private(const char *ktype, struct sshbuf *b,
return r; return r;
} }
/* ARGSUSED */
static int static int
ssh_ecdsa_sign(struct sshkey *key, ssh_ecdsa_sign(struct sshkey *key,
u_char **sigp, size_t *lenp, u_char **sigp, size_t *lenp,
@ -288,7 +287,6 @@ ssh_ecdsa_sign(struct sshkey *key,
return ret; return ret;
} }
/* ARGSUSED */
static int static int
ssh_ecdsa_verify(const struct sshkey *key, ssh_ecdsa_verify(const struct sshkey *key,
const u_char *sig, size_t siglen, const u_char *sig, size_t siglen,

View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.364 2023/03/06 12:14:48 dtucker Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.365 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -489,7 +489,6 @@ ssh_userauth2(struct ssh *ssh, const char *local_user,
} }
} }
/* ARGSUSED */
static int static int
input_userauth_service_accept(int type, u_int32_t seq, struct ssh *ssh) input_userauth_service_accept(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -521,7 +520,6 @@ input_userauth_service_accept(int type, u_int32_t seq, struct ssh *ssh)
return r; return r;
} }
/* ARGSUSED */
static int static int
input_userauth_ext_info(int type, u_int32_t seqnr, struct ssh *ssh) input_userauth_ext_info(int type, u_int32_t seqnr, struct ssh *ssh)
{ {
@ -566,7 +564,6 @@ userauth(struct ssh *ssh, char *authlist)
} }
} }
/* ARGSUSED */
static int static int
input_userauth_error(int type, u_int32_t seq, struct ssh *ssh) input_userauth_error(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -574,7 +571,6 @@ input_userauth_error(int type, u_int32_t seq, struct ssh *ssh)
return 0; return 0;
} }
/* ARGSUSED */
static int static int
input_userauth_banner(int type, u_int32_t seq, struct ssh *ssh) input_userauth_banner(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -594,7 +590,6 @@ input_userauth_banner(int type, u_int32_t seq, struct ssh *ssh)
return r; return r;
} }
/* ARGSUSED */
static int static int
input_userauth_success(int type, u_int32_t seq, struct ssh *ssh) input_userauth_success(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -627,7 +622,6 @@ input_userauth_success_unexpected(int type, u_int32_t seq, struct ssh *ssh)
} }
#endif #endif
/* ARGSUSED */
static int static int
input_userauth_failure(int type, u_int32_t seq, struct ssh *ssh) input_userauth_failure(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -688,7 +682,6 @@ format_identity(Identity *id)
return ret; return ret;
} }
/* ARGSUSED */
static int static int
input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh) input_userauth_pk_ok(int type, u_int32_t seq, struct ssh *ssh)
{ {
@ -896,7 +889,6 @@ process_gssapi_token(struct ssh *ssh, gss_buffer_t recv_tok)
return status; return status;
} }
/* ARGSUSED */
static int static int
input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh) input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
{ {
@ -941,7 +933,6 @@ input_gssapi_response(int type, u_int32_t plen, struct ssh *ssh)
return r; return r;
} }
/* ARGSUSED */
static int static int
input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh) input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh)
{ {
@ -974,7 +965,6 @@ input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh)
return r; return r;
} }
/* ARGSUSED */
static int static int
input_gssapi_errtok(int type, u_int32_t plen, struct ssh *ssh) input_gssapi_errtok(int type, u_int32_t plen, struct ssh *ssh)
{ {
@ -1009,7 +999,6 @@ input_gssapi_errtok(int type, u_int32_t plen, struct ssh *ssh)
return 0; return 0;
} }
/* ARGSUSED */
static int static int
input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh) input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
{ {
@ -1087,7 +1076,6 @@ userauth_passwd(struct ssh *ssh)
/* /*
* parse PASSWD_CHANGEREQ, prompt user and send SSH2_MSG_USERAUTH_REQUEST * parse PASSWD_CHANGEREQ, prompt user and send SSH2_MSG_USERAUTH_REQUEST
*/ */
/* ARGSUSED */
static int static int
input_userauth_passwd_changereq(int type, u_int32_t seqnr, struct ssh *ssh) input_userauth_passwd_changereq(int type, u_int32_t seqnr, struct ssh *ssh)
{ {

6
sshd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.599 2023/03/06 12:14:48 dtucker Exp $ */ /* $OpenBSD: sshd.c,v 1.600 2023/03/08 04:43:12 guenther Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -294,7 +294,6 @@ close_startup_pipes(void)
* the server key). * the server key).
*/ */
/*ARGSUSED*/
static void static void
sighup_handler(int sig) sighup_handler(int sig)
{ {
@ -324,7 +323,6 @@ sighup_restart(void)
/* /*
* Generic signal handler for terminating signals in the master daemon. * Generic signal handler for terminating signals in the master daemon.
*/ */
/*ARGSUSED*/
static void static void
sigterm_handler(int sig) sigterm_handler(int sig)
{ {
@ -335,7 +333,6 @@ sigterm_handler(int sig)
* SIGCHLD handler. This is called whenever a child dies. This will then * SIGCHLD handler. This is called whenever a child dies. This will then
* reap any zombies left by exited children. * reap any zombies left by exited children.
*/ */
/*ARGSUSED*/
static void static void
main_sigchld_handler(int sig) main_sigchld_handler(int sig)
{ {
@ -352,7 +349,6 @@ main_sigchld_handler(int sig)
/* /*
* Signal handler for the alarm after the login grace period has expired. * Signal handler for the alarm after the login grace period has expired.
*/ */
/*ARGSUSED*/
static void static void
grace_alarm_handler(int sig) grace_alarm_handler(int sig)
{ {