diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 14:25:37 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 14:25:37 +1100 |
commit | 90fdfaf69c9c62476689ccd2dbafe1cce56ee1bd (patch) | |
tree | ef453186caed39ee6bc18124df4f59ccd2560318 | |
parent | 8ba29fe72d68c6044b0383bc56931f05f8f35b68 (diff) |
- deraadt@cvs.openbsd.org 2006/03/25 18:30:55
[clientloop.c serverloop.c]
spacing
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 10 | ||||
-rw-r--r-- | serverloop.c | 6 |
3 files changed, 12 insertions, 9 deletions
@@ -153,6 +153,9 @@ | |||
153 | - deraadt@cvs.openbsd.org 2006/03/25 18:29:35 | 153 | - deraadt@cvs.openbsd.org 2006/03/25 18:29:35 |
154 | [auth-rsa.c authfd.c packet.c] | 154 | [auth-rsa.c authfd.c packet.c] |
155 | needed casts (always will be needed) | 155 | needed casts (always will be needed) |
156 | - deraadt@cvs.openbsd.org 2006/03/25 18:30:55 | ||
157 | [clientloop.c serverloop.c] | ||
158 | spacing | ||
156 | 159 | ||
157 | 20060325 | 160 | 20060325 |
158 | - OpenBSD CVS Sync | 161 | - OpenBSD CVS Sync |
@@ -4410,4 +4413,4 @@ | |||
4410 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4413 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4411 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4414 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4412 | 4415 | ||
4413 | $Id: ChangeLog,v 1.4278 2006/03/26 03:25:19 djm Exp $ | 4416 | $Id: ChangeLog,v 1.4279 2006/03/26 03:25:37 djm Exp $ |
diff --git a/clientloop.c b/clientloop.c index c136dae37..7745c4dd8 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.160 2006/03/25 13:17:01 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.161 2006/03/25 18:30:55 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -582,7 +582,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr) | |||
582 | } | 582 | } |
583 | 583 | ||
584 | static void | 584 | static void |
585 | client_process_net_input(fd_set * readset) | 585 | client_process_net_input(fd_set *readset) |
586 | { | 586 | { |
587 | int len; | 587 | int len; |
588 | char buf[8192]; | 588 | char buf[8192]; |
@@ -690,7 +690,7 @@ client_extra_session2_setup(int id, void *arg) | |||
690 | } | 690 | } |
691 | 691 | ||
692 | static void | 692 | static void |
693 | client_process_control(fd_set * readset) | 693 | client_process_control(fd_set *readset) |
694 | { | 694 | { |
695 | Buffer m; | 695 | Buffer m; |
696 | Channel *c; | 696 | Channel *c; |
@@ -1184,7 +1184,7 @@ Supported escape sequences:\r\n\ | |||
1184 | } | 1184 | } |
1185 | 1185 | ||
1186 | static void | 1186 | static void |
1187 | client_process_input(fd_set * readset) | 1187 | client_process_input(fd_set *readset) |
1188 | { | 1188 | { |
1189 | int len; | 1189 | int len; |
1190 | char buf[8192]; | 1190 | char buf[8192]; |
@@ -1237,7 +1237,7 @@ client_process_input(fd_set * readset) | |||
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | static void | 1239 | static void |
1240 | client_process_output(fd_set * writeset) | 1240 | client_process_output(fd_set *writeset) |
1241 | { | 1241 | { |
1242 | int len; | 1242 | int len; |
1243 | char buf[100]; | 1243 | char buf[100]; |
diff --git a/serverloop.c b/serverloop.c index 97ad65b26..021ba68c0 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.134 2006/03/25 13:17:02 djm Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.135 2006/03/25 18:30:55 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -355,7 +355,7 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp, | |||
355 | * in buffers and processed later. | 355 | * in buffers and processed later. |
356 | */ | 356 | */ |
357 | static void | 357 | static void |
358 | process_input(fd_set * readset) | 358 | process_input(fd_set *readset) |
359 | { | 359 | { |
360 | int len; | 360 | int len; |
361 | char buf[16384]; | 361 | char buf[16384]; |
@@ -414,7 +414,7 @@ process_input(fd_set * readset) | |||
414 | * Sends data from internal buffers to client program stdin. | 414 | * Sends data from internal buffers to client program stdin. |
415 | */ | 415 | */ |
416 | static void | 416 | static void |
417 | process_output(fd_set * writeset) | 417 | process_output(fd_set *writeset) |
418 | { | 418 | { |
419 | struct termios tio; | 419 | struct termios tio; |
420 | u_char *data; | 420 | u_char *data; |