- itojun@cvs.openbsd.org 2001/06/23 15:12:20
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
readpass.c scp.c servconf.c serverloop.c session.c sftp.c
sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
ssh-keygen.c ssh-keyscan.c]
more strict prototypes. raise warning level in Makefile.inc.
markus ok'ed
TODO; cleanup headers
diff --git a/ssh.c b/ssh.c
index e0e141f..484e5de 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.125 2001/06/22 23:35:21 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.126 2001/06/23 15:12:21 itojun Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -148,7 +148,7 @@
/* Prints a help message to the user. This function never returns. */
-void
+static void
usage(void)
{
fprintf(stderr, "Usage: %s [options] host [command]\n", __progname);
@@ -198,7 +198,7 @@
* Connects to the given host using rsh (or prints an error message and exits
* if rsh is not available). This function never returns.
*/
-void
+static void
rsh_connect(char *host, char *user, Buffer * command)
{
char *args[10];
@@ -232,9 +232,9 @@
exit(1);
}
-int ssh_session(void);
-int ssh_session2(void);
-void load_public_identity_files(void);
+static int ssh_session(void);
+static int ssh_session2(void);
+static void load_public_identity_files(void);
/*
* Main program for the ssh client.
@@ -742,7 +742,7 @@
return exit_status;
}
-void
+static void
x11_get_proto(char *proto, int proto_len, char *data, int data_len)
{
char line[512];
@@ -781,7 +781,7 @@
}
}
-void
+static void
ssh_init_forwarding(void)
{
int success = 0;
@@ -815,7 +815,7 @@
}
}
-void
+static void
check_agent_present(void)
{
if (options.forward_agent) {
@@ -828,7 +828,7 @@
}
}
-int
+static int
ssh_session(void)
{
int type;
@@ -966,7 +966,7 @@
options.escape_char : SSH_ESCAPECHAR_NONE, 0);
}
-void
+static void
client_subsystem_reply(int type, int plen, void *ctxt)
{
int id, len;
@@ -981,7 +981,7 @@
len, buffer_ptr(&command), id);
}
-void
+static void
ssh_session2_callback(int id, void *arg)
{
int len;
@@ -1057,7 +1057,7 @@
packet_set_interactive(interactive);
}
-int
+static int
ssh_session2_command(void)
{
Channel *c;
@@ -1104,7 +1104,7 @@
return c->self;
}
-int
+static int
ssh_session2(void)
{
int id;
@@ -1123,7 +1123,7 @@
options.escape_char : SSH_ESCAPECHAR_NONE, id);
}
-void
+static void
load_public_identity_files(void)
{
char *filename;