- (stevesk) compress.[ch] sync with openbsd; missed in prototype

   fix merge.

diff --git a/ChangeLog b/ChangeLog
index 09c1a8222f5f3fa175040d211f2111146d588c8e..8caa9b6fd22bfdf1b3c4da67ee8a4daa5169152b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
    - markus@cvs.openbsd.org 2000/12/27 11:41:31
      [sshd.8]
      update for ssh-2
+ - (stevesk) compress.[ch] sync with openbsd; missed in prototype
+   fix merge.
 
 20001228
  - (bal) Patch to add libutil.h to loginrec.c only if the platform has

diff --git a/compress.c b/compress.c
index 3c05886e10a804acfd0a74bfee6b87fada94137f..2437606b7abe523714070dedaa33c745db625144 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.10 2000/12/19 23:17:56 markus Exp $");
+RCSID("$OpenBSD: compress.c,v 1.11 2000/12/20 19:37:21 markus Exp $");
 
 #include "ssh.h"
 #include "buffer.h"
@@ -39,7 +39,7 @@ buffer_compress_init(int level)
 /* Frees any data structures allocated for compression. */
 
 void
-buffer_compress_uninit()
+buffer_compress_uninit(void)
 {
        debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
              outgoing_stream.total_in, outgoing_stream.total_out,

diff --git a/compress.h b/compress.h
index 5757164814b8043c51184f2fac90b765bccdf974..87d592fe907973bf68286d7981a4e9786a68285a 100644 (file)
--- a/compress.h
+++ b/compress.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: compress.h,v 1.6 2000/09/07 20:27:50 deraadt Exp $"); */
+/* RCSID("$OpenBSD: compress.h,v 1.7 2000/12/20 19:37:22 markus Exp $"); */
 
 #ifndef COMPRESS_H
 #define COMPRESS_H
@@ -23,7 +23,7 @@
 void    buffer_compress_init(int level);
 
 /* Frees any data structures allocated by buffer_compress_init. */
-void    buffer_compress_uninit();
+void    buffer_compress_uninit(void);
 
 /*
  * Compresses the contents of input_buffer into output_buffer.  All packets