[BACK]Return to compress.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/Attic/compress.c between version 1.15.2.2 and 1.16

version 1.15.2.2, 2002/05/17 00:03:23 version 1.16, 2001/12/19 07:18:56
Line 19 
Line 19 
 #include "zlib.h"  #include "zlib.h"
 #include "compress.h"  #include "compress.h"
   
 z_stream incoming_stream;  static z_stream incoming_stream;
 z_stream outgoing_stream;  static z_stream outgoing_stream;
 static int compress_init_send_called = 0;  static int compress_init_send_called = 0;
 static int compress_init_recv_called = 0;  static int compress_init_recv_called = 0;
 static int inflate_failed = 0;  
 static int deflate_failed = 0;  
   
 /*  /*
  * Initializes compression; level is compression level from 1 to 9   * Initializes compression; level is compression level from 1 to 9
Line 64 
Line 62 
             incoming_stream.total_out, incoming_stream.total_in,              incoming_stream.total_out, incoming_stream.total_in,
             incoming_stream.total_out == 0 ? 0.0 :              incoming_stream.total_out == 0 ? 0.0 :
             (double) incoming_stream.total_in / incoming_stream.total_out);              (double) incoming_stream.total_in / incoming_stream.total_out);
         if (compress_init_recv_called == 1 && inflate_failed == 0)          if (compress_init_recv_called == 1)
                 inflateEnd(&incoming_stream);                  inflateEnd(&incoming_stream);
         if (compress_init_send_called == 1 && deflate_failed == 0)          if (compress_init_send_called == 1)
                 deflateEnd(&outgoing_stream);                  deflateEnd(&outgoing_stream);
 }  }
   
Line 82 
Line 80 
 void  void
 buffer_compress(Buffer * input_buffer, Buffer * output_buffer)  buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
 {  {
         u_char buf[4096];          char buf[4096];
         int status;          int status;
   
         /* This case is not handled below. */          /* This case is not handled below. */
Line 90 
Line 88 
                 return;                  return;
   
         /* Input is the contents of the input buffer. */          /* Input is the contents of the input buffer. */
         outgoing_stream.next_in = buffer_ptr(input_buffer);          outgoing_stream.next_in = (u_char *) buffer_ptr(input_buffer);
         outgoing_stream.avail_in = buffer_len(input_buffer);          outgoing_stream.avail_in = buffer_len(input_buffer);
   
         /* Loop compressing until deflate() returns with avail_out != 0. */          /* Loop compressing until deflate() returns with avail_out != 0. */
         do {          do {
                 /* Set up fixed-size output buffer. */                  /* Set up fixed-size output buffer. */
                 outgoing_stream.next_out = buf;                  outgoing_stream.next_out = (u_char *)buf;
                 outgoing_stream.avail_out = sizeof(buf);                  outgoing_stream.avail_out = sizeof(buf);
   
                 /* Compress as much data into the buffer as possible. */                  /* Compress as much data into the buffer as possible. */
Line 108 
Line 106 
                             sizeof(buf) - outgoing_stream.avail_out);                              sizeof(buf) - outgoing_stream.avail_out);
                         break;                          break;
                 default:                  default:
                         deflate_failed = 1;  
                         fatal("buffer_compress: deflate returned %d", status);                          fatal("buffer_compress: deflate returned %d", status);
                         /* NOTREACHED */                          /* NOTREACHED */
                 }                  }
Line 127 
Line 124 
 void  void
 buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)  buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
 {  {
         u_char buf[4096];          char buf[4096];
         int status;          int status;
   
         incoming_stream.next_in = buffer_ptr(input_buffer);          incoming_stream.next_in = (u_char *) buffer_ptr(input_buffer);
         incoming_stream.avail_in = buffer_len(input_buffer);          incoming_stream.avail_in = buffer_len(input_buffer);
   
         for (;;) {          for (;;) {
                 /* Set up fixed-size output buffer. */                  /* Set up fixed-size output buffer. */
                 incoming_stream.next_out = buf;                  incoming_stream.next_out = (u_char *) buf;
                 incoming_stream.avail_out = sizeof(buf);                  incoming_stream.avail_out = sizeof(buf);
   
                 status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);                  status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
Line 152 
Line 149 
                          */                           */
                         return;                          return;
                 default:                  default:
                         inflate_failed = 1;  
                         fatal("buffer_uncompress: inflate returned %d", status);                          fatal("buffer_uncompress: inflate returned %d", status);
                         /* NOTREACHED */                          /* NOTREACHED */
                 }                  }
Legend:
Removed from v.1.15.2.2  
changed lines
  Added in v.1.16