diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | compress.c | 4 | ||||
-rw-r--r-- | compress.h | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -30,6 +30,8 @@ | |||
30 | - markus@cvs.openbsd.org 2000/12/27 11:41:31 | 30 | - markus@cvs.openbsd.org 2000/12/27 11:41:31 |
31 | [sshd.8] | 31 | [sshd.8] |
32 | update for ssh-2 | 32 | update for ssh-2 |
33 | - (stevesk) compress.[ch] sync with openbsd; missed in prototype | ||
34 | fix merge. | ||
33 | 35 | ||
34 | 20001228 | 36 | 20001228 |
35 | - (bal) Patch to add libutil.h to loginrec.c only if the platform has | 37 | - (bal) Patch to add libutil.h to loginrec.c only if the platform has |
diff --git a/compress.c b/compress.c index 3c05886e1..2437606b7 100644 --- a/compress.c +++ b/compress.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: compress.c,v 1.10 2000/12/19 23:17:56 markus Exp $"); | 15 | RCSID("$OpenBSD: compress.c,v 1.11 2000/12/20 19:37:21 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "buffer.h" | 18 | #include "buffer.h" |
@@ -39,7 +39,7 @@ buffer_compress_init(int level) | |||
39 | /* Frees any data structures allocated for compression. */ | 39 | /* Frees any data structures allocated for compression. */ |
40 | 40 | ||
41 | void | 41 | void |
42 | buffer_compress_uninit() | 42 | buffer_compress_uninit(void) |
43 | { | 43 | { |
44 | debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", | 44 | debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f", |
45 | outgoing_stream.total_in, outgoing_stream.total_out, | 45 | outgoing_stream.total_in, outgoing_stream.total_out, |
diff --git a/compress.h b/compress.h index 575716481..87d592fe9 100644 --- a/compress.h +++ b/compress.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: compress.h,v 1.6 2000/09/07 20:27:50 deraadt Exp $"); */ | 14 | /* RCSID("$OpenBSD: compress.h,v 1.7 2000/12/20 19:37:22 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef COMPRESS_H | 16 | #ifndef COMPRESS_H |
17 | #define COMPRESS_H | 17 | #define COMPRESS_H |
@@ -23,7 +23,7 @@ | |||
23 | void buffer_compress_init(int level); | 23 | void buffer_compress_init(int level); |
24 | 24 | ||
25 | /* Frees any data structures allocated by buffer_compress_init. */ | 25 | /* Frees any data structures allocated by buffer_compress_init. */ |
26 | void buffer_compress_uninit(); | 26 | void buffer_compress_uninit(void); |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * Compresses the contents of input_buffer into output_buffer. All packets | 29 | * Compresses the contents of input_buffer into output_buffer. All packets |