prototype pedant. not very creative...

- () -> (void)
- no variable names

49 files changed, 356 insertions, 426 deletions

diff --git a/usr.bin/ssh/atomicio.h b/usr.bin/ssh/atomicio.h
index d878687d63d..e569d38c603 100644
--- a/usr.bin/ssh/atomicio.h
+++ b/usr.bin/ssh/atomicio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atomicio.h,v 1.3 2001/03/02 18:54:30 deraadt Exp $	*/
+/*	$OpenBSD: atomicio.h,v 1.4 2001/06/26 06:32:46 itojun Exp $	*/
 
 /*
  * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
@@ -28,4 +28,4 @@
 /*
  * Ensure all of data on socket comes through. f==read || f==write
  */
-ssize_t	atomicio(ssize_t (*f)(), int fd, void *s, size_t n);
+ssize_t	atomicio(ssize_t (*)(), int, void *, size_t);
diff --git a/usr.bin/ssh/auth-options.h b/usr.bin/ssh/auth-options.h
index 8ee26949103..db0e6e8fb9d 100644
--- a/usr.bin/ssh/auth-options.h
+++ b/usr.bin/ssh/auth-options.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* $OpenBSD: auth-options.h,v 1.8 2001/01/21 19:05:42 markus Exp $ */
+/* $OpenBSD: auth-options.h,v 1.9 2001/06/26 06:32:47 itojun Exp $ */
 
 #ifndef AUTH_OPTIONS_H
 #define AUTH_OPTIONS_H
@@ -35,8 +35,7 @@ extern struct envstring *custom_environment;
  * side effect: sets key option flags
  */
 int
-auth_parse_options(struct passwd *pw, char *options, char *file,
-    u_long linenum);
+auth_parse_options(struct passwd *, char *, char *, u_long);
 
 /* reset options flags */
 void	auth_clear_options(void);
diff --git a/usr.bin/ssh/auth.h b/usr.bin/ssh/auth.h
index ea7ca254c8e..1d059fe9882 100644
--- a/usr.bin/ssh/auth.h
+++ b/usr.bin/ssh/auth.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $OpenBSD: auth.h,v 1.19 2001/06/25 17:54:49 provos Exp $
+ * $OpenBSD: auth.h,v 1.20 2001/06/26 06:32:47 itojun Exp $
  */
 #ifndef AUTH_H
 #define AUTH_H
@@ -79,45 +79,44 @@ struct KbdintDevice
  * authentication succeeds.  If ignore_rhosts is non-zero, this will not
  * consider .rhosts and .shosts (/etc/hosts.equiv will still be used).
  */
-int     auth_rhosts(struct passwd * pw, const char *client_user);
+int     auth_rhosts(struct passwd *, const char *);
 
 /* extended interface similar to auth_rhosts() */
 int
-auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
-    const char *ipaddr);
+auth_rhosts2(struct passwd *, const char *, const char *, const char *);
 
 /*
  * Tries to authenticate the user using the .rhosts file and the host using
  * its host key.  Returns true if authentication succeeds.
  */
 int
-auth_rhosts_rsa(struct passwd * pw, const char *client_user, RSA* client_host_key);
+auth_rhosts_rsa(struct passwd *, const char *, RSA *);
 
 /*
  * Tries to authenticate the user using password.  Returns true if
  * authentication succeeds.
  */
-int     auth_password(Authctxt *authctxt, const char *password);
+int     auth_password(Authctxt *, const char *);
 
 /*
  * Performs the RSA authentication dialog with the client.  This returns 0 if
  * the client could not be authenticated, and 1 if authentication was
  * successful.  This may exit if there is a serious protocol violation.
  */
-int     auth_rsa(struct passwd * pw, BIGNUM * client_n);
+int     auth_rsa(struct passwd *, BIGNUM *);
 
 /*
  * Parses an RSA key (number of bits, e, n) from a string.  Moves the pointer
  * over the key.  Skips any whitespace at the beginning and at end.
  */
-int     auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n);
+int     auth_rsa_read_key(char **, u_int *, BIGNUM *, BIGNUM *);
 
 /*
  * Performs the RSA authentication challenge-response dialog with the client,
  * and returns true (non-zero) if the client gave the correct answer to our
  * challenge; returns zero if the client gives a wrong answer.
  */
-int     auth_rsa_challenge_dialog(RSA *pk);
+int     auth_rsa_challenge_dialog(RSA *);
 
 #ifdef KRB4
 #include <krb.h>
@@ -126,17 +125,17 @@ int     auth_rsa_challenge_dialog(RSA *pk);
  * if the client could not be authenticated, and 1 if authentication was
  * successful.  This may exit if there is a serious protocol violation.
  */
-int     auth_krb4(const char *server_user, KTEXT auth, char **client);
-int     krb4_init(uid_t uid);
-void    krb4_cleanup_proc(void *ignore);
-int	auth_krb4_password(struct passwd * pw, const char *password);
+int     auth_krb4(const char *, KTEXT, char **);
+int     krb4_init(uid_t);
+void    krb4_cleanup_proc(void *);
+int	auth_krb4_password(struct passwd *, const char *);
 
 #ifdef AFS
 #include <kafs.h>
 
 /* Accept passed Kerberos v4 ticket-granting ticket and AFS tokens. */
-int     auth_kerberos_tgt(struct passwd * pw, const char *string);
-int     auth_afs_token(struct passwd * pw, const char *token_string);
+int     auth_kerberos_tgt(struct passwd *, const char *);
+int     auth_afs_token(struct passwd *, const char *);
 #endif				/* AFS */
 
 #endif				/* KRB4 */
@@ -145,33 +144,32 @@ void	do_authentication(void);
 void	do_authentication2(void);
 
 Authctxt *authctxt_new(void);
-void	auth_log(Authctxt *authctxt, int authenticated, char *method, char *info);
-void	userauth_finish(Authctxt *authctxt, int authenticated, char *method);
-int	auth_root_allowed(char *method);
+void	auth_log(Authctxt *, int, char *, char *);
+void	userauth_finish(Authctxt *, int, char *);
+int	auth_root_allowed(char *);
 
-int	auth2_challenge(Authctxt *authctxt, char *devs);
+int	auth2_challenge(Authctxt *, char *);
 
-int	allowed_user(struct passwd * pw);
+int	allowed_user(struct passwd *);
 
-char	*get_challenge(Authctxt *authctxt);
-int	verify_response(Authctxt *authctxt, const char *response);
+char	*get_challenge(Authctxt *);
+int	verify_response(Authctxt *, const char *);
 
 struct passwd * auth_get_user(void);
 
 /* expand a filename - return buffer is allocated by xmalloc */
-char	*expand_filename(const char *template, struct passwd *pw);
-char	*authorized_keys_file(struct passwd *pw);
-char	*authorized_keys_file2(struct passwd *pw);
+char	*expand_filename(const char *, struct passwd *);
+char	*authorized_keys_file(struct passwd *);
+char	*authorized_keys_file2(struct passwd *);
 
 /* check a file and the path to it */
 int
-secure_filename(FILE *f, const char *file, struct passwd *pw,
-    char *err, size_t errlen);
+secure_filename(FILE *, const char *, struct passwd *, char *, size_t);
 
 /* helper for hostbased auth */
 HostStatus
-check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host,
-    const char *sysfile, const char *userfile);
+check_key_in_hostfiles(struct passwd *, Key *, const char *,
+    const char *, const char *);
 
 #define AUTH_FAIL_MAX 6
 #define AUTH_FAIL_LOG (AUTH_FAIL_MAX/2)
diff --git a/usr.bin/ssh/authfd.h b/usr.bin/ssh/authfd.h
index 04439fd07e4..4fe35aff8b6 100644
--- a/usr.bin/ssh/authfd.h
+++ b/usr.bin/ssh/authfd.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: authfd.h,v 1.17 2001/06/26 04:59:59 markus Exp $"); */
+/* RCSID("$OpenBSD: authfd.h,v 1.18 2001/06/26 06:32:47 itojun Exp $"); */
 
 #ifndef AUTHFD_H
 #define AUTHFD_H
@@ -62,7 +62,7 @@ int     ssh_get_authentication_socket(void);
  * ssh_get_authentication_socket().  Depending on the way the descriptor was
  * obtained, this may close the descriptor.
  */
-void    ssh_close_authentication_socket(int authfd);
+void    ssh_close_authentication_socket(int);
 
 /*
  * Opens and connects a private socket for communication with the
@@ -76,19 +76,19 @@ AuthenticationConnection *ssh_get_authentication_connection(void);
  * Closes the connection to the authentication agent and frees any associated
  * memory.
  */
-void    ssh_close_authentication_connection(AuthenticationConnection *auth);
+void    ssh_close_authentication_connection(AuthenticationConnection *);
 
 /*
  * Returns the number authentication identity held by the agent.
  */
-int	ssh_get_num_identities(AuthenticationConnection *auth, int version);
+int	ssh_get_num_identities(AuthenticationConnection *, int);
 
 /*
  * Returns the first authentication identity held by the agent or NULL if
  * no identies are available. Caller must free comment and key.
  * Note that you cannot mix calls with different versions.
  */
-Key	*ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version);
+Key	*ssh_get_first_identity(AuthenticationConnection *, char **, int);
 
 /*
  * Returns the next authentication identity for the agent.  Other functions
@@ -96,25 +96,20 @@ Key	*ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int
  * function.  This returns NULL if there are no more identities.  The caller
  * must free key and comment after a successful return.
  */
-Key	*ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version);
+Key	*ssh_get_next_identity(AuthenticationConnection *, char **, int);
 
 /*
  * Requests the agent to decrypt the given challenge.  Returns true if the
  * agent claims it was able to decrypt it.
  */
 int
-ssh_decrypt_challenge(AuthenticationConnection *auth,
-    Key *key, BIGNUM * challenge,
-    u_char session_id[16],
-    u_int response_type,
-    u_char response[16]);
+ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
+    u_int, u_char[16]);
 
 /* Requests the agent to sign data using key */
 int
