unsigned long long -> %llu, not %qu. markus ok

3 files changed, 9 insertions, 9 deletions

diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index cfb355745a4..c84c6483342 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.53 2001/02/04 23:56:22 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.54 2001/02/07 18:01:17 itojun Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -1131,7 +1131,7 @@ progressmeter(int flag)
 		i++;
 		abbrevsize >>= 10;
 	}
-	snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5qd %c%c ",
+	snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %5llu %c%c ",
 	    (unsigned long long) abbrevsize, prefixes[i],
 	    prefixes[i] == ' ' ? ' ' : 'B');
 
diff --git a/usr.bin/ssh/sftp-client.c b/usr.bin/ssh/sftp-client.c
index 69a01590cc7..5f49074a968 100644
--- a/usr.bin/ssh/sftp-client.c
+++ b/usr.bin/ssh/sftp-client.c
@@ -29,7 +29,7 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.5 2001/02/07 10:55:12 djm Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.6 2001/02/07 18:01:18 itojun Exp $");
 
 #include "ssh.h"
 #include "buffer.h"
@@ -657,7 +657,7 @@ do_download(int fd_in, int fd_out, char *remote_path, char *local_path,
 			fatal("Received more data than asked for %d > %d",
 			    len, COPY_SIZE);
 
-		debug3("In read loop, got %d offset %lld", len,
+		debug3("In read loop, got %d offset %llu", len,
 		    (unsigned long long)offset);
 		if (atomicio(write, local_fd, data, len) != len) {
 			error("Couldn't write to \"%s\": %s", local_path,
diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
index 29d96150c2b..547199c0f6b 100644
--- a/usr.bin/ssh/sftp-server.c
+++ b/usr.bin/ssh/sftp-server.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: sftp-server.c,v 1.18 2001/02/04 22:21:19 stevesk Exp $");
+RCSID("$OpenBSD: sftp-server.c,v 1.19 2001/02/07 18:01:18 itojun Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -395,7 +395,7 @@ process_read(void)
 	off = get_int64();
 	len = get_int();
 
-	TRACE("read id %d handle %d off %qd len %d", id, handle,
+	TRACE("read id %d handle %d off %llu len %d", id, handle,
 	    (unsigned long long)off, len);
 	if (len > sizeof buf) {
 		len = sizeof buf;
@@ -436,7 +436,7 @@ process_write(void)
 	off = get_int64();
 	data = get_string(&len);
 
-	TRACE("write id %d handle %d off %qd len %d", id, handle,
+	TRACE("write id %d handle %d off %llu len %d", id, handle,
 	    (unsigned long long)off, len);
 	fd = handle_to_fd(handle);
 	if (fd >= 0) {
@@ -664,8 +664,8 @@ ls_file(char *name, struct stat *st)
 	}
 	if (sz == 0)
 		tbuf[0] = '\0';
-	snprintf(buf, sizeof buf, "%s %3d %-8.8s %-8.8s %8qd %s %s", mode,
-	    st->st_nlink, user, group, (long long)st->st_size, tbuf, name);
+	snprintf(buf, sizeof buf, "%s %3d %-8.8s %-8.8s %8llu %s %s", mode,
+	    st->st_nlink, user, group, (unsigned long long)st->st_size, tbuf, name);
 	return xstrdup(buf);
 }