summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-01-21 01:01:23 +0100
committerDamien Miller <djm@mindrot.org>2004-01-21 01:01:23 +0100
commitf84fed6f71fae6627f21c578dd1192e3014dac96 (patch)
tree3b5a963c08196beda72443cd13a656dfd66693a9
parent - markus@cvs.openbsd.org 2004/01/13 19:23:15 (diff)
downloadopenssh-f84fed6f71fae6627f21c578dd1192e3014dac96.tar.xz
openssh-f84fed6f71fae6627f21c578dd1192e3014dac96.zip
- markus@cvs.openbsd.org 2004/01/13 19:45:15
[compress.c] cast for portability; millert@
-rw-r--r--ChangeLog5
-rw-r--r--compress.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 91cb0505f..48a4c2b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
- markus@cvs.openbsd.org 2004/01/13 19:23:15
[compress.c session.c]
-Wall; ok henning
+ - markus@cvs.openbsd.org 2004/01/13 19:45:15
+ [compress.c]
+ cast for portability; millert@
20040114
- (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
@@ -1681,4 +1684,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3172 2004/01/21 00:00:46 djm Exp $
+$Id: ChangeLog,v 1.3173 2004/01/21 00:01:23 djm Exp $
diff --git a/compress.c b/compress.c
index 2dea7cf36..0d1c7e55e 100644
--- a/compress.c
+++ b/compress.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.20 2004/01/13 19:23:15 markus Exp $");
+RCSID("$OpenBSD: compress.c,v 1.21 2004/01/13 19:45:15 markus Exp $");
#include "log.h"
#include "buffer.h"
@@ -57,11 +57,13 @@ void
buffer_compress_uninit(void)
{
debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
- outgoing_stream.total_in, outgoing_stream.total_out,
+ (unsigned long long)outgoing_stream.total_in,
+ (unsigned long long)outgoing_stream.total_out,
outgoing_stream.total_in == 0 ? 0.0 :
(double) outgoing_stream.total_out / outgoing_stream.total_in);
debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
- incoming_stream.total_out, incoming_stream.total_in,
+ (unsigned long long)incoming_stream.total_out,
+ (unsigned long long)incoming_stream.total_in,
incoming_stream.total_out == 0 ? 0.0 :
(double) incoming_stream.total_in / incoming_stream.total_out);
if (compress_init_recv_called == 1 && inflate_failed == 0)