X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/bcb68a8f15e1b779aaac70da864e3ee6b39adbd3..f9e4952c0d45a2afdc9267c8cc9500462a82ad11:/compress.c diff --git a/compress.c b/compress.c index e2efa684..0d1c7e55 100644 --- a/compress.c +++ b/compress.c @@ -12,15 +12,15 @@ */ #include "includes.h" -RCSID("$OpenBSD: compress.c,v 1.18 2002/03/16 11:24:53 markus Exp $"); +RCSID("$OpenBSD: compress.c,v 1.21 2004/01/13 19:45:15 markus Exp $"); #include "log.h" #include "buffer.h" #include "zlib.h" #include "compress.h" -static z_stream incoming_stream; -static z_stream outgoing_stream; +z_stream incoming_stream; +z_stream outgoing_stream; static int compress_init_send_called = 0; static int compress_init_recv_called = 0; static int inflate_failed = 0; @@ -56,12 +56,14 @@ buffer_compress_init_recv(void) void buffer_compress_uninit(void) { - debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", - outgoing_stream.total_in, outgoing_stream.total_out, + debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f", + (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 %lu, compressed %lu, factor %.2f", - incoming_stream.total_out, incoming_stream.total_in, + debug("compress incoming: raw data %llu, compressed %llu, factor %.2f", + (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)