-ssh_agent_sign(AuthenticationConnection *auth,
-    Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen);
+ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, int *,
+    u_char *, int);
 
 /*
  * Adds an identity to the authentication server.  This call is not meant to
@@ -122,23 +117,22 @@ ssh_agent_sign(AuthenticationConnection *auth,
  * successfully added.
  */
 int
-ssh_add_identity(AuthenticationConnection *auth, Key *key,
-    const char *comment);
+ssh_add_identity(AuthenticationConnection *, Key *, const char *);
 
 /*
  * Removes the identity from the authentication server.  This call is not
  * meant to be used by normal applications.  This returns true if the
  * identity was successfully added.
  */
-int     ssh_remove_identity(AuthenticationConnection *auth, Key *key);
+int     ssh_remove_identity(AuthenticationConnection *, Key *);
 
 /*
  * Removes all identities from the authentication agent.  This call is not
  * meant to be used by normal applications.  This returns true if the
  * operation was successful.
  */
-int	ssh_remove_all_identities(AuthenticationConnection *auth, int version);
+int	ssh_remove_all_identities(AuthenticationConnection *, int);
 
-int	ssh_update_card(AuthenticationConnection *auth, int add, int reader_id);
+int	ssh_update_card(AuthenticationConnection *, int, int);
 
 #endif				/* AUTHFD_H */
diff --git a/usr.bin/ssh/authfile.h b/usr.bin/ssh/authfile.h
index da90cd91364..982645d5034 100644
--- a/usr.bin/ssh/authfile.h
+++ b/usr.bin/ssh/authfile.h
@@ -10,27 +10,24 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* $OpenBSD: authfile.h,v 1.6 2001/03/26 08:07:08 markus Exp $ */
+/* $OpenBSD: authfile.h,v 1.7 2001/06/26 06:32:48 itojun Exp $ */
 
 #ifndef AUTHFILE_H
 #define AUTHFILE_H
 
 int
-key_save_private(Key *key, const char *filename, const char *passphrase,
-    const char *comment);
+key_save_private(Key *, const char *, const char *, const char *);
 
 Key *
-key_load_public(const char *filename, char **commentp);
+key_load_public(const char *, char **);
 
 Key *
-key_load_public_type(int type, const char *filename, char **commentp);
+key_load_public_type(int, const char *, char **);
 
 Key *
-key_load_private(const char *filename, const char *passphrase,
-    char **commentp);
+key_load_private(const char *, const char *, char **);
 
 Key *
-key_load_private_type(int type, const char *filename, const char *passphrase,
-    char **commentp);
+key_load_private_type(int, const char *, const char *, char **);
 
 #endif
diff --git a/usr.bin/ssh/bufaux.h b/usr.bin/ssh/bufaux.h
index 8902ec2a8a0..c2b1dc99d83 100644
--- a/usr.bin/ssh/bufaux.h
+++ b/usr.bin/ssh/bufaux.h
@@ -10,7 +10,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: bufaux.h,v 1.11 2001/01/21 19:05:45 markus Exp $"); */
+/* RCSID("$OpenBSD: bufaux.h,v 1.12 2001/06/26 06:32:48 itojun Exp $"); */
 
 #ifndef BUFAUX_H
 #define BUFAUX_H
@@ -22,26 +22,26 @@
  * Stores an BIGNUM in the buffer with a 2-byte msb first bit count, followed
  * by (bits+7)/8 bytes of binary data, msb first.
  */
-void    buffer_put_bignum(Buffer * buffer, BIGNUM * value);
-void    buffer_put_bignum2(Buffer * buffer, BIGNUM * value);
+void    buffer_put_bignum(Buffer *, BIGNUM *);
+void    buffer_put_bignum2(Buffer *, BIGNUM *);
 
 /* Retrieves an BIGNUM from the buffer. */
-int     buffer_get_bignum(Buffer * buffer, BIGNUM * value);
-int	buffer_get_bignum2(Buffer *buffer, BIGNUM * value);
+int     buffer_get_bignum(Buffer *, BIGNUM *);
+int	buffer_get_bignum2(Buffer *, BIGNUM *);
 
 /* Returns an integer from the buffer (4 bytes, msb first). */
-u_int buffer_get_int(Buffer * buffer);
-u_int64_t buffer_get_int64(Buffer *buffer);
+u_int buffer_get_int(Buffer *);
+u_int64_t buffer_get_int64(Buffer *);
 
 /* Stores an integer in the buffer in 4 bytes, msb first. */
-void    buffer_put_int(Buffer * buffer, u_int value);
-void	buffer_put_int64(Buffer *buffer, u_int64_t value);
+void    buffer_put_int(Buffer *, u_int);
+void	buffer_put_int64(Buffer *, u_int64_t);
 
 /* Returns a character from the buffer (0 - 255). */
-int     buffer_get_char(Buffer * buffer);
+int     buffer_get_char(Buffer *);
 
 /* Stores a character in the buffer. */
-void    buffer_put_char(Buffer * buffer, int value);
+void    buffer_put_char(Buffer *, int);
 
 /*
  * Returns an arbitrary binary string from the buffer.  The string cannot be
@@ -51,10 +51,10 @@ void    buffer_put_char(Buffer * buffer, int value);
  * stored there.  A null character will be automatically appended to the
  * returned string, and is not counted in length.
  */
-char   *buffer_get_string(Buffer * buffer, u_int *length_ptr);
+char   *buffer_get_string(Buffer *, u_int *);
 
 /* Stores and arbitrary binary string in the buffer. */
-void    buffer_put_string(Buffer * buffer, const void *buf, u_int len);
-void	buffer_put_cstring(Buffer *buffer, const char *s);
+void    buffer_put_string(Buffer *, const void *, u_int);
+void	buffer_put_cstring(Buffer *, const char *);
 
 #endif				/* BUFAUX_H */
diff --git a/usr.bin/ssh/buffer.h b/usr.bin/ssh/buffer.h
index f3c509dfadb..5e9fc278d9f 100644
--- a/usr.bin/ssh/buffer.h
+++ b/usr.bin/ssh/buffer.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: buffer.h,v 1.7 2000/12/19 23:17:55 markus Exp $"); */
+/* RCSID("$OpenBSD: buffer.h,v 1.8 2001/06/26 06:32:48 itojun Exp $"); */
 
 #ifndef BUFFER_H
 #define BUFFER_H
@@ -23,44 +23,44 @@ typedef struct {
 	u_int end;	/* Offset of last byte containing data. */
 }       Buffer;
 /* Initializes the buffer structure. */
-void    buffer_init(Buffer * buffer);
+void    buffer_init(Buffer *);
 
 /* Frees any memory used for the buffer. */
-void    buffer_free(Buffer * buffer);
+void    buffer_free(Buffer *);
 
 /* Clears any data from the buffer, making it empty.  This does not actually
    zero the memory. */
-void    buffer_clear(Buffer * buffer);
+void    buffer_clear(Buffer *);
 
 /* Appends data to the buffer, expanding it if necessary. */
-void    buffer_append(Buffer * buffer, const char *data, u_int len);
+void    buffer_append(Buffer *, const char *, u_int);
 
 /*
  * Appends space to the buffer, expanding the buffer if necessary. This does
  * not actually copy the data into the buffer, but instead returns a pointer
  * to the allocated region.
  */
-void    buffer_append_space(Buffer * buffer, char **datap, u_int len);
+void    buffer_append_space(Buffer *, char **, u_int);
 
 /* Returns the number of bytes of data in the buffer. */
-u_int buffer_len(Buffer * buffer);
+u_int buffer_len(Buffer *);
 
 /* Gets data from the beginning of the buffer. */
-void    buffer_get(Buffer * buffer, char *buf, u_int len);
+void    buffer_get(Buffer *, char *, u_int);
 
 /* Consumes the given number of bytes from the beginning of the buffer. */
-void    buffer_consume(Buffer * buffer, u_int bytes);
+void    buffer_consume(Buffer *, u_int);
 
 /* Consumes the given number of bytes from the end of the buffer. */
-void    buffer_consume_end(Buffer * buffer, u_int bytes);
+void    buffer_consume_end(Buffer *, u_int);
 
 /* Returns a pointer to the first used byte in the buffer. */
-char   *buffer_ptr(Buffer * buffer);
+char   *buffer_ptr(Buffer *);
 
 /*
  * Dumps the contents of the buffer to stderr in hex.  This intended for
  * debugging purposes only.
  */
-void    buffer_dump(Buffer * buffer);
+void    buffer_dump(Buffer *);
 
 #endif				/* BUFFER_H */
diff --git a/usr.bin/ssh/canohost.h b/usr.bin/ssh/canohost.h
index 36fb345a122..66e64d506e0 100644
--- a/usr.bin/ssh/canohost.h
+++ b/usr.bin/ssh/canohost.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: canohost.h,v 1.6 2001/04/12 19:15:24 markus Exp $	*/
+/*	$OpenBSD: canohost.h,v 1.7 2001/06/26 06:32:49 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -17,7 +17,7 @@
  * connection (as returned by packet_get_connection).  The host name is
  * cached, so it is efficient to call this several times.
  */
-const char *get_canonical_hostname(int reverse_mapping_check);
+const char *get_canonical_hostname(int);
 
 /*
  * Returns the IP-address of the remote host as a string.  The returned
@@ -25,13 +25,13 @@ const char *get_canonical_hostname(int reverse_mapping_check);
  */
 const char *get_remote_ipaddr(void);
 
-const char *get_remote_name_or_ip(u_int utmp_len, int reverse_mapping_check);
+const char *get_remote_name_or_ip(u_int, int);
 
 /* Returns the ipaddr/port number of the peer of the socket. */
-char *	get_peer_ipaddr(int socket);
-int     get_peer_port(int sock);
-char *	get_local_ipaddr(int socket);
-char *	get_local_name(int socket);
+char *	get_peer_ipaddr(int);
+int     get_peer_port(int);
+char *	get_local_ipaddr(int);
+char *	get_local_name(int);
 
 /* Returns the port number of the remote/local host. */
 int     get_remote_port(void);
diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index 0ce8372bd31..3a114e070e3 100644
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/channels.h
@@ -32,7 +32,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: channels.h,v 1.40 2001/06/25 08:25:36 markus Exp $"); */
+/* RCSID("$OpenBSD: channels.h,v 1.41 2001/06/26 06:32:49 itojun Exp $"); */
 
 #ifndef CHANNEL_H
 #define CHANNEL_H
@@ -65,8 +65,8 @@
 struct Channel;
 typedef struct Channel Channel;
 
-typedef void channel_callback_fn(int id, void *arg);
-typedef int channel_filter_fn(struct Channel *c, char *buf, int len);
+typedef void channel_callback_fn(int, void *);
+typedef int channel_filter_fn(struct Channel *, char *, int);
 
 struct Channel {
 	int     type;		/* channel type/state */
@@ -142,44 +142,39 @@ struct Channel {
 
 /* channel management */
 
-Channel	*channel_lookup(int id);
-Channel *
-channel_new(char *ctype, int type, int rfd, int wfd, int efd,
-    int window, int maxpack, int extusage, char *remote_name, int nonblock);
-void
-channel_set_fds(int id, int rfd, int wfd, int efd,
-    int extusage, int nonblock);
-void    channel_free(Channel *c);
+Channel	*channel_lookup(int);
+Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
+void	channel_set_fds(int, int, int, int, int, int);
+void    channel_free(Channel *);
 void    channel_free_all(void);
 
-void	channel_send_open(int id);
-void	channel_request(int id, char *service, int wantconfirm);
-void	channel_request_start(int id, char *service, int wantconfirm);
-void	channel_register_callback(int id, int mtype, channel_callback_fn *fn, void *arg);
-void	channel_register_cleanup(int id, channel_callback_fn *fn);
-void	channel_register_filter(int id, channel_filter_fn *fn);
-void	channel_cancel_cleanup(int id);
+void	channel_send_open(int);
+void	channel_request(int, char *, int);
+void	channel_request_start(int, char *, int);
+void	channel_register_callback(int, int mtype, channel_callback_fn *, void *);
+void	channel_register_cleanup(int, channel_callback_fn *);
+void	channel_register_filter(int, channel_filter_fn *);
+void	channel_cancel_cleanup(int);
 
 /* protocol handler */
 
-void	channel_input_channel_request(int type, int plen, void *ctxt);
-void	channel_input_close(int type, int plen, void *ctxt);
-void	channel_input_close_confirmation(int type, int plen, void *ctxt);
-void	channel_input_data(int type, int plen, void *ctxt);
-void	channel_input_extended_data(int type, int plen, void *ctxt);
-void	channel_input_ieof(int type, int plen, void *ctxt);
-void	channel_input_oclose(int type, int plen, void *ctxt);
-void	channel_input_open_confirmation(int type, int plen, void *ctxt);
-void	channel_input_open_failure(int type, int plen, void *ctxt);
-void	channel_input_port_open(int type, int plen, void *ctxt);
-void	channel_input_window_adjust(int type, int plen, void *ctxt);
+void	channel_input_channel_request(int, int, void *);
+void	channel_input_close(int, int, void *);
+void	channel_input_close_confirmation(int, int, void *);
+void	channel_input_data(int, int, void *);
+void	channel_input_extended_data(int, int, void *);
+void	channel_input_ieof(int, int, void *);
+void	channel_input_oclose(int, int, void *);
+void	channel_input_open_confirmation(int, int, void *);
+void	channel_input_open_failure(int, int, void *);
+void	channel_input_port_open(int, int, void *);
+void	channel_input_window_adjust(int, int, void *);
 
 /* file descriptor handling (read/write) */
 
 void
-channel_prepare_select(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
-    int rekeying);
-void    channel_after_select(fd_set * readset, fd_set * writeset);
+channel_prepare_select(fd_set **, fd_set **, int *, int);
+void    channel_after_select(fd_set *, fd_set *);
 void    channel_output_poll(void);
 
 int     channel_not_very_much_buffered_data(void);
@@ -191,45 +186,41 @@ int	channel_find_open(void);
 
 /* channel_tcpfwd.c */
 int
-channel_request_local_forwarding(u_short listen_port,
-    const char *host_to_connect, u_short port_to_connect, int gateway_ports);
+channel_request_local_forwarding(u_short, const char *, u_short, int);
 int
-channel_request_forwarding(const char *listen_address, u_short listen_port,
-    const char *host_to_connect, u_short port_to_connect, int gateway_ports,
-    int remote_fwd);
+channel_request_forwarding(const char *, u_short, const char *, u_short, int,
+    int);
 void
-channel_request_remote_forwarding(u_short port, const char *host,
-    u_short remote_port);
+channel_request_remote_forwarding(u_short, const char *, u_short);
 void    channel_permit_all_opens(void);
-void	channel_add_permitted_opens(char *host, int port);
+void	channel_add_permitted_opens(char *, int);
 void	channel_clear_permitted_opens(void);
-void    channel_input_port_forward_request(int is_root, int gateway_ports);
-int	channel_connect_to(const char *host, u_short host_port);
-int	channel_connect_by_listen_adress(u_short listen_port);
+void    channel_input_port_forward_request(int, int);
+int	channel_connect_to(const char *, u_short);
+int	channel_connect_by_listen_adress(u_short);
 
 /* x11 forwarding */
 
 int	x11_connect_display(void);
-char   *x11_create_display(int screen);
-char   *x11_create_display_inet(int screen, int x11_display_offset);
-void    x11_input_open(int type, int plen, void *ctxt);
+char   *x11_create_display(int);
+char   *x11_create_display_inet(int, int);
+void    x11_input_open(int, int, void *);
 void    x11_request_forwarding(void);
 void
-x11_request_forwarding_with_spoofing(int client_session_id,
-    const char *proto, const char *data);
-void	deny_input_open(int type, int plen, void *ctxt);
+x11_request_forwarding_with_spoofing(int, const char *, const char *);
+void	deny_input_open(int, int, void *);
 
 /* agent forwarding */
 
 void    auth_request_forwarding(void);
 char   *auth_get_socket_name(void);
-void	auth_sock_cleanup_proc(void *pw);
-int     auth_input_request_forwarding(struct passwd * pw);
-void    auth_input_open_request(int type, int plen, void *ctxt);
+void	auth_sock_cleanup_proc(void *);
+int     auth_input_request_forwarding(struct passwd *);
+void    auth_input_open_request(int, int, void *);
 
 /* channel close */
 
-typedef void    chan_event_fn(Channel * c);
+typedef void    chan_event_fn(Channel *);
 
 /* for the input state */
 extern chan_event_fn	*chan_rcvd_oclose;
@@ -241,9 +232,9 @@ extern chan_event_fn	*chan_rcvd_ieof;
 extern chan_event_fn	*chan_write_failed;
 extern chan_event_fn	*chan_obuf_empty;
 
-int	chan_is_dead(Channel * c);
-void	chan_mark_dead(Channel * c);
-void    chan_init_iostates(Channel * c);
+int	chan_is_dead(Channel *);
+void	chan_mark_dead(Channel *);
+void    chan_init_iostates(Channel *);
 void	chan_init(void);
 
 #endif
diff --git a/usr.bin/ssh/cipher.h b/usr.bin/ssh/cipher.h
index 2ad4979c272..16dd06230f6 100644
--- a/usr.bin/ssh/cipher.h
+++ b/usr.bin/ssh/cipher.h
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* RCSID("$OpenBSD: cipher.h,v 1.26 2001/05/28 22:51:11 markus Exp $"); */
+/* RCSID("$OpenBSD: cipher.h,v 1.27 2001/06/26 06:32:49 itojun Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
@@ -104,15 +104,16 @@ struct Cipher {
 	void	(*decrypt)(CipherContext *, u_char *, const u_char *, u_int);
 };
 
-u_int cipher_mask_ssh1(int client);
-Cipher *cipher_by_name(const char *name);
-Cipher *cipher_by_number(int id);
-int cipher_number(const char *name);
-char *cipher_name(int id);
-int ciphers_valid(const char *names);
-void cipher_init(CipherContext *, Cipher *, const u_char *, u_int, const u_char *, u_int);
-void cipher_encrypt(CipherContext *context, u_char *dest, const u_char *src, u_int len);
-void cipher_decrypt(CipherContext *context, u_char *dest, const u_char *src, u_int len);
-void cipher_set_key_string(CipherContext *context, Cipher *cipher, const char *passphrase);
+u_int cipher_mask_ssh1(int);
+Cipher *cipher_by_name(const char *);
+Cipher *cipher_by_number(int);
+int cipher_number(const char *);
+char *cipher_name(int);
+int ciphers_valid(const char *);
+void cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
+    const u_char *, u_int);
+void cipher_encrypt(CipherContext *, u_char *, const u_char *, u_int);
+void cipher_decrypt(CipherContext *, u_char *, const u_char *, u_int);
+void cipher_set_key_string(CipherContext *, Cipher *, const char *);
 
 #endif				/* CIPHER_H */
diff --git a/usr.bin/ssh/clientloop.h b/usr.bin/ssh/clientloop.h
index ee40d87ea90..b7f48aa862c 100644
--- a/usr.bin/ssh/clientloop.h
+++ b/usr.bin/ssh/clientloop.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clientloop.h,v 1.4 2001/02/06 22:43:02 markus Exp $	*/
+/*	$OpenBSD: clientloop.h,v 1.5 2001/06/26 06:32:50 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,4 +36,4 @@
  */
 
 /* Client side main loop for the interactive session. */
-int     client_loop(int have_pty, int escape_char, int id);
+int     client_loop(int, int, int);
diff --git a/usr.bin/ssh/compat.h b/usr.bin/ssh/compat.h
index 33eb7c1e879..a44f321cea2 100644
--- a/usr.bin/ssh/compat.h
+++ b/usr.bin/ssh/compat.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* RCSID("$OpenBSD: compat.h,v 1.26 2001/06/25 08:25:37 markus Exp $"); */
+/* RCSID("$OpenBSD: compat.h,v 1.27 2001/06/26 06:32:50 itojun Exp $"); */
 
 #ifndef COMPAT_H
 #define COMPAT_H
@@ -53,9 +53,9 @@
 
 void    enable_compat13(void);
 void    enable_compat20(void);
-void    compat_datafellows(const char *s);
-int	proto_spec(const char *spec);
-char	*compat_cipher_proposal(char *cipher_prop);
+void    compat_datafellows(const char *);
+int	proto_spec(const char *);
+char	*compat_cipher_proposal(char *);
 extern int compat13;
 extern int compat20;
 extern int datafellows;
diff --git a/usr.bin/ssh/compress.h b/usr.bin/ssh/compress.h
index f90932a6faf..a9d06fc05b5 100644
--- a/usr.bin/ssh/compress.h
+++ b/usr.bin/ssh/compress.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: compress.h,v 1.8 2001/04/05 10:39:02 markus Exp $"); */
+/* RCSID("$OpenBSD: compress.h,v 1.9 2001/06/26 06:32:50 itojun Exp $"); */
 
 #ifndef COMPRESS_H
 #define COMPRESS_H
@@ -20,7 +20,7 @@
  * Initializes compression; level is compression level from 1 to 9 (as in
  * gzip).
  */
-void	buffer_compress_init_send(int level);
+void	buffer_compress_init_send(int);
 void	buffer_compress_init_recv(void);
 
 /* Frees any data structures allocated by buffer_compress_init. */
@@ -34,7 +34,7 @@ void    buffer_compress_uninit(void);
  * order since they together form a single compression stream) by the
  * receiver.  This appends the compressed data to the output buffer.
  */
-void    buffer_compress(Buffer * input_buffer, Buffer * output_buffer);
+void    buffer_compress(Buffer *, Buffer *);
 
 /*
  * Uncompresses the contents of input_buffer into output_buffer.  All packets
@@ -44,6 +44,6 @@ void    buffer_compress(Buffer * input_buffer, Buffer * output_buffer);
  * buffer_compress was called, and in the same order that buffers compressed
  * with that.  This appends the uncompressed data to the output buffer.
  */
-void    buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer);
+void    buffer_uncompress(Buffer *, Buffer *);
 
 #endif				/* COMPRESS_H */
