summaryrefslogtreecommitdiffstats
path: root/session.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-16 15:29:18 +0200
committerDarren Tucker <dtucker@zip.com.au>2008-06-16 15:29:18 +0200
commited3cdc0a7c6e2a782c1e4a6781f11c1defa494b1 (patch)
treec33c55d91c0d31086cbde607aed84a9d1238c69f /session.c
parentRemove extra tag (diff)
downloadopenssh-ed3cdc0a7c6e2a782c1e4a6781f11c1defa494b1.tar.xz
openssh-ed3cdc0a7c6e2a782c1e4a6781f11c1defa494b1.zip
- dtucker@cvs.openbsd.org 2008/06/16 13:22:53
[session.c channels.c] Rename the isatty argument to is_tty so we don't shadow isatty(3). ok markus@
Diffstat (limited to 'session.c')
-rw-r--r--session.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/session.c b/session.c
index d692bc709..93babf957 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.240 2008/06/15 20:06:26 djm Exp $ */
+/* $OpenBSD: session.c,v 1.241 2008/06/16 13:22:53 dtucker Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -2285,7 +2285,7 @@ session_input_channel_req(Channel *c, const char *rtype)
}
void
-session_set_fds(Session *s, int fdin, int fdout, int fderr, int isatty)
+session_set_fds(Session *s, int fdin, int fdout, int fderr, int is_tty)
{
if (!compat20)
fatal("session_set_fds: called for proto != 2.0");
@@ -2298,7 +2298,7 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr, int isatty)
channel_set_fds(s->chanid,
fdout, fdin, fderr,
fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
- 1, isatty, CHAN_SES_WINDOW_DEFAULT);
+ 1, is_tty, CHAN_SES_WINDOW_DEFAULT);
}
/*