- stevesk@cvs.openbsd.org 2006/07/03 17:59:32

[openssh.git] / compress.c

diff --git a/compress.c b/compress.c
index e2efa6846f08963790634a05095619837cced10f..8aba84efa0066139d07d517500196a21ebe5db77 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: compress.c,v 1.23 2006/03/25 13:17:01 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,15 +13,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.18 2002/03/16 11:24:53 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)