diff --git a/usr.bin/ssh/crc32.h b/usr.bin/ssh/crc32.h
index c469a90fec3..4cd93339012 100644
--- a/usr.bin/ssh/crc32.h
+++ b/usr.bin/ssh/crc32.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: crc32.h,v 1.10 2001/03/02 18:54:31 deraadt Exp $"); */
+/* RCSID("$OpenBSD: crc32.h,v 1.11 2001/06/26 06:32:51 itojun Exp $"); */
 
 #ifndef CRC32_H
 #define CRC32_H
@@ -20,6 +20,6 @@
  * This computes a 32 bit CRC of the data in the buffer, and returns the CRC.
  * The polynomial used is 0xedb88320.
  */
-u_int ssh_crc32(const u_char *buf, u_int len);
+u_int ssh_crc32(const u_char *, u_int);
 
 #endif				/* CRC32_H */
diff --git a/usr.bin/ssh/deattack.h b/usr.bin/ssh/deattack.h
index 3907159b417..24d3957a647 100644
--- a/usr.bin/ssh/deattack.h
+++ b/usr.bin/ssh/deattack.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: deattack.h,v 1.5 2001/01/29 01:58:15 niklas Exp $	*/
+/*	$OpenBSD: deattack.h,v 1.6 2001/06/26 06:32:51 itojun Exp $	*/
 
 /*
  * Cryptographic attack detector for ssh - Header file
@@ -26,5 +26,5 @@
 #define DEATTACK_OK		0
 #define DEATTACK_DETECTED	1
 
-int     detect_attack(u_char *buf, u_int32_t len, u_char IV[8]);
+int     detect_attack(u_char *, u_int32_t, u_char[8]);
 #endif
diff --git a/usr.bin/ssh/dh.h b/usr.bin/ssh/dh.h
index e8b2944ce9f..fd90fab5a6a 100644
--- a/usr.bin/ssh/dh.h
+++ b/usr.bin/ssh/dh.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dh.h,v 1.5 2001/04/03 19:53:29 markus Exp $	*/
+/*	$OpenBSD: dh.h,v 1.6 2001/06/26 06:32:52 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
@@ -32,15 +32,15 @@ struct dhgroup {
 	BIGNUM *p;
 };
 
-DH	*choose_dh(int min, int nbits, int max);
+DH	*choose_dh(int, int, int);
 DH	*dh_new_group_asc(const char *, const char *);
 DH	*dh_new_group(BIGNUM *, BIGNUM *);
 DH	*dh_new_group1(void);
 
 void	dh_gen_key(DH *, int);
-int	dh_pub_is_valid(DH *dh, BIGNUM *dh_pub);
+int	dh_pub_is_valid(DH *, BIGNUM *);
 
-int	dh_estimate(int bits);
+int	dh_estimate(int);
 
 #define DH_GRP_MIN	1024
 #define DH_GRP_MAX	8192
diff --git a/usr.bin/ssh/dispatch.h b/usr.bin/ssh/dispatch.h
index 0bee03b2bad..f796705a249 100644
--- a/usr.bin/ssh/dispatch.h
+++ b/usr.bin/ssh/dispatch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dispatch.h,v 1.4 2001/01/29 01:58:15 niklas Exp $	*/
+/*	$OpenBSD: dispatch.h,v 1.5 2001/06/26 06:32:52 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -28,9 +28,9 @@ enum {
 	DISPATCH_NONBLOCK
 };
 
-typedef void dispatch_fn(int type, int plen, void *ctxt);
+typedef void dispatch_fn(int, int, void *);
 
-void	dispatch_init(dispatch_fn *dflt);
-void	dispatch_set(int type, dispatch_fn *fn);
-void	dispatch_run(int mode, int *done, void *ctxt);
-void	dispatch_protocol_error(int type, int plen, void *ctxt);
+void	dispatch_init(dispatch_fn *);
+void	dispatch_set(int, dispatch_fn *);
+void	dispatch_run(int, int *, void *);
+void	dispatch_protocol_error(int, int, void *);
diff --git a/usr.bin/ssh/groupaccess.h b/usr.bin/ssh/groupaccess.h
index b4e5e42fc63..01e394f6919 100644
--- a/usr.bin/ssh/groupaccess.h
+++ b/usr.bin/ssh/groupaccess.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: groupaccess.h,v 1.2 2001/01/29 01:58:15 niklas Exp $	*/
+/*	$OpenBSD: groupaccess.h,v 1.3 2001/06/26 06:32:52 itojun Exp $	*/
 
 /*
  * Copyright (c) 2001 Kevin Steves.  All rights reserved.
@@ -33,13 +33,13 @@
  * Initialize group access list for user with primary (base) and
  * supplementary groups.  Return the number of groups in the list.
  */
-int ga_init(const char *user, gid_t base);
+int ga_init(const char *, gid_t);
 
 /*
  * Return 1 if one of user's groups is contained in groups.
  * Return 0 otherwise.  Use match_pattern() for string comparison.
  */
-int ga_match(char * const *groups, int ngroups);
+int ga_match(char * const *, int);
 
 /*
  * Free memory allocated for group access list.
diff --git a/usr.bin/ssh/hostfile.h b/usr.bin/ssh/hostfile.h
index 346bcd9ba54..b83b7700829 100644
--- a/usr.bin/ssh/hostfile.h
+++ b/usr.bin/ssh/hostfile.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hostfile.h,v 1.7 2001/02/08 19:30:51 itojun Exp $	*/
+/*	$OpenBSD: hostfile.h,v 1.8 2001/06/26 06:32:53 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,7 +15,7 @@
 #define HOSTFILE_H
 
 int
-auth_rsa_read_key(char **cpp, u_int *bitsp, BIGNUM * e, BIGNUM * n);
+auth_rsa_read_key(char **, u_int *, BIGNUM *, BIGNUM *);
 
 /*
  * Checks whether the given host is already in the list of our known hosts.
@@ -28,13 +28,12 @@ typedef enum {
 }       HostStatus;
 
 HostStatus
-check_host_in_hostfile(const char *filename, const char *host, Key *key,
-    Key *found, int *line);
+check_host_in_hostfile(const char *, const char *, Key *, Key *, int *);
 
 /*
  * Appends an entry to the host file.  Returns false if the entry could not
  * be appended.
  */
-int	add_host_to_hostfile(const char *filename, const char *host, Key *key);
+int	add_host_to_hostfile(const char *, const char *, Key *);
 
 #endif
diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h
index ac7ad33f753..80ce31cefea 100644
--- a/usr.bin/ssh/kex.h
+++ b/usr.bin/ssh/kex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kex.h,v 1.24 2001/06/25 08:25:37 markus Exp $	*/
+/*	$OpenBSD: kex.h,v 1.25 2001/06/26 06:32:53 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -107,24 +107,24 @@ struct Kex {
 	int	flags;
 	char	*client_version_string;
 	char	*server_version_string;
-	int	(*verify_host_key)(Key *hostkey);
-	Key	*(*load_host_key)(int type);
+	int	(*verify_host_key)(Key *);
+	Key	*(*load_host_key)(int);
 };
 
-Kex	*kex_setup(char *proposal[PROPOSAL_MAX]);
-void	kex_finish(Kex *kex);
+Kex	*kex_setup(char *[PROPOSAL_MAX]);
+void	kex_finish(Kex *);
 
-void	kex_send_kexinit(Kex *kex);
-void	kex_input_kexinit(int type, int plen, void *ctxt);
-void	kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret);
+void	kex_send_kexinit(Kex *);
+void	kex_input_kexinit(int, int, void *);
+void	kex_derive_keys(Kex *, u_char *, BIGNUM *);
 
 void	kexdh(Kex *);
 void	kexgex(Kex *);
 
-Newkeys *kex_get_newkeys(int mode);
+Newkeys *kex_get_newkeys(int);
 
 #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
-void	dump_digest(char *msg, u_char *digest, int len);
+void	dump_digest(char *, u_char *, int);
 #endif
 
 #endif
diff --git a/usr.bin/ssh/key.h b/usr.bin/ssh/key.h
index 7f4e5f017c1..db2dd324c25 100644
--- a/usr.bin/ssh/key.h
+++ b/usr.bin/ssh/key.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.h,v 1.13 2001/06/25 08:25:38 markus Exp $	*/
+/*	$OpenBSD: key.h,v 1.14 2001/06/26 06:32:54 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -50,35 +50,27 @@ struct Key {
 	DSA	*dsa;
 };
 
-Key	*key_new(int type);
-Key	*key_new_private(int type);
-void	key_free(Key *k);
-int	key_equal(Key *a, Key *b);
-char	*key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep);
-char	*key_type(Key *k);
-int	key_write(Key *key, FILE *f);
-int	key_read(Key *key, char **cpp);
-u_int	key_size(Key *k);
+Key	*key_new(int);
+Key	*key_new_private(int);
+void	key_free(Key *);
+int	key_equal(Key *, Key *);
+char	*key_fingerprint(Key *, enum fp_type, enum fp_rep);
+char	*key_type(Key *);
+int	key_write(Key *, FILE *);
+int	key_read(Key *, char **);
+u_int	key_size(Key *);
 
-Key	*key_generate(int type, u_int bits);
-Key	*key_from_private(Key *k);
-int	key_type_from_name(char *name);
+Key	*key_generate(int, u_int);
+Key	*key_from_private(Key *);
+int	key_type_from_name(char *);
 
-Key	*key_from_blob(char *blob, int blen);
-int	key_to_blob(Key *key, u_char **blobp, u_int *lenp);
-char	*key_ssh_name(Key *k);
-int	key_names_valid2(const char *names);
+Key	*key_from_blob(char *, int);
+int	key_to_blob(Key *, u_char **, u_int *);
+char	*key_ssh_name(Key *);
+int	key_names_valid2(const char *);
 
-int
-key_sign(
-    Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen);
+int	key_sign(Key *, u_char **, int *, u_char *, int);
 
-int
-key_verify(
-    Key *key,
-    u_char *signature, int signaturelen,
-    u_char *data, int datalen);
+int	key_verify(Key *, u_char *, int, u_char *, int);
 
 #endif
diff --git a/usr.bin/ssh/log.h b/usr.bin/ssh/log.h
index ad9fa3f2ab1..9e59ea568c9 100644
--- a/usr.bin/ssh/log.h
+++ b/usr.bin/ssh/log.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.h,v 1.2 2001/01/29 01:58:16 niklas Exp $	*/
+/*	$OpenBSD: log.h,v 1.3 2001/06/26 06:32:55 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -41,23 +41,23 @@ typedef enum {
 	SYSLOG_LEVEL_DEBUG3
 }       LogLevel;
 /* Initializes logging. */
-void    log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr);
+void    log_init(char *, LogLevel, SyslogFacility, int);
 
 /* Logging implementation, depending on server or client */
-void    do_log(LogLevel level, const char *fmt, va_list args);
+void    do_log(LogLevel, const char *, va_list);
 
 /* name to facility/level */
-SyslogFacility log_facility_number(char *name);
-LogLevel log_level_number(char *name);
+SyslogFacility log_facility_number(char *);
+LogLevel log_level_number(char *);
 
 /* Output a message to syslog or stderr */
-void    fatal(const char *fmt,...) __attribute__((format(printf, 1, 2)));
-void    error(const char *fmt,...) __attribute__((format(printf, 1, 2)));
-void    log(const char *fmt,...) __attribute__((format(printf, 1, 2)));
-void    verbose(const char *fmt,...) __attribute__((format(printf, 1, 2)));
-void    debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));
-void    debug2(const char *fmt,...) __attribute__((format(printf, 1, 2)));
-void    debug3(const char *fmt,...) __attribute__((format(printf, 1, 2)));
+void    fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void    error(const char *, ...) __attribute__((format(printf, 1, 2)));
+void    log(const char *, ...) __attribute__((format(printf, 1, 2)));
+void    verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
+void    debug(const char *, ...) __attribute__((format(printf, 1, 2)));
+void    debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
+void    debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
 
 /* same as fatal() but w/o logging */
 void    fatal_cleanup(void);
@@ -67,9 +67,9 @@ void    fatal_cleanup(void);
  * before exiting. It is permissible to call fatal_remove_cleanup for the
  * function itself from the function.
  */
-void    fatal_add_cleanup(void (*proc) (void *context), void *context);
+void    fatal_add_cleanup(void (*) (void *), void *);
 
 /* Removes a cleanup function to be called at fatal(). */
-void    fatal_remove_cleanup(void (*proc) (void *context), void *context);
+void    fatal_remove_cleanup(void (*) (void *), void *);
 
 #endif
diff --git a/usr.bin/ssh/mac.h b/usr.bin/ssh/mac.h
index 6173eaa66a4..67df3b605b5 100644
--- a/usr.bin/ssh/mac.h
+++ b/usr.bin/ssh/mac.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mac.h,v 1.1 2001/02/11 12:59:24 markus Exp $   */
+/*      $OpenBSD: mac.h,v 1.2 2001/06/26 06:32:55 itojun Exp $   */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -23,6 +23,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-int	mac_valid(const char *names);
-int	mac_init(Mac *mac, char *name);
-u_char	*mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen);
+int	mac_valid(const char *);
+int	mac_init(Mac *, char *);
+u_char	*mac_compute(Mac *, u_int32_t, u_char *, int);
diff --git a/usr.bin/ssh/match.h b/usr.bin/ssh/match.h
index 5faf668190f..f05fe9b3711 100644
--- a/usr.bin/ssh/match.h
+++ b/usr.bin/ssh/match.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: match.h,v 1.8 2001/06/24 05:25:10 markus Exp $	*/
+/*	$OpenBSD: match.h,v 1.9 2001/06/26 06:32:56 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -14,10 +14,10 @@
 #ifndef MATCH_H
 #define MATCH_H
 
-int      match_pattern(const char *s, const char *pattern);
-int      match_hostname(const char *host, const char *pattern, u_int len);
-int	 match_host_and_ip(const char *host, const char *ip, const char *p);
-int	 match_user(const char *u, const char *h, const char *i, const char *p);
-char	*match_list(const char *client, const char *server, u_int *next);
+int      match_pattern(const char *, const char *);
+int      match_hostname(const char *, const char *, u_int);
+int	 match_host_and_ip(const char *, const char *, const char *);
+int	 match_user(const char *, const char *, const char *, const char *);
+char	*match_list(const char *, const char *, u_int *);
 
 #endif
diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h
index 11d231ac1f7..2863a497abb 100644
--- a/usr.bin/ssh/misc.h
+++ b/usr.bin/ssh/misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.h,v 1.8 2001/05/19 19:43:57 stevesk Exp $	*/
+/*	$OpenBSD: misc.h,v 1.9 2001/06/26 06:32:56 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -12,27 +12,27 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 /* remove newline at end of string */
-char	*chop(char *s);
+char	*chop(char *);
 
 /* return next token in configuration line */
-char	*strdelim(char **s);
+char	*strdelim(char **);
 
 /* set/unset filedescriptor to non-blocking */
-void	set_nonblock(int fd);
-void	unset_nonblock(int fd);
+void	set_nonblock(int);
+void	unset_nonblock(int);
 
-struct passwd * pwcopy(struct passwd *pw);
+struct passwd * pwcopy(struct passwd *);
 
 /*
  * Convert ASCII string to TCP/IP port number.
  * Port must be >0 and <=65535.
  * Return 0 if invalid.
  */
-int a2port(const char *s);
+int a2port(const char *);
 
 /* code from scp.c/rcp.c */
-char *cleanhostname(char *host);
-char *colon(char *cp);
+char *cleanhostname(char *);
+char *colon(char *);
 
 /*
  * Convert a time string into seconds; format is
@@ -56,7 +56,7 @@ char *colon(char *cp);
  * Return -1 if time string is invalid.
  */
 
-long convtime(const char *s);
+long convtime(const char *);
 
 /* function to assist building execv() arguments */
 typedef struct arglist arglist;
@@ -66,4 +66,4 @@ struct arglist {
         int     nalloc;
 };
 
-void addargs(arglist *args, char *fmt, ...) __attribute__((format(printf, 2, 3)));
+void addargs(arglist *, char *, ...) __attribute__((format(printf, 2, 3)));
diff --git a/usr.bin/ssh/mpaux.h b/usr.bin/ssh/mpaux.h
index b3f15e4a5fe..a4d324fca1a 100644
--- a/usr.bin/ssh/mpaux.h
+++ b/usr.bin/ssh/mpaux.h
@@ -12,7 +12,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: mpaux.h,v 1.9 2000/12/19 23:17:57 markus Exp $"); */
+/* RCSID("$OpenBSD: mpaux.h,v 1.10 2001/06/26 06:32:57 itojun Exp $"); */
 
 #ifndef MPAUX_H
 #define MPAUX_H
@@ -23,9 +23,6 @@
  * representations of host_key_n, session_key_n, and the cookie.
  */
 void
-compute_session_id(u_char session_id[16],
-    u_char cookie[8],
-    BIGNUM * host_key_n,
-    BIGNUM * session_key_n);
+compute_session_id(u_char[16], u_char[8], BIGNUM *, BIGNUM *);
 
 #endif				/* MPAUX_H */
diff --git a/usr.bin/ssh/packet.h b/usr.bin/ssh/packet.h
index 6430bb0be68..97afbdf60ad 100644
--- a/usr.bin/ssh/packet.h
+++ b/usr.bin/ssh/packet.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: packet.h,v 1.23 2001/05/28 23:58:35 markus Exp $"); */
+/* RCSID("$OpenBSD: packet.h,v 1.24 2001/06/26 06:32:57 itojun Exp $"); */
 
 #ifndef PACKET_H
 #define PACKET_H
