mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-18 09:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

- itojun@cvs.openbsd.org 2002/03/11 03:18:49

Browse Source 
[sftp-client.c]
     correct type mismatches (u_int64_t != unsigned long long)
This commit is contained in:
Ben Lindstrom 2002-03-22 01:03:15 +00:00
parent d45f28c116
commit eb50545365
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -3,6 +3,9 @@
- itojun@cvs.openbsd.org 2002/03/08 06:10:16 - itojun@cvs.openbsd.org 2002/03/08 06:10:16
[sftp-client.c] [sftp-client.c]
printf type mismatch printf type mismatch
- itojun@cvs.openbsd.org 2002/03/11 03:18:49
[sftp-client.c]
correct type mismatches (u_int64_t != unsigned long long)
20020317 20020317
- (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
@ -7849,4 +7852,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1924 2002/03/22 01:00:57 mouring Exp $ $Id: ChangeLog,v 1.1925 2002/03/22 01:03:15 mouring Exp $

20
sftp-client.c
View File

@ -28,7 +28,7 @@
/* XXX: copy between two remote sites */ /* XXX: copy between two remote sites */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-client.c,v 1.25 2002/03/08 06:10:16 itojun Exp $"); RCSID("$OpenBSD: sftp-client.c,v 1.26 2002/03/11 03:18:49 itojun Exp $");
#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
#include <sys/queue.h> #include <sys/queue.h>
@ -861,8 +861,9 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
break; break;
case SSH2_FXP_DATA: case SSH2_FXP_DATA:
data = buffer_get_string(&msg, &len); data = buffer_get_string(&msg, &len);
debug3("Received data %llu -> %llu", req->offset, debug3("Received data %llu -> %llu",
req->offset + len - 1); (unsigned long long)req->offset,
(unsigned long long)req->offset + len - 1);
if (len > req->len) if (len > req->len)
fatal("Received more data than asked for " fatal("Received more data than asked for "
"%d > %d", len, req->len); "%d > %d", len, req->len);
@ -882,8 +883,10 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
} else { } else {
/* Resend the request for the missing data */ /* Resend the request for the missing data */
debug3("Short data block, re-requesting " debug3("Short data block, re-requesting "
"%llu -> %llu (%2d)", req->offset + len, "%llu -> %llu (%2d)",
req->offset + req->len - 1, num_req); (unsigned long long)req->offset + len,
(unsigned long long)req->offset + req->len - 1,
num_req);
req->id = conn->msg_id++; req->id = conn->msg_id++;
req->len -= len; req->len -= len;
req->offset += len; req->offset += len;
@ -898,7 +901,8 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
/* Only one request at a time /* Only one request at a time
* after the expected EOF */ * after the expected EOF */
debug3("Finish at %llu (%2d)", debug3("Finish at %llu (%2d)",
offset, num_req); (unsigned long long)offset,
num_req);
max_req = 1; max_req = 1;
} }
else if (max_req < conn->num_requests + 1) { else if (max_req < conn->num_requests + 1) {
@ -1052,7 +1056,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
buffer_put_string(&msg, data, len); buffer_put_string(&msg, data, len);
send_msg(conn->fd_out, &msg); send_msg(conn->fd_out, &msg);
debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u", debug3("Sent message SSH2_FXP_WRITE I:%d O:%llu S:%u",
id, (u_int64_t)offset, len); id, (unsigned long long)offset, len);
} else if (TAILQ_FIRST(&acks) == NULL) } else if (TAILQ_FIRST(&acks) == NULL)
break; break;
@ -1090,7 +1094,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
goto done; goto done;
} }
debug3("In write loop, ack for %u %d bytes at %llu", debug3("In write loop, ack for %u %d bytes at %llu",
ack->id, ack->len, ack->offset); ack->id, ack->len, (unsigned long long)ack->offset);
++ackid; ++ackid;
free(ack); free(ack);
} }