diff options
author | Damien Miller <djm@mindrot.org> | 2001-12-21 14:45:46 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-12-21 14:45:46 +1100 |
commit | 9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch) | |
tree | f79317ab211f59181a61b526f566e9c8cfe70c73 /nchan.c | |
parent | 89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff) |
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
[auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
[cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
[match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
[servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
[sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
[sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
[ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
basic KNF done while i was looking for something else
Diffstat (limited to 'nchan.c')
-rw-r--r-- | nchan.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: nchan.c,v 1.32 2001/10/10 22:18:47 markus Exp $"); | 26 | RCSID("$OpenBSD: nchan.c,v 1.33 2001/12/19 07:18:56 deraadt Exp $"); |
27 | 27 | ||
28 | #include "ssh1.h" | 28 | #include "ssh1.h" |
29 | #include "ssh2.h" | 29 | #include "ssh2.h" |
@@ -273,7 +273,7 @@ chan_send_oclose1(Channel *c) | |||
273 | break; | 273 | break; |
274 | default: | 274 | default: |
275 | error("channel %d: cannot send oclose for ostate %d", | 275 | error("channel %d: cannot send oclose for ostate %d", |
276 | c->self, c->ostate); | 276 | c->self, c->ostate); |
277 | break; | 277 | break; |
278 | } | 278 | } |
279 | } | 279 | } |
@@ -322,7 +322,7 @@ chan_ibuf_empty2(Channel *c) | |||
322 | debug("channel %d: ibuf empty", c->self); | 322 | debug("channel %d: ibuf empty", c->self); |
323 | if (buffer_len(&c->input)) { | 323 | if (buffer_len(&c->input)) { |
324 | error("channel %d: chan_ibuf_empty for non empty buffer", | 324 | error("channel %d: chan_ibuf_empty for non empty buffer", |
325 | c->self); | 325 | c->self); |
326 | return; | 326 | return; |
327 | } | 327 | } |
328 | switch (c->istate) { | 328 | switch (c->istate) { |
@@ -334,7 +334,7 @@ chan_ibuf_empty2(Channel *c) | |||
334 | break; | 334 | break; |
335 | default: | 335 | default: |
336 | error("channel %d: chan_ibuf_empty for istate %d", | 336 | error("channel %d: chan_ibuf_empty for istate %d", |
337 | c->self, c->istate); | 337 | c->self, c->istate); |
338 | break; | 338 | break; |
339 | } | 339 | } |
340 | } | 340 | } |
@@ -458,7 +458,7 @@ chan_is_dead(Channel *c, int send) | |||
458 | debug2("channel %d: active efd: %d len %d type %s", | 458 | debug2("channel %d: active efd: %d len %d type %s", |
459 | c->self, c->efd, buffer_len(&c->extended), | 459 | c->self, c->efd, buffer_len(&c->extended), |
460 | c->extended_usage==CHAN_EXTENDED_READ ? | 460 | c->extended_usage==CHAN_EXTENDED_READ ? |
461 | "read": "write"); | 461 | "read": "write"); |
462 | } else { | 462 | } else { |
463 | if (!(c->flags & CHAN_CLOSE_SENT)) { | 463 | if (!(c->flags & CHAN_CLOSE_SENT)) { |
464 | if (send) { | 464 | if (send) { |