- jakob@cvs.openbsd.org 2001/07/31 09:28:44

[openssh.git] / sftp-client.c

diff --git a/sftp-client.c b/sftp-client.c
index 7be73d29fee905a1b6e26f5b61b2164ae07f15ff..4f2a1e2800840406be251e3554126e1235b732f3 100644 (file)
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -29,16 +29,14 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.15 2001/03/19 10:52:51 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.18 2001/07/14 15:10:16 stevesk Exp $");
 
-#include "ssh.h"
 #include "buffer.h"
 #include "bufaux.h"
 #include "getput.h"
 #include "xmalloc.h"
 #include "log.h"
 #include "atomicio.h"
-#include "pathnames.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
@@ -51,7 +49,7 @@ RCSID("$OpenBSD: sftp-client.c,v 1.15 2001/03/19 10:52:51 djm Exp $");
 /* Message ID */
 static u_int msg_id = 1;
 
-void
+static void
 send_msg(int fd, Buffer *m)
 {
        int mlen = buffer_len(m);
@@ -70,7 +68,7 @@ send_msg(int fd, Buffer *m)
        buffer_free(&oqueue);
 }
 
-void
+static void
 get_msg(int fd, Buffer *m)
 {
        u_int len, msg_len;
@@ -98,7 +96,7 @@ get_msg(int fd, Buffer *m)
        }
 }
 
-void
+static void
 send_string_request(int fd, u_int id, u_int code, char *s,
     u_int len)
 {
@@ -113,7 +111,7 @@ send_string_request(int fd, u_int id, u_int code, char *s,
        buffer_free(&msg);
 }
 
-void
+static void
 send_string_attrs_request(int fd, u_int id, u_int code, char *s,
     u_int len, Attrib *a)
 {
@@ -129,7 +127,7 @@ send_string_attrs_request(int fd, u_int id, u_int code, char *s,
        buffer_free(&msg);
 }
 
-u_int
+static u_int
 get_status(int fd, int expected_id)
 {
        Buffer msg;
@@ -154,7 +152,7 @@ get_status(int fd, int expected_id)
        return(status);
 }
 
-char *
+static char *
 get_handle(int fd, u_int expected_id, u_int *len)
 {
        Buffer msg;
@@ -183,7 +181,7 @@ get_handle(int fd, u_int expected_id, u_int *len)
        return(handle);
 }
 
-Attrib *
+static Attrib *
 get_decode_stat(int fd, u_int expected_id, int quiet)
 {
        Buffer msg;
@@ -283,8 +281,8 @@ do_close(int fd_in, int fd_out, char *handle, u_int handle_len)
 }
 
 
-int
-do_lsreaddir(int fd_in, int fd_out, char *path, int printflag, 
+static int
+do_lsreaddir(int fd_in, int fd_out, char *path, int printflag,
     SFTP_DIRENT ***dir)
 {
        Buffer msg;
@@ -370,7 +368,7 @@ do_lsreaddir(int fd_in, int fd_out, char *path, int printflag,
                                printf("%s\n", longname);
 
                        if (dir) {
-                               *dir = xrealloc(*dir, sizeof(**dir) * 
+                               *dir = xrealloc(*dir, sizeof(**dir) *
                                    (ents + 2));
                                (*dir)[ents] = xmalloc(sizeof(***dir));
                                (*dir)[ents]->filename = xstrdup(filename);