summaryrefslogtreecommitdiff
path: root/nchan.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-22 12:56:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-22 12:56:01 +1000
commit3f9fdc71219d498a996c4e4ca8330df7f598fb5d (patch)
tree902072deed2ca26a5b0b3fa5f3749783e0bd62e6 /nchan.c
parentb357afc0a03a4238a01acf5d9641ebda9f71d500 (diff)
- avsm@cvs.openbsd.org 2004/06/21 17:36:31
[auth-rsa.c auth2-gss.c auth2-pubkey.c authfile.c canohost.c channels.c cipher.c dns.c kex.c monitor.c monitor_fdpass.c monitor_wrap.c monitor_wrap.h nchan.c packet.c progressmeter.c scp.c sftp-server.c sftp.c ssh-gss.h ssh-keygen.c ssh.c sshconnect.c sshconnect1.c sshlogin.c sshpty.c] make ssh -Wshadow clean, no functional changes markus@ ok There are also some portable-specific -Wshadow warnings to be fixed in monitor.c and montior_wrap.c.
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 3138cdd1..ecf59c5d 100644
--- a/nchan.c
+++ b/nchan.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: nchan.c,v 1.49 2003/08/29 10:04:36 markus Exp $");
+RCSID("$OpenBSD: nchan.c,v 1.50 2004/06/21 17:36:31 avsm Exp $");
#include "ssh1.h"
#include "ssh2.h"
@@ -395,7 +395,7 @@ chan_mark_dead(Channel *c)
}
int
-chan_is_dead(Channel *c, int send)
+chan_is_dead(Channel *c, int do_send)
{
if (c->type == SSH_CHANNEL_ZOMBIE) {
debug2("channel %d: zombie", c->self);
@@ -416,7 +416,7 @@ chan_is_dead(Channel *c, int send)
return 0;
}
if (!(c->flags & CHAN_CLOSE_SENT)) {
- if (send) {
+ if (do_send) {
chan_send_close2(c);
} else {
/* channel would be dead if we sent a close */