diff options
author | Damien Miller <djm@mindrot.org> | 2005-06-17 12:59:34 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-06-17 12:59:34 +1000 |
commit | eccb9de72aa29da5a3fad87a4287b32438689c1f (patch) | |
tree | 9b8ef20a7e454b984e0ad67b54b2bdc5577aa2fa /sftp-client.c | |
parent | 677257fe07dd2b9a58817e1d42fc2c25bb618a4d (diff) |
- djm@cvs.openbsd.org 2005/06/17 02:44:33
[auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c]
[bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c]
[kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c]
[servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c]
[ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
make this -Wsign-compare clean; ok avsm@ markus@
NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
NB2. more work may be needed to make portable Wsign-compare clean
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sftp-client.c b/sftp-client.c index 47297898a..ce15fc0a3 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -20,7 +20,7 @@ | |||
20 | /* XXX: copy between two remote sites */ | 20 | /* XXX: copy between two remote sites */ |
21 | 21 | ||
22 | #include "includes.h" | 22 | #include "includes.h" |
23 | RCSID("$OpenBSD: sftp-client.c,v 1.54 2005/05/24 17:32:44 avsm Exp $"); | 23 | RCSID("$OpenBSD: sftp-client.c,v 1.55 2005/06/17 02:44:33 djm Exp $"); |
24 | 24 | ||
25 | #include "openbsd-compat/sys-queue.h" | 25 | #include "openbsd-compat/sys-queue.h" |
26 | 26 | ||
@@ -311,7 +311,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag, | |||
311 | SFTP_DIRENT ***dir) | 311 | SFTP_DIRENT ***dir) |
312 | { | 312 | { |
313 | Buffer msg; | 313 | Buffer msg; |
314 | u_int type, id, handle_len, i, expected_id, ents = 0; | 314 | u_int count, type, id, handle_len, i, expected_id, ents = 0; |
315 | char *handle; | 315 | char *handle; |
316 | 316 | ||
317 | id = conn->msg_id++; | 317 | id = conn->msg_id++; |
@@ -335,8 +335,6 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag, | |||
335 | } | 335 | } |
336 | 336 | ||
337 | for (; !interrupted;) { | 337 | for (; !interrupted;) { |
338 | int count; | ||
339 | |||
340 | id = expected_id = conn->msg_id++; | 338 | id = expected_id = conn->msg_id++; |
341 | 339 | ||
342 | debug3("Sending SSH2_FXP_READDIR I:%u", id); | 340 | debug3("Sending SSH2_FXP_READDIR I:%u", id); |
@@ -744,10 +742,10 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path, | |||
744 | Attrib junk, *a; | 742 | Attrib junk, *a; |
745 | Buffer msg; | 743 | Buffer msg; |
746 | char *handle; | 744 | char *handle; |
747 | int local_fd, status, num_req, max_req, write_error; | 745 | int local_fd, status, write_error; |
748 | int read_error, write_errno; | 746 | int read_error, write_errno; |
749 | u_int64_t offset, size; | 747 | u_int64_t offset, size; |
750 | u_int handle_len, mode, type, id, buflen; | 748 | u_int handle_len, mode, type, id, buflen, num_req, max_req; |
751 | off_t progress_counter; | 749 | off_t progress_counter; |
752 | struct request { | 750 | struct request { |
753 | u_int id; | 751 | u_int id; |