summaryrefslogtreecommitdiff
path: root/nchan.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:21:15 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:21:15 +1100
commit76765c0b1ad147f747f088a37ae120413108356f (patch)
tree35897ba3509aaa4d5a5dba5044a1c192ca4671f5 /nchan.c
parentde6987c2b935871fd93d502d8a36a6e734667824 (diff)
- markus@cvs.openbsd.org 2002/01/09 17:26:35
[channels.c nchan.c] replace buffer_consume(b, buffer_len(b)) with buffer_clear(b); ok provos@
Diffstat (limited to 'nchan.c')
-rw-r--r--nchan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/nchan.c b/nchan.c
index ae5fb4aa..ae1fe47c 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.33 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.34 2002/01/09 17:26:35 markus Exp $");
#include "ssh1.h"
#include "ssh2.h"
@@ -266,7 +266,7 @@ chan_send_oclose1(Channel *c)
case CHAN_OUTPUT_OPEN:
case CHAN_OUTPUT_WAIT_DRAIN:
chan_shutdown_write(c);
- buffer_consume(&c->output, buffer_len(&c->output));
+ buffer_clear(&c->output);
packet_start(SSH_MSG_CHANNEL_OUTPUT_CLOSE);
packet_put_int(c->remote_id);
packet_send();
@@ -516,7 +516,7 @@ chan_init(void)
static void
chan_shutdown_write(Channel *c)
{
- buffer_consume(&c->output, buffer_len(&c->output));
+ buffer_clear(&c->output);
if (compat20 && c->type == SSH_CHANNEL_LARVAL)
return;
/* shutdown failure is allowed if write failed already */