=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/compress.c,v retrieving revision 1.7.2.4 retrieving revision 1.8 diff -u -r1.7.2.4 -r1.8 --- src/usr.bin/ssh/Attic/compress.c 2001/03/21 18:52:43 1.7.2.4 +++ src/usr.bin/ssh/Attic/compress.c 2000/06/20 01:39:40 1.8 @@ -1,23 +1,24 @@ /* + * + * compress.c + * * Author: Tatu Ylonen + * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved + * + * Created: Wed Oct 25 22:12:46 1995 ylo + * * Interface to packet compression for ssh. * - * As far as I am concerned, the code I have written for this software - * can be used freely for any purpose. Any derived versions of this - * software must be clearly marked as such, and if the derived work is - * incompatible with the protocol description in the RFC file, it must be - * called by a name other than "ssh" or "Secure Shell". */ #include "includes.h" -RCSID("$OpenBSD: compress.c,v 1.7.2.4 2001/03/21 18:52:43 jason Exp $"); +RCSID("$OpenBSD: compress.c,v 1.8 2000/06/20 01:39:40 markus Exp $"); -#include "log.h" +#include "ssh.h" #include "buffer.h" #include "zlib.h" -#include "compress.h" static z_stream incoming_stream; static z_stream outgoing_stream; @@ -40,7 +41,7 @@ /* Frees any data structures allocated for compression. */ void -buffer_compress_uninit(void) +buffer_compress_uninit() { debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", outgoing_stream.total_in, outgoing_stream.total_out, @@ -74,13 +75,13 @@ return; /* Input is the contents of the input buffer. */ - outgoing_stream.next_in = (u_char *) buffer_ptr(input_buffer); + outgoing_stream.next_in = (unsigned char *) buffer_ptr(input_buffer); outgoing_stream.avail_in = buffer_len(input_buffer); /* Loop compressing until deflate() returns with avail_out != 0. */ do { /* Set up fixed-size output buffer. */ - outgoing_stream.next_out = (u_char *)buf; + outgoing_stream.next_out = (unsigned char *)buf; outgoing_stream.avail_out = sizeof(buf); /* Compress as much data into the buffer as possible. */ @@ -113,12 +114,12 @@ char buf[4096]; int status; - incoming_stream.next_in = (u_char *) buffer_ptr(input_buffer); + incoming_stream.next_in = (unsigned char *) buffer_ptr(input_buffer); incoming_stream.avail_in = buffer_len(input_buffer); for (;;) { /* Set up fixed-size output buffer. */ - incoming_stream.next_out = (u_char *) buf; + incoming_stream.next_out = (unsigned char *) buf; incoming_stream.avail_out = sizeof(buf); status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);