- 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

1 files changed, 20 insertions, 22 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index 07dafaa57..6d94c6c29 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $  */
+/*      $OpenBSD: ssh-agent.c,v 1.55 2001/06/23 15:12:20 itojun Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.55 2001/06/23 15:12:20 itojun Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -97,9 +97,7 @@ extern char *__progname;
 char *__progname;
 #endif
 
-int     prepare_select(fd_set **, fd_set **, int *);
-
-void
+static void
 idtab_init(void)
 {
         int i;
@@ -110,7 +108,7 @@ idtab_init(void)
 }
 
 /* return private key table for requested protocol version */
-Idtab *
+static Idtab *
 idtab_lookup(int version)
 {
         if (version < 1 || version > 2)
@@ -119,7 +117,7 @@ idtab_lookup(int version)
 }
 
 /* return matching private key for given public key */
-Key *
+static Key *
 lookup_private_key(Key *key, int *idx, int version)
 {
         int i;
@@ -135,7 +133,7 @@ lookup_private_key(Key *key, int *idx, int version)
 }
 
 /* send list of supported public keys to 'client' */
-void
+static void
 process_request_identities(SocketEntry *e, int version)
 {
         Idtab *tab = idtab_lookup(version);
@@ -167,7 +165,7 @@ process_request_identities(SocketEntry *e, int version)
 }
 
 /* ssh1 only */
-void
+static void
 process_authentication_challenge1(SocketEntry *e)
 {
         Key *key, *private;
@@ -233,7 +231,7 @@ send:
 }
 
 /* ssh2 only */
-void
+static void
 process_sign_request2(SocketEntry *e)
 {
         extern int datafellows;
@@ -278,7 +276,7 @@ process_sign_request2(SocketEntry *e)
 }
 
 /* shared */
-void
+static void
 process_remove_identity(SocketEntry *e, int version)
 {
         Key *key = NULL, *private;
@@ -339,7 +337,7 @@ process_remove_identity(SocketEntry *e, int version)
             success ? SSH_AGENT_SUCCESS : SSH_AGENT_FAILURE);
 }
 
-void
+static void
 process_remove_all_identities(SocketEntry *e, int version)
 {
         u_int i;
@@ -360,7 +358,7 @@ process_remove_all_identities(SocketEntry *e, int version)
         return;
 }
 
-void
+static void
 process_add_identity(SocketEntry *e, int version)
 {
         Key *k = NULL;
@@ -444,7 +442,7 @@ send:
 
 /* dispatch incoming messages */
 
-void
+static void
 process_message(SocketEntry *e)
 {
         u_int msg_len;
@@ -508,7 +506,7 @@ process_message(SocketEntry *e)
         }
 }
 
-void
+static void
 new_socket(int type, int fd)
 {
         u_int i, old_alloc;
@@ -540,7 +538,7 @@ new_socket(int type, int fd)
         buffer_init(&sockets[old_alloc].output);
 }
 
-int
+static int
 prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl)
 {
         u_int i, sz;
@@ -588,7 +586,7 @@ prepare_select(fd_set **fdrp, fd_set **fdwp, int *fdl)
         return (1);
 }
 
-void
+static void
 after_select(fd_set *readset, fd_set *writeset)
 {
         u_int i;
@@ -660,7 +658,7 @@ after_select(fd_set *readset, fd_set *writeset)
                 }
 }
 
-void
+static void
 check_parent_exists(int sig)
 {
         int save_errno = errno;
@@ -674,7 +672,7 @@ check_parent_exists(int sig)
         errno = save_errno;
 }
 
-void
+static void
 cleanup_socket(void)
 {
         if (socket_name[0])
@@ -683,21 +681,21 @@ cleanup_socket(void)
                 rmdir(socket_dir);
 }
 
-void
+static void
 cleanup_exit(int i)
 {
         cleanup_socket();
         exit(i);
 }
 
-void
+static void
 cleanup_handler(int sig)
 {
         cleanup_socket();
         _exit(2);
 }
 
-void
+static void
 usage(void)
 {
         fprintf(stderr, "ssh-agent version %s\n", SSH_VERSION);