@@ -23,7 +23,7 @@
  * packet_set_encryption_key is called.  It is permissible that fd_in and
  * fd_out are the same descriptor; in that case it is assumed to be a socket.
  */
-void    packet_set_connection(int fd_in, int fd_out);
+void    packet_set_connection(int, int);
 
 /* Puts the connection file descriptors into non-blocking mode. */
 void    packet_set_nonblocking(void);
@@ -46,32 +46,31 @@ void    packet_close(void);
  * encrypted independently of each other.  Cipher types are defined in ssh.h.
  */
 void
-packet_set_encryption_key(const u_char *key, u_int keylen,
-    int cipher_type);
+packet_set_encryption_key(const u_char *, u_int, int);
 
 /*
  * Sets remote side protocol flags for the current connection.  This can be
  * called at any time.
  */
-void    packet_set_protocol_flags(u_int flags);
+void    packet_set_protocol_flags(u_int);
 
 /* Returns the remote protocol flags set earlier by the above function. */
 u_int packet_get_protocol_flags(void);
 
 /* Enables compression in both directions starting from the next packet. */
-void    packet_start_compression(int level);
+void    packet_start_compression(int);
 
 /*
  * Informs that the current session is interactive.  Sets IP flags for
  * optimal performance in interactive use.
  */
-void    packet_set_interactive(int interactive);
+void    packet_set_interactive(int);
 
 /* Returns true if the current connection is interactive. */
 int     packet_is_interactive(void);
 
 /* Starts constructing a packet to send. */
-void    packet_start(u_char type);
+void    packet_start(u_char);
 
 /* Appends a character to the packet data. */
 void    packet_put_char(int ch);
@@ -175,14 +174,14 @@ int     packet_not_very_much_data_to_write(void);
 
 /* maximum packet size, requested by client with SSH_CMSG_MAX_PACKET_SIZE */
 extern int max_packet_size;
-int     packet_set_maxsize(int s);
+int     packet_set_maxsize(int);
 #define packet_get_maxsize() max_packet_size
 
 /* Stores tty modes from the fd or tiop into current packet. */
-void    tty_make_modes(int fd, struct termios *tiop);
+void    tty_make_modes(int, struct termios *);
 
 /* Parses tty modes for the fd from the current packet. */
