diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | packet.c | 4 | ||||
-rw-r--r-- | progressmeter.c | 6 |
3 files changed, 9 insertions, 6 deletions
@@ -9,6 +9,9 @@ | |||
9 | - kill whitespace at EOL | 9 | - kill whitespace at EOL |
10 | - new sentence, new line | 10 | - new sentence, new line |
11 | ssh pages ok markus@ | 11 | ssh pages ok markus@ |
12 | - deraadt@cvs.openbsd.org 2003/06/10 22:20:52 | ||
13 | [packet.c progressmeter.c] | ||
14 | mostly ansi cleanup; pval ok | ||
12 | 15 | ||
13 | 16 | ||
14 | 20030609 | 17 | 20030609 |
@@ -493,4 +496,4 @@ | |||
493 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 496 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
494 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 497 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
495 | 498 | ||
496 | $Id: ChangeLog,v 1.2793 2003/06/11 12:04:39 djm Exp $ | 499 | $Id: ChangeLog,v 1.2794 2003/06/11 12:05:06 djm Exp $ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.106 2003/04/08 20:21:29 itojun Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.107 2003/06/10 22:20:52 deraadt Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | 43 | ||
@@ -265,7 +265,7 @@ packet_set_iv(int mode, u_char *dat) | |||
265 | cipher_set_keyiv(cc, dat); | 265 | cipher_set_keyiv(cc, dat); |
266 | } | 266 | } |
267 | int | 267 | int |
268 | packet_get_ssh1_cipher() | 268 | packet_get_ssh1_cipher(void) |
269 | { | 269 | { |
270 | return (cipher_get_number(receive_context.cipher)); | 270 | return (cipher_get_number(receive_context.cipher)); |
271 | } | 271 | } |
diff --git a/progressmeter.c b/progressmeter.c index d4abf2fd9..a3f14c929 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -64,7 +64,7 @@ | |||
64 | */ | 64 | */ |
65 | 65 | ||
66 | #include "includes.h" | 66 | #include "includes.h" |
67 | RCSID("$OpenBSD: progressmeter.c,v 1.6 2003/04/07 21:58:05 millert Exp $"); | 67 | RCSID("$OpenBSD: progressmeter.c,v 1.7 2003/06/10 22:20:52 deraadt Exp $"); |
68 | 68 | ||
69 | #ifdef HAVE_LIBGEN_H | 69 | #ifdef HAVE_LIBGEN_H |
70 | #include <libgen.h> | 70 | #include <libgen.h> |
@@ -127,7 +127,7 @@ start_progress_meter(char *file, off_t filesize, off_t *counter) | |||
127 | } | 127 | } |
128 | 128 | ||
129 | void | 129 | void |
130 | stop_progress_meter() | 130 | stop_progress_meter(void) |
131 | { | 131 | { |
132 | alarm(0); | 132 | alarm(0); |
133 | draw_progress_meter(); | 133 | draw_progress_meter(); |
@@ -165,7 +165,7 @@ foregroundproc(void) | |||
165 | } | 165 | } |
166 | 166 | ||
167 | static void | 167 | static void |
168 | draw_progress_meter() | 168 | draw_progress_meter(void) |
169 | { | 169 | { |
170 | static const char spaces[] = " " | 170 | static const char spaces[] = " " |
171 | " " | 171 | " " |