4 files changed, 10 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index f922e8d7e..1f65d2cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
  - (dtucker) [configure.ac] Apply tim's fix for older systems where the
    resolver state in resolv.h is "state" not "__res_state".  With slight
    modification by me to also work on old AIXes.  ok djm@
+ - (dtucker) [progressmeter.c scp.c sftp-server.c] Use correct casts for
+   snprintf formats, fixes warnings on some 64 bit platforms.  Patch from
+   shaw at vranix.com, ok djm@
 
 20051124
  - (djm) [configure.ac openbsd-compat/Makefile.in openbsd-compat/bsd-asprintf.c 
@@ -3349,4 +3352,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4006 2005/11/25 02:14:58 dtucker Exp $
+$Id: ChangeLog,v 1.4007 2005/11/25 03:44:55 dtucker Exp $
diff --git a/progressmeter.c b/progressmeter.c
index 3cda09061..13c51d87e 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -85,8 +85,8 @@ format_rate(char *buf, int size, off_t bytes)
                 bytes = (bytes + 512) / 1024;
         }
         snprintf(buf, size, "%3lld.%1lld%c%s",
-            (int64_t) (bytes + 5) / 100,
-            (int64_t) (bytes + 5) / 10 % 10,
+            (long long) (bytes + 5) / 100,
+            (long long) (bytes + 5) / 10 % 10,
             unit[i],
             i ? "B" : " ");
 }
@@ -99,7 +99,7 @@ format_size(char *buf, int size, off_t bytes)
         for (i = 0; bytes >= 10000 && unit[i] != 'T'; i++)
                 bytes = (bytes + 512) / 1024;
         snprintf(buf, size, "%4lld%c%s",
-            (int64_t) bytes,
+            (long long) bytes,
             unit[i],
             i ? "B" : " ");
 }
diff --git a/scp.c b/scp.c
index 59285abca..a19021f85 100644
--- a/scp.c
+++ b/scp.c
@@ -563,7 +563,7 @@ syserr:			run_err("%s: %s", name, strerror(errno));
 #define FILEMODEMASK    (S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
                 snprintf(buf, sizeof buf, "C%04o %lld %s\n",
                     (u_int) (stb.st_mode & FILEMODEMASK),
-                    (int64_t)stb.st_size, last);
+                    (long long)stb.st_size, last);
                 if (verbose_mode) {
                         fprintf(stderr, "Sending file modes: %s", buf);
                 }
diff --git a/sftp-server.c b/sftp-server.c
index e7d000cff..4fa07e2f5 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -428,7 +428,7 @@ process_read(void)
         len = get_int();
 
         TRACE("read id %u handle %d off %llu len %d", id, handle,
-            (u_int64_t)off, len);
+            (unsigned long long)off, len);
         if (len > sizeof buf) {
                 len = sizeof buf;
                 logit("read change len %d", len);
@@ -469,7 +469,7 @@ process_write(void)
         data = get_string(&len);
 
         TRACE("write id %u handle %d off %llu len %d", id, handle,
-            (u_int64_t)off, len);
+            (unsigned long long)off, len);
         fd = handle_to_fd(handle);
         if (fd >= 0) {
                 if (lseek(fd, off, SEEK_SET) < 0) {