- (djm) [channels.c] clean up harmless merge error, from reyk@

diff --git a/ChangeLog b/ChangeLog
index ff450d1a923a128c667f77f970916f512bd4a813..2676ae8a00b5440fe3804a24226b126b849dd136 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20060103
+ - (djm) [channels.c] clean up harmless merge error, from reyk@
+
 20060103
  - (djm) OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2006/01/02 17:09:49

diff --git a/channels.c b/channels.c
index ed5903f6fd3dbf5cbd4e9367446ae69d1305fc91..5fa80fbadce66352dc383d5d7dbd39694810e018 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -1491,8 +1491,6 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset)
                        }
                        return 1;
                }
-               data = buffer_ptr(&c->output);
-               dlen = buffer_len(&c->output);
 #ifdef _AIX
                /* XXX: Later AIX versions can't push as much data to tty */
                if (compat20 && c->wfd_isatty)