summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 @@
12 - markus@cvs.openbsd.org 2004/01/13 19:23:15 12 - markus@cvs.openbsd.org 2004/01/13 19:23:15
13 [compress.c session.c] 13 [compress.c session.c]
14 -Wall; ok henning 14 -Wall; ok henning
15 - markus@cvs.openbsd.org 2004/01/13 19:45:15
16 [compress.c]
17 cast for portability; millert@
15 18
1620040114 1920040114
17 - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits 20 - (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
@@ -1681,4 +1684,4 @@
1681 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1684 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1682 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1685 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1683 1686
1684$Id: ChangeLog,v 1.3172 2004/01/21 00:00:46 djm Exp $ 1687$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 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: compress.c,v 1.20 2004/01/13 19:23:15 markus Exp $"); 15RCSID("$OpenBSD: compress.c,v 1.21 2004/01/13 19:45:15 markus Exp $");
16 16
17#include "log.h" 17#include "log.h"
18#include "buffer.h" 18#include "buffer.h"
@@ -57,11 +57,13 @@ void
57buffer_compress_uninit(void) 57buffer_compress_uninit(void)
58{ 58{
59 debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f", 59 debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
60 outgoing_stream.total_in, outgoing_stream.total_out, 60 (unsigned long long)outgoing_stream.total_in,
61 (unsigned long long)outgoing_stream.total_out,
61 outgoing_stream.total_in == 0 ? 0.0 : 62 outgoing_stream.total_in == 0 ? 0.0 :
62 (double) outgoing_stream.total_out / outgoing_stream.total_in); 63 (double) outgoing_stream.total_out / outgoing_stream.total_in);
63 debug("compress incoming: raw data %llu, compressed %llu, factor %.2f", 64 debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
64 incoming_stream.total_out, incoming_stream.total_in, 65 (unsigned long long)incoming_stream.total_out,
66 (unsigned long long)incoming_stream.total_in,
65 incoming_stream.total_out == 0 ? 0.0 : 67 incoming_stream.total_out == 0 ? 0.0 :
66 (double) incoming_stream.total_in / incoming_stream.total_out); 68 (double) incoming_stream.total_in / incoming_stream.total_out);
67 if (compress_init_recv_called == 1 && inflate_failed == 0) 69 if (compress_init_recv_called == 1 && inflate_failed == 0)