diff options
| author | kjnash <k.j.nash@usa.net> | 2022-09-20 03:12:41 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2022-09-20 03:12:41 (GMT) |
| commit | 716fc0545e401cd7e7b733207f04cd92d476f92e (patch) | |
| tree | 6c2d43115eebae4fb637c089ab07da0a143d5f56 /unix | |
| parent | 5f0c43664685bc2ee4df68984143d273a7d23ad6 (diff) | |
| parent | b237b6f20877470c49a9c2c82376257f6fa19fb6 (diff) | |
| download | tcl-716fc0545e401cd7e7b733207f04cd92d476f92e.zip tcl-716fc0545e401cd7e7b733207f04cd92d476f92e.tar.gz tcl-716fc0545e401cd7e7b733207f04cd92d476f92e.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tclUnixSock.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index d2068c3..217d5ce 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -53,11 +53,9 @@ typedef struct TcpFdList { struct TcpState { Tcl_Channel channel; /* Channel associated with this file. */ - int testFlags; /* bit field for tests. Is set by testsocket - * test procedure */ - TcpFdList fds; /* The file descriptors of the sockets. */ int flags; /* ORed combination of the bitfields defined * below. */ + TcpFdList fds; /* The file descriptors of the sockets. */ int interest; /* Event types of interest */ /* @@ -95,12 +93,7 @@ struct TcpState { * still pending */ #define TCP_ASYNC_FAILED (1<<5) /* An async connect finally failed */ -/* - * These bits may be ORed together into the "testFlags" field of a TcpState - * structure. - */ - -#define TCP_ASYNC_TEST_MODE (1<<0) /* Async testing activated. Do not +#define TCP_ASYNC_TEST_MODE (1<<8) /* Async testing activated. Do not * automatically continue connection * process. */ @@ -434,7 +427,7 @@ TcpBlockModeProc( * * Side effects: * Processes socket events off the system queue. May process - * asynchroneous connects. + * asynchronous connects. * *---------------------------------------------------------------------- */ @@ -471,7 +464,7 @@ WaitForConnect( * (errorCodePtr != NULL && !GOT_BITS(flags, TCP_NONBLOCKING)) */ - if (GOT_BITS(statePtr->testFlags, TCP_ASYNC_TEST_MODE) + if (GOT_BITS(statePtr->flags, TCP_ASYNC_TEST_MODE) && !(errorCodePtr != NULL && !GOT_BITS(statePtr->flags, TCP_NONBLOCKING))) { *errorCodePtr = EWOULDBLOCK; @@ -880,8 +873,8 @@ TcpGetOptionProc( if ((len > 1) && (optionName[1] == 'c') && (strncmp(optionName, "-connecting", len) == 0)) { - Tcl_DStringAppend(dsPtr, - GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT) ? "1" : "0", TCL_INDEX_NONE); + Tcl_DStringAppend(dsPtr, + GOT_BITS(statePtr->flags, TCP_ASYNC_CONNECT) ? "1" : "0", TCL_INDEX_NONE); return TCL_OK; } @@ -1351,7 +1344,7 @@ TcpConnect( } /* - * We need to forward the writable event that brought us here, bcasue + * We need to forward the writable event that brought us here, because * upon reading of getsockopt(SO_ERROR), at least some OSes clear the * writable state from the socket, and so a subsequent select() on * behalf of a script level [fileevent] would not fire. It doesn't |