summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:22:20 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:22:20 +1100
commit4ce25952597aa5a6daabc5a1f55133b86e358fb2 (patch)
treeb859976f406e0a54e9851cc1b14aba8b8fc5cbaa
parentc3fa407073d92fe11efb0c07c4d9da4720289ce7 (diff)
- markus@cvs.openbsd.org 2002/01/10 12:38:26
[nchan.c] remove dead code (skip drain)
-rw-r--r--ChangeLog5
-rw-r--r--nchan.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ff22e1826..2d6a845ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,6 +116,9 @@
116 - markus@cvs.openbsd.org 2002/01/10 11:24:04 116 - markus@cvs.openbsd.org 2002/01/10 11:24:04
117 [clientloop.c] 117 [clientloop.c]
118 handle SSH2_MSG_GLOBAL_REQUEST (just reply with failure); ok djm@ 118 handle SSH2_MSG_GLOBAL_REQUEST (just reply with failure); ok djm@
119 - markus@cvs.openbsd.org 2002/01/10 12:38:26
120 [nchan.c]
121 remove dead code (skip drain)
119 122
120 123
12120020121 12420020121
@@ -7264,4 +7267,4 @@
7264 - Wrote replacements for strlcpy and mkdtemp 7267 - Wrote replacements for strlcpy and mkdtemp
7265 - Released 1.0pre1 7268 - Released 1.0pre1
7266 7269
7267$Id: ChangeLog,v 1.1756 2002/01/22 12:21:58 djm Exp $ 7270$Id: ChangeLog,v 1.1757 2002/01/22 12:22:20 djm Exp $
diff --git a/nchan.c b/nchan.c
index ae1fe47cc..79fff66c8 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: nchan.c,v 1.34 2002/01/09 17:26:35 markus Exp $"); 26RCSID("$OpenBSD: nchan.c,v 1.35 2002/01/10 12:38:26 markus Exp $");
27 27
28#include "ssh1.h" 28#include "ssh1.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -123,12 +123,6 @@ chan_read_failed_12(Channel *c)
123 debug("channel %d: input open -> drain", c->self); 123 debug("channel %d: input open -> drain", c->self);
124 chan_shutdown_read(c); 124 chan_shutdown_read(c);
125 c->istate = CHAN_INPUT_WAIT_DRAIN; 125 c->istate = CHAN_INPUT_WAIT_DRAIN;
126#if 0
127 if (buffer_len(&c->input) == 0) {
128 debug("channel %d: input: no drain shortcut", c->self);
129 chan_ibuf_empty(c);
130 }
131#endif
132 break; 126 break;
133 default: 127 default:
134 error("channel %d: chan_read_failed for istate %d", 128 error("channel %d: chan_read_failed for istate %d",