-void    tty_parse_modes(int fd, int *n_bytes_ptr);
+void    tty_parse_modes(int, int *);
 
 #define packet_integrity_check(payload_len, expected_len, type) \
 do { \
@@ -212,9 +211,9 @@ int	packet_connection_is_ipv4(void);
 int	packet_remaining(void);
 
 /* append an ignore message */
-void	packet_send_ignore(int nbytes);
+void	packet_send_ignore(int);
 
 /* add an ignore message and make sure size (current+ignore) = n*sumlen */
-void	packet_inject_ignore(int sumlen);
+void	packet_inject_ignore(int);
 
 #endif				/* PACKET_H */
diff --git a/usr.bin/ssh/radix.h b/usr.bin/ssh/radix.h
index 57592d82313..6f3428cd382 100644
--- a/usr.bin/ssh/radix.h
+++ b/usr.bin/ssh/radix.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radix.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+/*	$OpenBSD: radix.h,v 1.3 2001/06/26 06:32:57 itojun Exp $	*/
 
 /*
  * Copyright (c) 1999 Dug Song.  All rights reserved.
@@ -24,5 +24,5 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-int     creds_to_radix(CREDENTIALS * creds, u_char *buf, size_t buflen);
-int     radix_to_creds(const char *buf, CREDENTIALS * creds);
+int     creds_to_radix(CREDENTIALS *, u_char *, size_t);
+int     radix_to_creds(const char *, CREDENTIALS *);
diff --git a/usr.bin/ssh/readconf.h b/usr.bin/ssh/readconf.h
index 489ffc8c19d..4b3be761506 100644
--- a/usr.bin/ssh/readconf.h
+++ b/usr.bin/ssh/readconf.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: readconf.h,v 1.32 2001/05/18 14:13:29 markus Exp $"); */
+/* RCSID("$OpenBSD: readconf.h,v 1.33 2001/06/26 06:32:58 itojun Exp $"); */
 
 #ifndef READCONF_H
 #define READCONF_H
@@ -107,13 +107,13 @@ typedef struct {
  * are processed in the following order: command line, user config file,
  * system config file.  Last, fill_default_options is called.
  */
-void    initialize_options(Options * options);
+void    initialize_options(Options *);
 
 /*
  * Called after processing other sources of option data, this fills those
  * options for which no value has been specified with their default values.
  */
-void    fill_default_options(Options * options);
+void    fill_default_options(Options *);
 
 /*
  * Processes a single option line as used in the configuration files. This
@@ -121,9 +121,7 @@ void    fill_default_options(Options * options);
  * options
  */
 int
-process_config_line(Options * options, const char *host,
-    char *line, const char *filename, int linenum,
-    int *activep);
+process_config_line(Options *, const char *, char *, const char *, int, int *);
 
 /*
  * Reads the config file and modifies the options accordingly.  Options
@@ -131,23 +129,20 @@ process_config_line(Options * options, const char *host,
  * there is an error.  If the file does not exist, this returns immediately.
  */
 void
-read_config_file(const char *filename, const char *host,
-    Options * options);
+read_config_file(const char *, const char *, Options *);
 
 /*
  * Adds a local TCP/IP port forward to options.  Never returns if there is an
  * error.
  */
 void
-add_local_forward(Options * options, u_short port, const char *host,
-    u_short host_port);
+add_local_forward(Options *, u_short, const char *, u_short);
 
 /*
  * Adds a remote TCP/IP port forward to options.  Never returns if there is
  * an error.
  */
 void
-add_remote_forward(Options * options, u_short port, const char *host,
-    u_short host_port);
+add_remote_forward(Options *, u_short, const char *, u_short);
 
 #endif				/* READCONF_H */
diff --git a/usr.bin/ssh/readpass.h b/usr.bin/ssh/readpass.h
index 37f85002b40..da362ab41e9 100644
--- a/usr.bin/ssh/readpass.h
+++ b/usr.bin/ssh/readpass.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readpass.h,v 1.4 2001/06/24 05:35:33 markus Exp $	*/
+/*	$OpenBSD: readpass.h,v 1.5 2001/06/26 06:32:58 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -14,4 +14,4 @@
 
 #define RP_ECHO			0x0001
 #define RP_ALLOW_STDIN		0x0002
-char	*read_passphrase(const char *prompt, int flags);
+char	*read_passphrase(const char *, int);
diff --git a/usr.bin/ssh/rsa.h b/usr.bin/ssh/rsa.h
index d3d2c996427..b803b3ad35f 100644
--- a/usr.bin/ssh/rsa.h
+++ b/usr.bin/ssh/rsa.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: rsa.h,v 1.11 2001/03/26 23:23:24 markus Exp $"); */
+/* RCSID("$OpenBSD: rsa.h,v 1.12 2001/06/26 06:32:58 itojun Exp $"); */
 
 #ifndef RSA_H
 #define RSA_H
@@ -19,9 +19,9 @@
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 
-void rsa_public_encrypt __P((BIGNUM * out, BIGNUM * in, RSA * prv));
-int rsa_private_decrypt __P((BIGNUM * out, BIGNUM * in, RSA * prv));
+void rsa_public_encrypt __P((BIGNUM *, BIGNUM *, RSA *));
+int rsa_private_decrypt __P((BIGNUM *, BIGNUM *, RSA *));
 
-void generate_additional_parameters __P((RSA *rsa));
+void generate_additional_parameters __P((RSA *));
 
 #endif				/* RSA_H */
diff --git a/usr.bin/ssh/scard.c b/usr.bin/ssh/scard.c
index 6dbabf546c2..1e09fc14c77 100644
--- a/usr.bin/ssh/scard.c
+++ b/usr.bin/ssh/scard.c
@@ -24,7 +24,7 @@
 
 #ifdef SMARTCARD
 #include "includes.h"
-RCSID("$OpenBSD: scard.c,v 1.1 2001/06/26 05:33:34 markus Exp $");
+RCSID("$OpenBSD: scard.c,v 1.2 2001/06/26 06:32:59 itojun Exp $");
 
 #include <openssl/engine.h>
 #include <sectok.h>
@@ -293,7 +293,7 @@ static RSA_METHOD smart_rsa =
 };
 
 ENGINE *
-sc_get_engine()
+sc_get_engine(void)
 {
 	RSA_METHOD *def;
 
diff --git a/usr.bin/ssh/scard.h b/usr.bin/ssh/scard.h
index 3425967b88a..46f873b35af 100644
--- a/usr.bin/ssh/scard.h
+++ b/usr.bin/ssh/scard.h
@@ -22,9 +22,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* $OpenBSD: scard.h,v 1.1 2001/06/26 05:33:34 markus Exp $ */
+/* $OpenBSD: scard.h,v 1.2 2001/06/26 06:32:59 itojun Exp $ */
 
 #include <openssl/engine.h>
 
-Key	*sc_get_key(int sc_reader_num);
-ENGINE	*sc_get_engine();
+Key	*sc_get_key(int);
+ENGINE	*sc_get_engine(void);
diff --git a/usr.bin/ssh/servconf.h b/usr.bin/ssh/servconf.h
index 575cb5a18e9..9fdf7794868 100644
--- a/usr.bin/ssh/servconf.h
+++ b/usr.bin/ssh/servconf.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: servconf.h,v 1.44 2001/06/23 02:34:31 markus Exp $"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.45 2001/06/26 06:33:00 itojun Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
@@ -133,15 +133,15 @@ typedef struct {
  * Initializes the server options to special values that indicate that they
  * have not yet been set.
  */
-void    initialize_server_options(ServerOptions * options);
+void    initialize_server_options(ServerOptions *);
 
 /*
  * Reads the server configuration file.  This only sets the values for those
  * options that have the special value indicating they have not been set.
  */
-void    read_server_config(ServerOptions * options, const char *filename);
+void    read_server_config(ServerOptions *, const char *);
 
 /* Sets values for those values that have not yet been set. */
-void    fill_default_server_options(ServerOptions * options);
+void    fill_default_server_options(ServerOptions *);
 
 #endif				/* SERVCONF_H */
diff --git a/usr.bin/ssh/serverloop.h b/usr.bin/ssh/serverloop.h
index 652c1d9f8e5..9c2c2ccb99c 100644
--- a/usr.bin/ssh/serverloop.h
+++ b/usr.bin/ssh/serverloop.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: serverloop.h,v 1.2 2001/01/29 01:58:17 niklas Exp $	*/
+/*	$OpenBSD: serverloop.h,v 1.3 2001/06/26 06:33:00 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -18,5 +18,5 @@
  * (of the child program), and reads from stdout and stderr (of the child
  * program).
  */
-void    server_loop(pid_t pid, int fdin, int fdout, int fderr);
+void    server_loop(pid_t, int, int, int);
 void    server_loop2(void);
diff --git a/usr.bin/ssh/session.h b/usr.bin/ssh/session.h
index bda1e50b593..9ed83585ca2 100644
--- a/usr.bin/ssh/session.h
+++ b/usr.bin/ssh/session.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.h,v 1.7 2001/06/25 08:25:39 markus Exp $	*/
+/*	$OpenBSD: session.h,v 1.8 2001/06/26 06:33:01 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -26,11 +26,11 @@
 #ifndef SESSION_H
 #define SESSION_H
 
-void	do_authenticated(Authctxt *ac);
+void	do_authenticated(Authctxt *);
 
-int	session_open(int id);
-void	session_input_channel_req(int id, void *arg);
-void	session_close_by_pid(pid_t pid, int status);
-void	session_close_by_channel(int id, void *arg);
+int	session_open(int);
+void	session_input_channel_req(int, void *);
+void	session_close_by_pid(pid_t, int);
+void	session_close_by_channel(int, void *);
 
 #endif
diff --git a/usr.bin/ssh/sftp-client.h b/usr.bin/ssh/sftp-client.h
index 09ffcc05cb3..a322b257108 100644
--- a/usr.bin/ssh/sftp-client.h
+++ b/usr.bin/ssh/sftp-client.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.h,v 1.5 2001/04/05 10:42:52 markus Exp $ */
+/* $OpenBSD: sftp-client.h,v 1.6 2001/06/26 06:33:01 itojun Exp $ */
 
 /*
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -38,57 +38,55 @@ struct SFTP_DIRENT {
  * Initialiase a SSH filexfer connection. Returns -1 on error or
  * protocol version on success.
  */
-int do_init(int fd_in, int fd_out);
+int do_init(int, int);
 
 /* Close file referred to by 'handle' */
-int do_close(int fd_in, int fd_out, char *handle, u_int handle_len);
+int do_close(int, int, char *, u_int);
 
 /* List contents of directory 'path' to stdout */
-int do_ls(int fd_in, int fd_out, char *path);
+int do_ls(int, int, char *);
 
 /* Read contents of 'path' to NULL-terminated array 'dir' */
-int do_readdir(int fd_in, int fd_out, char *path, SFTP_DIRENT ***dir);
+int do_readdir(int, int, char *, SFTP_DIRENT ***);
 
 /* Frees a NULL-terminated array of SFTP_DIRENTs (eg. from do_readdir) */
-void free_sftp_dirents(SFTP_DIRENT **s);
+void free_sftp_dirents(SFTP_DIRENT **);
 
 /* Delete file 'path' */
-int do_rm(int fd_in, int fd_out, char *path);
+int do_rm(int, int, char *);
 
 /* Create directory 'path' */
-int do_mkdir(int fd_in, int fd_out, char *path, Attrib *a);
+int do_mkdir(int, int, char *, Attrib *);
 
 /* Remove directory 'path' */
-int do_rmdir(int fd_in, int fd_out, char *path);
+int do_rmdir(int, int, char *);
 
 /* Get file attributes of 'path' (follows symlinks) */
-Attrib *do_stat(int fd_in, int fd_out, char *path, int quiet);
+Attrib *do_stat(int, int, char *, int);
 
 /* Get file attributes of 'path' (does not follow symlinks) */
-Attrib *do_lstat(int fd_in, int fd_out, char *path, int quiet);
+Attrib *do_lstat(int, int, char *, int);
 
 /* Get file attributes of open file 'handle' */
-Attrib *do_fstat(int fd_in, int fd_out, char *handle, u_int handle_len,
-    int quiet);
+Attrib *do_fstat(int, int, char *, u_int, int);
 
 /* Set file attributes of 'path' */
-int do_setstat(int fd_in, int fd_out, char *path, Attrib *a);
+int do_setstat(int, int, char *, Attrib *);
 
 /* Set file attributes of open file 'handle' */
-int do_fsetstat(int fd_in, int fd_out, char *handle,
-    u_int handle_len, Attrib *a);
+int do_fsetstat(int, int, char *, u_int, Attrib *);
 
 /* Canonicalise 'path' - caller must free result */
-char *do_realpath(int fd_in, int fd_out, char *path);
+char *do_realpath(int, int, char *);
 
 /* Rename 'oldpath' to 'newpath' */
-int do_rename(int fd_in, int fd_out, char *oldpath, char *newpath);
+int do_rename(int, int, char *, char *);
 
 /* Rename 'oldpath' to 'newpath' */
-int do_symlink(int fd_in, int fd_out, char *oldpath, char *newpath);
+int do_symlink(int, int, char *, char *);
 
 /* Return target of symlink 'path' - caller must free result */
-char *do_readlink(int fd_in, int fd_out, char *path);
+char *do_readlink(int, int, char *);
 
 /* XXX: add callbacks to do_download/do_upload so we can do progress meter */
 
@@ -96,12 +94,10 @@ char *do_readlink(int fd_in, int fd_out, char *path);
  * Download 'remote_path' to 'local_path'. Preserve permissions and times
  * if 'pflag' is set
  */
-int do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
-    int pflag);
+int do_download(int, int, char *, char *, int);
 
 /*
  * Upload 'local_path' to 'remote_path'. Preserve permissions and times
  * if 'pflag' is set
  */
-int do_upload(int fd_in, int fd_out, char *local_path, char *remote_path,
-    int pflag);
+int do_upload(int, int, char *, char *, int);
diff --git a/usr.bin/ssh/sftp-common.h b/usr.bin/ssh/sftp-common.h
index 6dc1a32f8fd..3e4f502b059 100644
--- a/usr.bin/ssh/sftp-common.h
+++ b/usr.bin/ssh/sftp-common.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sftp-common.h,v 1.1 2001/02/04 11:11:54 djm Exp $	*/
+/*	$OpenBSD: sftp-common.h,v 1.2 2001/06/26 06:33:01 itojun Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -39,17 +39,17 @@ struct Attrib {
 };
 
 /* Clear contents of attributes structure */
-void attrib_clear(Attrib *a);
+void attrib_clear(Attrib *);
 
 /* Convert from struct stat to filexfer attribs */
-void stat_to_attrib(struct stat *st, Attrib *a);
+void stat_to_attrib(struct stat *, Attrib *);
 
 /* Decode attributes in buffer */
-Attrib *decode_attrib(Buffer *b);
+Attrib *decode_attrib(Buffer *);
 
 /* Encode attributes to buffer */
-void encode_attrib(Buffer *b, Attrib *a);
+void encode_attrib(Buffer *, Attrib *);
 
 /* Convert from SSH2_FX_ status to text error message */
-const char *fx2txt(int status);
+const char *fx2txt(int);
 
diff --git a/usr.bin/ssh/sftp-glob.h b/usr.bin/ssh/sftp-glob.h
index 4206af43976..37bd5d2da7e 100644
--- a/usr.bin/ssh/sftp-glob.h
+++ b/usr.bin/ssh/sftp-glob.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.h,v 1.3 2001/04/15 08:43:46 markus Exp $ */
+/* $OpenBSD: sftp-glob.h,v 1.4 2001/06/26 06:33:01 itojun Exp $ */
 
 /*
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -27,6 +27,5 @@
 /* Remote sftp filename globbing */
 
 int
-remote_glob(int fd_in, int fd_out, const char *pattern, int flags,
-    int (*errfunc)(const char *, int), glob_t *pglob);
+remote_glob(int, int, const char *, int, int (*)(const char *, int), glob_t *);
 
diff --git a/usr.bin/ssh/sftp-int.h b/usr.bin/ssh/sftp-int.h
index b47f862f8fe..bbb138a6b26 100644
--- a/usr.bin/ssh/sftp-int.h
+++ b/usr.bin/ssh/sftp-int.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-int.h,v 1.2 2001/04/12 23:17:54 mouring Exp $ */
+/* $OpenBSD: sftp-int.h,v 1.3 2001/06/26 06:33:02 itojun Exp $ */
 
 /*
  * Copyright (c) 2001 Damien Miller.  All rights reserved.
@@ -24,4 +24,4 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-void interactive_loop(int fd_in, int fd_out, char *file1, char *file2);
+void interactive_loop(int, int, char *, char *);
diff --git a/usr.bin/ssh/ssh-dss.h b/usr.bin/ssh/ssh-dss.h
index 0e6a20a59d9..fe7e3207c28 100644
--- a/usr.bin/ssh/ssh-dss.h
+++ b/usr.bin/ssh/ssh-dss.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh-dss.h,v 1.3 2001/01/29 01:58:18 niklas Exp $	*/
+/*	$OpenBSD: ssh-dss.h,v 1.4 2001/06/26 06:33:02 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,16 +26,8 @@
 #ifndef DSA_H
 #define DSA_H
 
-int
-ssh_dss_sign(
-    Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen);
+int	ssh_dss_sign(Key *, u_char **, int *, u_char *, int);
 
-int
-ssh_dss_verify(
-    Key *key,
-    u_char *signature, int signaturelen,
-    u_char *data, int datalen);
+int	ssh_dss_verify(Key *, u_char *, int, u_char *, int);
 
 #endif
diff --git a/usr.bin/ssh/ssh-rsa.h b/usr.bin/ssh/ssh-rsa.h
index af2b2fe281b..1e94c8b3c0c 100644
--- a/usr.bin/ssh/ssh-rsa.h
+++ b/usr.bin/ssh/ssh-rsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh-rsa.h,v 1.3 2001/01/29 01:58:18 niklas Exp $	*/
+/*	$OpenBSD: ssh-rsa.h,v 1.4 2001/06/26 06:33:03 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,16 +26,8 @@
 #ifndef SSH_RSA_H
 #define SSH_RSA_H
 
-int
-ssh_rsa_sign(
-    Key *key,
-    u_char **sigp, int *lenp,
-    u_char *data, int datalen);
+int	ssh_rsa_sign(Key *, u_char **, int *, u_char *, int);
 
-int
-ssh_rsa_verify(
-    Key *key,
-    u_char *signature, int signaturelen,
-    u_char *data, int datalen);
+int	ssh_rsa_verify(Key *, u_char *, int, u_char *, int);
 
 #endif
diff --git a/usr.bin/ssh/sshconnect.h b/usr.bin/ssh/sshconnect.h
index 1aa892f7ea7..c15ed4bc4f8 100644
--- a/usr.bin/ssh/sshconnect.h
+++ b/usr.bin/ssh/sshconnect.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshconnect.h,v 1.10 2001/06/23 02:34:32 markus Exp $	*/
+/*	$OpenBSD: sshconnect.h,v 1.11 2001/06/26 06:33:03 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -27,27 +27,20 @@
 #define SSHCONNECT_H
 
 int
-ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
-    u_short port, int connection_attempts,
-    int anonymous, struct passwd *pw,
-    const char *proxy_command);
+ssh_connect(const char *, struct sockaddr_storage *, u_short, int,
+    int, struct passwd *, const char *);
 
 void
-ssh_login(Key **keys, int nkeys, const char *orighost,
-    struct sockaddr *hostaddr, struct passwd *pw);
+ssh_login(Key **, int, const char *, struct sockaddr *, struct passwd *);
 
-int	verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key);
+int	verify_host_key(char *, struct sockaddr *, Key *);
 
-void	ssh_kex(char *host, struct sockaddr *hostaddr);
-void	ssh_kex2(char *host, struct sockaddr *hostaddr);
+void	ssh_kex(char *, struct sockaddr *);
+void	ssh_kex2(char *, struct sockaddr *);
 
-void
-ssh_userauth1(const char *local_user, const char *server_user, char *host,
-    Key **keys, int nkeys);
-void
-ssh_userauth2(const char *local_user, const char *server_user, char *host,
-    Key **keys, int nkeys);
+void	ssh_userauth1(const char *, const char *, char *, Key **, int);
+void	ssh_userauth2(const char *, const char *, char *, Key **, int);
 
-void	ssh_put_password(char *password);
+void	ssh_put_password(char *);
 
 #endif
diff --git a/usr.bin/ssh/sshlogin.h b/usr.bin/ssh/sshlogin.h
index 7285bc23e60..539bf040d9c 100644
--- a/usr.bin/ssh/sshlogin.h
+++ b/usr.bin/ssh/sshlogin.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshlogin.h,v 1.1 2001/03/04 01:46:30 djm Exp $	*/
+/*	$OpenBSD: sshlogin.h,v 1.2 2001/06/26 06:33:04 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -19,22 +19,20 @@
  * information is not available.  This must be called before record_login.
  * The host from which the user logged in is stored in buf.
  */
-u_long
-get_last_login_time(uid_t uid, const char *logname,
-    char *buf, u_int bufsize);
+u_long	get_last_login_time(uid_t, const char *, char *, u_int);
 
 /*
  * Records that the user has logged in.  This does many things normally done
  * by login(1).
  */
 void
-record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
-    const char *host, struct sockaddr *addr);
+record_login(pid_t, const char *, const char *, uid_t,
+    const char *, struct sockaddr *);
 
 /*
  * Records that the user has logged out.  This does many thigs normally done
  * by login(1) or init.
  */
-void    record_logout(pid_t pid, const char *ttyname);
+void    record_logout(pid_t, const char *);
 
 #endif
diff --git a/usr.bin/ssh/sshpty.h b/usr.bin/ssh/sshpty.h
index d7aac0f5559..d962924f8ad 100644
--- a/usr.bin/ssh/sshpty.h
+++ b/usr.bin/ssh/sshpty.h
@@ -12,7 +12,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: sshpty.h,v 1.1 2001/03/04 01:46:30 djm Exp $"); */
+/* RCSID("$OpenBSD: sshpty.h,v 1.2 2001/06/26 06:33:04 itojun Exp $"); */
 
 #ifndef SSHPTY_H
 #define SSHPTY_H
@@ -23,25 +23,23 @@
  * descriptors for the pty and tty sides and the name of the tty side are
  * returned (the buffer must be able to hold at least 64 characters).
  */
-int     pty_allocate(int *ptyfd, int *ttyfd, char *ttyname, int ttynamelen);
+int     pty_allocate(int *, int *, char *, int);
 
 /*
  * Releases the tty.  Its ownership is returned to root, and permissions to
  * 0666.
  */
-void    pty_release(const char *ttyname);
+void    pty_release(const char *);
 
 /*
  * Makes the tty the processes controlling tty and sets it to sane modes.
  * This may need to reopen the tty to get rid of possible eavesdroppers.
  */
-void    pty_make_controlling_tty(int *ttyfd, const char *ttyname);
+void    pty_make_controlling_tty(int *, const char *);
 
 /* Changes the window size associated with the pty. */
-void
-pty_change_window_size(int ptyfd, int row, int col,
-    int xpixel, int ypixel);
+void	pty_change_window_size(int, int, int, int, int);
 
-void	pty_setowner(struct passwd *pw, const char *ttyname);
+void	pty_setowner(struct passwd *, const char *);
 
 #endif				/* SSHPTY_H */
diff --git a/usr.bin/ssh/tildexpand.h b/usr.bin/ssh/tildexpand.h
index 88734f4bf5b..a30f0db30f7 100644
--- a/usr.bin/ssh/tildexpand.h
+++ b/usr.bin/ssh/tildexpand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tildexpand.h,v 1.2 2001/01/29 01:58:19 niklas Exp $	*/
+/*	$OpenBSD: tildexpand.h,v 1.3 2001/06/26 06:33:06 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,4 +16,4 @@
  * Expands tildes in the file name.  Returns data allocated by xmalloc.
  * Warning: this calls getpw*.
  */
-char   *tilde_expand_filename(const char *filename, uid_t my_uid);
+char   *tilde_expand_filename(const char *, uid_t);
diff --git a/usr.bin/ssh/uidswap.h b/usr.bin/ssh/uidswap.h
index 228e5a5e98c..9aea8836749 100644
--- a/usr.bin/ssh/uidswap.h
+++ b/usr.bin/ssh/uidswap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uidswap.h,v 1.7 2001/04/06 21:00:17 markus Exp $	*/
+/*	$OpenBSD: uidswap.h,v 1.8 2001/06/26 06:33:06 itojun Exp $	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -19,7 +19,7 @@
  * Temporarily changes to the given uid.  If the effective user id is not
  * root, this does nothing.  This call cannot be nested.
  */
-void    temporarily_use_uid(struct passwd *pw);
+void    temporarily_use_uid(struct passwd *);
 
 /*
  * Restores the original effective user id after temporarily_use_uid().
@@ -31,6 +31,6 @@ void    restore_uid(void);
  * Permanently sets all uids to the given uid.  This cannot be called while
  * temporarily_use_uid is effective.  This must also clear any saved uids.
  */
-void    permanently_set_uid(struct passwd *pw);
+void    permanently_set_uid(struct passwd *);
 
 #endif				/* UIDSWAP_H */
diff --git a/usr.bin/ssh/uuencode.h b/usr.bin/ssh/uuencode.h
index 1a2d63f523d..fd8f3dbda7f 100644
--- a/usr.bin/ssh/uuencode.h
+++ b/usr.bin/ssh/uuencode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uuencode.h,v 1.6 2001/06/25 08:25:41 markus Exp $	*/
+/*	$OpenBSD: uuencode.h,v 1.7 2001/06/26 06:33:06 itojun Exp $	*/
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,7 +26,7 @@
 
 #ifndef UUENCODE_H
 #define UUENCODE_H
-int	uuencode(u_char *src, u_int srclength, char *target, size_t targsize);
-int	uudecode(const char *src, u_char *target, size_t targsize);
-void	dump_base64(FILE *fp, u_char *data, int len);
+int	uuencode(u_char *, u_int, char *, size_t);
+int	uudecode(const char *, u_char *, size_t);
+void	dump_base64(FILE *, u_char *, int);
 #endif
diff --git a/usr.bin/ssh/xmalloc.h b/usr.bin/ssh/xmalloc.h
index 59a598ed6df..d04f10293ab 100644
--- a/usr.bin/ssh/xmalloc.h
+++ b/usr.bin/ssh/xmalloc.h
@@ -14,21 +14,21 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: xmalloc.h,v 1.5 2000/09/07 20:27:56 deraadt Exp $"); */
+/* RCSID("$OpenBSD: xmalloc.h,v 1.6 2001/06/26 06:33:07 itojun Exp $"); */
 
 #ifndef XMALLOC_H
 #define XMALLOC_H
 
 /* Like malloc, but calls fatal() if out of memory. */
-void   *xmalloc(size_t size);
+void   *xmalloc(size_t);
 
 /* Like realloc, but calls fatal() if out of memory. */
-void   *xrealloc(void *ptr, size_t new_size);
+void   *xrealloc(void *, size_t);
 
 /* Frees memory allocated using xmalloc or xrealloc. */
-void    xfree(void *ptr);
+void    xfree(void *);
 
 /* Allocates memory using xmalloc, and copies the string into that memory. */
-char   *xstrdup(const char *str);
+char   *xstrdup(const char *);
 
 #endif				/* XMALLOC_H */