summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixChan.c
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2014-11-17 13:00:42 (GMT)
committerdgp@users.sourceforge.net <dgp>2014-11-17 13:00:42 (GMT)
commit96c03b5753e5320201f2fa3a70bf442afcd2747b (patch)
tree3e222c7b968ef013445a78b338cbf8647450ffcd /unix/tclUnixChan.c
parent20c444ceb73da2f79bedcc1056b43ebc29097ac0 (diff)
parent635520e15497f1118c2c447befd2baea2c20e7a8 (diff)
downloadtcl-96c03b5753e5320201f2fa3a70bf442afcd2747b.zip
tcl-96c03b5753e5320201f2fa3a70bf442afcd2747b.tar.gz
tcl-96c03b5753e5320201f2fa3a70bf442afcd2747b.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixChan.c')
-rw-r--r--unix/tclUnixChan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 2eca714..a1fe090 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -792,7 +792,7 @@ TtySetOptionProc(
*
* Results:
* A standard Tcl result. Also sets the supplied DString to the string
- * value of the option(s) returned. Sets error message if needed
+ * value of the option(s) returned. Sets error message if needed
* (by calling Tcl_BadChannelOption).
*
*----------------------------------------------------------------------
@@ -1201,7 +1201,7 @@ TtyParseMode(
char parity;
const char *bad = "bad value for -mode";
- i = sscanf(mode, "%d,%c,%d,%d%n",
+ i = sscanf(mode, "%d,%c,%d,%d%n",
&ttyPtr->baud,
&parity,
&ttyPtr->data,
@@ -1292,7 +1292,7 @@ TtyInit(
|| iostate.c_lflag != 0
|| iostate.c_cflag & CREAD
|| iostate.c_cc[VMIN] != 1
- || iostate.c_cc[VTIME] != 0)
+ || iostate.c_cc[VTIME] != 0)
{
iostate.c_iflag = IGNBRK;
iostate.c_oflag = 0;
@@ -1824,7 +1824,7 @@ TclUnixWaitForFile(
if (FD_ISSET(fd, &writableMask)) {
SET_BITS(result, TCL_WRITABLE);
}
- if (FD_ISSET(fd, &exceptionMask)) {
+ if (FD_ISSET(fd, &exceptionMask)) {
SET_BITS(result, TCL_EXCEPTION);
}
result &= mask;